vue2-client 1.12.90 → 1.12.92

package/package.json

@@ -1,109 +1,109 @@
-{
-  "name": "vue2-client",
-  "version": "1.12.90",
-  "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",
-    "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",
-    "dayjs": "^1.11.13",
-    "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-draggable-resizable": "^2",
-    "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",
-    "@jest/globals": "^29.7.0",
-    "@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.12.92",
+  "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",
+    "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",
+    "dayjs": "^1.11.13",
+    "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-draggable-resizable": "^2",
+    "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",
+    "@jest/globals": "^29.7.0",
+    "@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/XCalendar/XCalendar.vue

@@ -62,6 +62,7 @@
 import { Calendar, Button } from 'ant-design-vue'
 import moment from 'moment'
 import 'moment/locale/zh-cn'
+import { getConfigByName } from '@vue2-client/services/api/common'
 
 // 设置中文
 moment.locale('zh-cn')
@@ -114,7 +115,8 @@ const defaultConfig = {
     backToToday: 'back-to-today',
     action: 'action',
     add: 'add',
-    monthChange: 'month-change'
+    monthChange: 'month-change',
+    init: 'init'
   }
 }
 
@@ -142,8 +144,7 @@ export default {
     }
   },
   created () {
-    // 深度合并配置
-    this.mergedConfig = this.mergeConfig(defaultConfig, this.config)
+    this.getData(this.config)
   },
   computed: {
     // 使用计算属性访问合并后的配置
@@ -161,6 +162,14 @@ export default {
     }
   },
   methods: {
+    // 获取配置
+    getData (config) {
+      getConfigByName(config, 'af-his', res => {
+        // 深度合并配置
+        this.mergedConfig = this.mergeConfig(defaultConfig, res)
+        this.$emit(this.mergedConfig.events.init, this.currentDate)
+      })
+    },
     // 深度合并配置
     mergeConfig (defaultConfig, userConfig) {
       const result = { ...defaultConfig }
@@ -222,6 +231,15 @@ export default {
     handleAdd (action) {
       this.$emit(this.config.events.add, this.currentDate)
     }
+  },
+  watch: {
+    // 监听配置参数名称变化
+    queryParamsName: {
+      handler (newValue) {
+        this.getData(newValue)
+      },
+      deep: true,
+    }
   }
 }
 </script>

package/src/base-client/components/his/XList/XList.vue

@@ -1,8 +1,17 @@
 <template>
-  <div class="list-wrapper" >
+  <div class="list-wrapper">
     <a-list size="large" :data-source="data" itemLayout="horizontal" class="list-container" ref="listRef">
       <a-list-item slot="renderItem" slot-scope="item, index" class="list-item" @click="handleClick(index)">
-        {{ item.number }} {{ item.name }}
+        <i
+          v-if="icon"
+          class="icon-menu"
+          :style="getIconStyle(item)"
+        ></i>
+        <span
+          class="item-text">
+          {{ item.number }} {{ item.name }}
+        </span>
+        <a-button v-if="button" type="link" class="confirm-btn" @click.stop="click(index)">{{ buttonName }}</a-button>
       </a-list-item>
     </a-list>
   </div>
@@ -10,20 +19,23 @@
 
 <script>
 
-import { runLogic } from '@vue2-client/services/api/common'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XList',
   props: {
     queryParamsName: {
       type: Object,
-      default: 'outpatientWaitLogic'
-    },
+      default: 'outpatientWaitConfig'
+    }
   },
   inject: ['getComponentByName'],
   data () {
     return {
-      data: []
+      data: [],
+      button: false,
+      icon: false,
+      buttonName: ''
     }
   },
   created () {
@@ -31,8 +43,13 @@ export default {
   },
   methods: {
     async getData (config) {
-      runLogic(config, {}, 'af-his').then(res => {
-        this.data = res
+      getConfigByName(config, 'af-his', res => {
+        this.button = res.button
+        this.icon = res.icon
+        this.buttonName = res.buttonName
+        runLogic(res.mainSource, {}, 'af-his').then(resData => {
+          this.data = resData
+        })
       })
     },
     handleClick (index) {
@@ -41,7 +58,14 @@ export default {
     refreshList () {
       this.getData(this.queryParamsName)
     },
-
+    click (index) {
+      this.$emit('click', this.data[index + 1])
+    },
+    getIconStyle (item) {
+      return item.picture
+        ? { backgroundImage: `url(${item.picture})` }
+        : {}
+    }
   }
 }
 </script>
@@ -50,7 +74,6 @@ export default {
 .list-wrapper {
   max-height: 240px;
   overflow-y: auto;
-  cursor: pointer;
   padding-right: 2px;
 }
 
@@ -62,16 +85,31 @@ export default {
   height: 35px;
   border-radius: 6px;
   background-color: #F4F4F4;
-  padding: 8px 15px 7px 15px;
+  padding: 8px 15px;
   font-size: 16px;
   display: flex;
   align-items: center;
   width: 100%;
   border: 1px solid #D9D9D9;
   box-sizing: border-box;
-  margin-bottom: 16px;
-  white-space: nowrap;
-  overflow: clip;
+  margin-bottom: 8px !important;
+}
+
+.icon-menu {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  background-color: #ccc;
+  margin-right: 8px;
+}
+
+.item-text {
+  flex: 1;
+}
+
+.confirm-btn {
+  margin-left: auto;
+  padding: 0 8px;
 }
 
 /* 自定义滚动条样式 */

package/src/base-client/components/his/XSidebar/XSidebar.vue

@@ -50,7 +50,7 @@ export default {
     return {
       isOpen: false,
       // 定义主内容区域的最大和最小宽度百分比
-      mainWithData: [{ max: 80, min: 56 }]
+      mainWithData: [{ max: 80, min: 50 }]
     }
   },
   mounted () {
@@ -82,7 +82,7 @@ export default {
           return []
         }
         // 获取a-row中的所有a-col
-        const allCols = Array.from(row.querySelectorAll('.ant-col-14'))
+        const allCols = Array.from(row.querySelectorAll('.ant-col-12'))
         // 过滤掉当前a-col，返回其他所有a-col
         return allCols.filter(col => col !== currentCol)
       } catch (error) {
@@ -102,7 +102,7 @@ export default {
             }
             if (currentCol) {
               // 更新当前列的宽度
-              const drawerWidth = isOpen ? 27 : 2
+              const drawerWidth = isOpen ? 33.3 : 2
               // 强制更新样式
               currentCol.style.cssText = `
             flex: 0 0 ${drawerWidth}% !important;
@@ -190,7 +190,7 @@ export default {
 .arrow {
   font-size: 20px;
   line-height: 1;
-  color: rgba(24, 144, 245);
+  color: #94979E;
 }
 .drawer-content {
   height: 100%;

package/src/base-client/components/his/XTimeSelect/XTimeSelect.vue

@@ -0,0 +1,102 @@
+<template>
+  <div class="x-time-select">
+    <a-range-picker
+      :value="dateRange"
+      :placeholder="['开始日期', '结束日期']"
+      separator="至"
+      :disabled="disabled"
+      :allowClear="allowClear"
+      :format="format"
+      @change="handleDateChange"
+    />
+  </div>
+</template>
+
+<script>
+import dayjs from 'dayjs'
+
+export default {
+  name: 'XTimeSelect',
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    allowClear: {
+      type: Boolean,
+      default: true
+    },
+    format: {
+      type: String,
+      default: 'YYYY/MM/DD'
+    }
+  },
+  data () {
+    return {
+      dateRange: []
+    }
+  },
+  watch: {
+    value: {
+      handler (newVal) {
+        if (newVal && newVal.length === 2) {
+          this.dateRange = [
+            newVal[0] ? dayjs(newVal[0]) : null,
+            newVal[1] ? dayjs(newVal[1]) : null
+          ]
+        } else {
+          this.dateRange = []
+        }
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  methods: {
+    handleDateChange (dates, dateStrings) {
+      this.dateRange = dates
+      this.$emit('input', dates)
+      this.$emit('change', {
+        dates,
+        dateStrings
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.x-time-select {
+  position: relative;
+  width: 100%;
+  box-sizing: border-box;
+  display: block;
+}
+.x-time-select :deep(.ant-picker-range),
+.x-time-select :deep(.ant-picker) {
+  width: 100%;
+  height: 30px;
+  border-radius: 7px;
+  background: #FFFFFF;
+  border: 1px solid #E5E9F0;
+}
+.x-time-select :deep(.ant-calendar-picker) {
+  width: 100%;
+  display: block;
+}
+.x-time-select :deep(.ant-calendar-picker-input) {
+  width: 100%;
+  height: 30px;
+  border-radius: 7px;
+  background: #FFFFFF;
+  border: 1px solid #E5E9F0;
+}
+
+.x-time-select :deep(.ant-input) {
+  width: 100%;
+}
+</style>

package/src/router/async/router.map.js

@@ -52,9 +52,10 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
   path: 'example',
   name: '示例主页面',
+  component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelect.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XRadio/XRadio.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XList/XList.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XCollapse/XCollapse.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDataCard/XDataCard.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),