vue2-client 1.15.133 → 1.15.135

package/package.json

@@ -1,111 +1,111 @@
-{
-  "name": "vue2-client",
-  "version": "1.15.133",
-  "private": false,
-  "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
-    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
-    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
-    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
-    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
-    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
-    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
-    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
-    "serve:message": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode message",
-    "serve:apply": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode apply",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@hufe921/canvas-editor": "^0.9.49",
-    "@microsoft/fetch-event-source": "^2.0.1",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "default-passive-events": "^2.0.0",
-    "dotenv": "^16.3.1",
-    "echarts": "^5.5.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "html2canvas": "^1.4.1",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "jspdf": "^2.5.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.debounce": "^4",
-    "lodash.get": "^4.4.2",
-    "marked": "^4",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.7.14",
-    "vue-codemirror": "4.0.6",
-    "vue-color": "2.7.0",
-    "vue-draggable-resizable": "^2.3.0",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vue-virtual-scroller": "^1.1.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.22.20",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
-    "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/test-utils": "^1.3.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "deepmerge": "^4.3.1",
-    "eslint": "^8.51.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "fast-deep-equal": "^3.1.3",
-    "ignore-loader": "^0.1.2",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-transform-stub": "^2.0.0",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not ie 11"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.15.135",
+  "private": false,
+  "scripts": {
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
+    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
+    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
+    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
+    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
+    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
+    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
+    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
+    "serve:message": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode message",
+    "serve:apply": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode apply",
+    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@hufe921/canvas-editor": "^0.9.49",
+    "@microsoft/fetch-event-source": "^2.0.1",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.33.0",
+    "crypto-js": "^4.1.1",
+    "date-fns": "^2.29.3",
+    "default-passive-events": "^2.0.0",
+    "dotenv": "^16.3.1",
+    "echarts": "^5.5.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.7.0",
+    "html2canvas": "^1.4.1",
+    "js-base64": "^3.7.5",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "jspdf": "^2.5.1",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.debounce": "^4",
+    "lodash.get": "^4.4.2",
+    "marked": "^4",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "qs": "^6.11.2",
+    "regenerator-runtime": "^0.14.0",
+    "videojs-contrib-hls": "^5.15.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.7.14",
+    "vue-codemirror": "4.0.6",
+    "vue-color": "2.7.0",
+    "vue-draggable-resizable": "^2.3.0",
+    "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
+    "vue-virtual-scroller": "^1.1.2",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-standard": "^8.0.1",
+    "@vue/test-utils": "^1.3.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "compression-webpack-plugin": "^10.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "deepmerge": "^4.3.1",
+    "eslint": "^8.51.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "fast-deep-equal": "^3.1.3",
+    "ignore-loader": "^0.1.2",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-transform-stub": "^2.0.0",
+    "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-jest": "^4.0.1",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.88.2",
+    "webpack-theme-color-replacer": "^1.4.7",
+    "whatwg-fetch": "^3.6.19"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
+}

package/src/base-client/components/common/HIS/HButtons/HButtons.vue

@@ -184,7 +184,7 @@ defineExpose({
         font-family: "Source Han Sans";
         height: 32px;
         flex: 0 0 auto;
-        min-width: 110px;
+        min-width: 124px;
         width: auto;
         white-space: nowrap;
         overflow: hidden;
@@ -214,7 +214,7 @@ defineExpose({
         font-family: "Source Han Sans";
         height: 32px;
         flex: 0 0 auto;
-        min-width: 110px;
+        min-width: 124px;
         width: auto;
         white-space: nowrap;
         overflow: hidden;
@@ -245,7 +245,7 @@ defineExpose({
         height: 32px;
         flex: 0 0 auto;
         width: auto;
-        min-width: 110px;
+        min-width: 124px;
         white-space: nowrap;
         overflow: hidden;
         margin-right: 0px;
@@ -274,7 +274,7 @@ defineExpose({
         height: 32px;
         width: auto;
         flex: 0 0 auto;
-        min-width: 110px;
+        min-width: 124px;
         white-space: nowrap;
         overflow: hidden;
         margin-right: 0px;
@@ -283,6 +283,57 @@ defineExpose({
     }
   }
 
+   // button-icon-tiles样式 - 左侧彩色图标块 + 右侧文字
+  &.h-buttons-button-icon-tiles {
+    :deep(.ant-btn-group) {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap; // 允许自动换行
+      justify-content: flex-start; // 左对齐
+      gap: 0; // 取消统一间距
+
+      .ant-btn {
+        position: relative;
+        display: inline-flex;
+        align-items: center;
+        gap: 10px; // 控制图标与文字间距
+        border: 1px solid #E6E8EB;
+        background-color: #FFFFFF;
+        color: #313131;
+        font-size: 14px;
+        height: 44px;
+        padding: 0 10px 0 10px;
+        border-radius: 8px;
+        min-width: 116px;
+        box-shadow: 0 2px 0 rgba(0,0,0,0.02);
+        margin-right: 12px; // 用margin控制横向间距，末尾一排自然换行
+      }
+
+      .ant-btn .anticon {
+        width: 26px;
+        height: 26px;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 6px;
+        color: #fff;
+        font-size: 14px;
+        flex: 0 0 26px; // 固定正方形，防止随文本挤压变形
+        box-sizing: border-box;
+      }
+
+      /* 默认蓝色，支持通过 data-type 改变色块（success/warning/error/default）*/
+      .ant-btn .anticon { background: #3FA7FF; }
+      .ant-btn[data-type='success'] .anticon { background: #34C76E; }
+      .ant-btn[data-type='warning'] .anticon { background: #FFA940; }
+      .ant-btn[data-type='error'] .anticon { background: #FF7875; }
+      .ant-btn[disabled] .anticon { background: #BFBFBF; }
+
+      /* 图标与文字间距在有图标时更自然 */
+      .ant-btn > .anticon + span { margin-left: 10px; }
+    }
+  }
+
   // 水印图标与按钮容器布局调整
   &.h-buttons-button-watermark-icon {
     :deep(.watermark-icon) {  transform: translate(-50%, -54%) !important; }
@@ -292,6 +343,29 @@ defineExpose({
       display: block;
     }
   }
+  &.h-buttons-0padding-button {
+    padding: 0px 4px;
+  }
+  // button25样式 用于会诊申请侧边栏按钮样式
+  &.h-buttons-button25 {
+    :deep(.x-buttons) {
+      margin: -20px 3px -20px 3px;
 
+      .ant-btn-group {
+        width: 173px;
+        justify-content: space-between;
+
+        .ant-btn {
+          border-radius: 6px;
+          border: 1px solid #9499A0;
+          font-size: 16px;
+          height: 32px;
+          background-color: #FFFFFF;
+          color: #313131;
+          width: 173px;
+        }
+      }
+    }
+  }
 }
 </style>

package/src/base-client/components/common/HIS/HTab/HTab.vue

@@ -17,6 +17,10 @@ defineProps({
   useCycle: {
     type: Boolean,
     default: false
+  },
+  useStyle8: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -31,7 +35,10 @@ defineExpose({
 </script>
 
 <template>
-  <div class="h-tab-wrapper" :class="{ 'h-tab-has-top-margin': hasTopMargin, 'h-tab-style7': useStyle7, 'h-tab-cycle': useStyle7 && useCycle }">
+  <div class="h-tab-wrapper" :class="{ 'h-tab-has-top-margin': hasTopMargin,
+                                        'h-tab-style7': useStyle7,
+                                        'h-tab-cycle': useStyle7 && useCycle,
+                                         'h-tab-style8': useStyle8}">
     <x-tab
       ref="xTabRef"
       v-bind="$attrs"
@@ -189,6 +196,86 @@ defineExpose({
       :deep(.ant-tabs-nav) { display: flex !important; flex-wrap: nowrap !important; }
     }
   }
+  // 用户词条使用样式
+  &.h-tab-style8 {
+    :deep(.ant-tabs-tab-next),
+    :deep(.ant-tabs-tab-prev-icon-target),
+    :deep(.ant-tabs-tab-next-icon) { display: none; }
+
+    // Make the main Ant Design tabs container a flex column to arrange tab bar and content vertically
+    :deep(.ant-tabs) {
+      display: flex !important;
+      flex-direction: column !important; // 确保选项卡栏在顶部，内容区域在下方
+      height: auto !important; // 高度自适应
+    }
+
+    :deep(.ant-tabs-bar) {
+      border-bottom: 1px solid #d9d9d9; // 底部边框
+      border-right: none; // 移除右侧边框
+      margin-right: 0 !important; // 移除重叠修复
+      flex-shrink: 1 !important; // 允许收缩
+      height: auto !important; // 高度自适应
+      // Important: if the tabPosition is 'top', the default margin-bottom of ant-tabs-bar is 16px, need to remove it to make border connect well
+      margin-bottom: 0px !important;
+    }
+
+    // Ensure tab content takes remaining space
+    :deep(.ant-tabs-content) {
+      flex: none !important; // 移除 flex: 1，允许内容区域自然流淌
+    }
+
+    // Apply flex properties directly to the div containing tabs within ant-tabs-nav
+    :deep(.ant-tabs-nav) {
+      .ant-tabs-nav-container,
+      .ant-tabs-nav-wrap,
+      .ant-tabs-nav-scroll,
+      & > div:first-child { // Target the direct div child of ant-tabs-nav
+        display: flex !important;
+        flex-direction: row !important;
+        flex-wrap: nowrap !important; // 确保不换行
+        width: 100% !important; // 占据全部宽度
+        height: auto !important;
+      }
 
+      // These properties are applied to ant-tabs-nav itself, not its direct div child.
+      // Since the flex properties are moved to the inner div, ant-tabs-nav can be left as default or adjusted if needed.
+      // For now, removing the redundant flex properties from ant-tabs-nav.
+      height: auto !important; // 高度自适应内容
+      width: 100% !important; // 确保容器占据全部宽度
+
+      .ant-tabs-tab {
+        flex: 1 !important; // 宽度等分布局
+        margin-right: 0 !important;
+        margin-bottom: 0 !important; // 移除底部间距
+        border-top: 1px solid #d9d9d9;
+        border-left: 1px solid #d9d9d9;
+        border-bottom: 1px solid #d9d9d9; // 所有选项卡都有底部边框
+        border-right: none; // 默认没有右边框
+        &:last-child {
+          border-right: 1px solid #d9d9d9; // 最后一个选项卡有右边框
+        }
+        border-radius: 0;
+        background-color: #f5f5f5;
+        color: #333333;
+        font-weight: 500;
+        font-size: 16px;
+        height: 40px; // 固定高度
+        width: auto !important; // 移除固定宽度，以便等分
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: 0;
+      }
+      .ant-tabs-tab-active {
+        border-bottom: 1px solid transparent; // 激活时隐藏底部边框，与 ant-tabs-bar 的边框衔接
+        background-color: #ffffff;
+        color: #0057FE;
+        font-weight: 600;
+      }
+    }
+    :deep(.ant-tabs-ink-bar) {
+      display: none; // 隐藏下划线
+    }
+  }
 }
 </style>