vue2-client 1.9.136 → 1.9.137

package/package.json

@@ -1,102 +1,102 @@
-{
-  "name": "vue2-client",
-  "version": "1.9.136",
-  "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: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": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@hufe921/canvas-editor": "^0.9.49",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "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",
-    "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",
-    "@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-jest": "^26.6.3",
-    "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": "^26.6.3",
-    "jest-environment-jsdom": "^26.6.2",
-    "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.9.137",
+  "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: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": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@hufe921/canvas-editor": "^0.9.49",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "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",
+    "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",
+    "@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-jest": "^26.6.3",
+    "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": "^26.6.3",
+    "jest-environment-jsdom": "^26.6.2",
+    "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/XDataCard/XDataCard.vue

@@ -312,16 +312,17 @@ export default {
 .XCard {
   display: flex;
   flex-wrap: wrap;
-  justify-content: space-between;
+  justify-content: flex-start;
   overflow-y: auto;
   overflow-x: hidden;
   max-height: 85vh;
 
   .data-card {
     width: 100%;
+    max-width: 300px;
     border: 2px solid rgb(244,244,244);
     border-radius: 5px;
-    margin-bottom: 10px;
+    margin: 5px;
 
     .header {
       width: 100%;

package/src/base-client/components/common/XSimpleDescriptions/XSimpleDescriptions.vue

@@ -1,166 +1,166 @@
-<template>
-  <div>
-    <a-row type="flex" justfy="space-around">
-      <template v-for="(item, index) in config">
-        <!--    展示项    -->
-        <a-col :key="'col' + index" :span="Math.floor(24 / config.length)">
-          <div class="item">
-            <!--    标题    -->
-            <p class="label">{{ item.label }}</p>
-            <!--    内容 - 进度条    -->
-            <template v-if="item.type === 'percent'">
-              <p class="value" :style="'color: ' + determineColor(data[item.key])">{{ data[item.key] }}%</p>
-            </template>
-            <!--    内容 - 非进度条    -->
-            <template v-else>
-              <p class="value" :style="item.style ? item.style : ''">{{ data[item.key] }}</p>
-            </template>
-          </div>
-        </a-col>
-        <!--    分割线    -->
-        <a-col :key="'col' + index + 'after'" :span="1" v-if="index !== config.length - 1" class="divider-col">
-          <a-divider type="vertical" class="divider"/>
-        </a-col>
-      </template>
-    </a-row>
-  </div>
-</template>
-
-<script>
-
-import { getConfigByName } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XSimpleDescriptions',
-  props: {
-    // 配置
-    dataConfig: {
-      type: Array,
-      default: undefined
-    },
-    // 数据
-    dataContent: {
-      type: Object,
-      default: undefined
-    },
-    // 配置名
-    dataConfigName: {
-      type: String,
-      default: undefined
-    },
-    // 服务名
-    serviceName: {
-      type: String,
-      default: process.env.VUE_APP_SYSTEM_NAME
-    }
-  },
-  data () {
-    return {
-      // 配置
-      config: [],
-      // 数据
-      data: {},
-    }
-  },
-  mounted () {
-    // 初始化配置
-    if (this.dataConfig) {
-      this.config = this.dataConfig
-    } else if (this.dataConfigName) {
-      getConfigByName(this.dataConfigName, this.serviceName, (res) => {
-        this.config = res.config
-      })
-    } else {
-      this.config = [
-        {
-          label: '未能正确获取配置',
-          key: 'totalUser'
-        },
-        {
-          label: '未能正确获取配置',
-          key: 'totalResidentArea'
-        },
-        {
-          label: '未能正确获取配置',
-          key: 'doneNum'
-        },
-        {
-          label: '未能正确获取配置',
-          key: 'todoNum'
-        },
-        {
-          label: '未能正确获取配置',
-          key: 'ratio',
-          type: 'percent'
-        }
-      ]
-    }
-
-    // 初始化数据
-    if (this.dataContent) {
-      this.data = this.dataContent
-    } else {
-      this.data = {
-        totalUser: 0,
-        totalResidentArea: 0,
-        doneNum: 0,
-        todoNum: 0,
-        ratio: 20
-      }
-    }
-  },
-  methods: {
-    // 根据完成率决定颜色
-    determineColor (ratio) {
-      let result
-      if (ratio >= 90) {
-        result = 'rgb(   1,245, 38 )'
-      } else if (ratio >= 75) {
-        result = 'rgb( 139,245,  0)'
-      } else if (ratio >= 40) {
-        result = 'rgb(245,163,  0)'
-      } else if (ratio >= 20) {
-        result = 'rgb(244, 96,  0)'
-      } else {
-        result = 'rgb(255,  0,  0)'
-      }
-      return result
-    }
-  },
-  watch: {
-    dataContent: {
-      handler (newValue) {
-        this.data = newValue
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.item {
-  padding: 5%;
-
-  .label {
-    color: rgba(117, 117, 117, 0.8);
-    text-align: center;
-  }
-
-  .value {
-    color: rgb( 51,157,255 );
-    font-size: 1.6em;
-    text-align: center;
-  }
-}
-
-.divider-col {
-  display: flex;
-  justify-content: center;
-
-  .divider {
-    margin-top: 35%;
-    height: 40px;
-  }
-}
-</style>
+<template>
+  <div>
+    <a-row type="flex" justfy="space-around">
+      <template v-for="(item, index) in config">
+        <!--    展示项    -->
+        <a-col :key="'col' + index" :span="Math.floor(24 / config.length)">
+          <div class="item">
+            <!--    标题    -->
+            <p class="label">{{ item.label }}</p>
+            <!--    内容 - 进度条    -->
+            <template v-if="item.type === 'percent'">
+              <p class="value" :style="'color: ' + determineColor(data[item.key])">{{ data[item.key] }}%</p>
+            </template>
+            <!--    内容 - 非进度条    -->
+            <template v-else>
+              <p class="value" :style="item.style ? item.style : ''">{{ data[item.key] }}</p>
+            </template>
+          </div>
+        </a-col>
+        <!--    分割线    -->
+        <a-col :key="'col' + index + 'after'" :span="1" v-if="index !== config.length - 1" class="divider-col">
+          <a-divider type="vertical" class="divider"/>
+        </a-col>
+      </template>
+    </a-row>
+  </div>
+</template>
+
+<script>
+
+import { getConfigByName } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XSimpleDescriptions',
+  props: {
+    // 配置
+    dataConfig: {
+      type: Array,
+      default: undefined
+    },
+    // 数据
+    dataContent: {
+      type: Object,
+      default: undefined
+    },
+    // 配置名
+    dataConfigName: {
+      type: String,
+      default: undefined
+    },
+    // 服务名
+    serviceName: {
+      type: String,
+      default: process.env.VUE_APP_SYSTEM_NAME
+    }
+  },
+  data () {
+    return {
+      // 配置
+      config: [],
+      // 数据
+      data: {},
+    }
+  },
+  mounted () {
+    // 初始化配置
+    if (this.dataConfig) {
+      this.config = this.dataConfig
+    } else if (this.dataConfigName) {
+      getConfigByName(this.dataConfigName, this.serviceName, (res) => {
+        this.config = res.config
+      })
+    } else {
+      this.config = [
+        {
+          label: '未能正确获取配置',
+          key: 'totalUser'
+        },
+        {
+          label: '未能正确获取配置',
+          key: 'totalResidentArea'
+        },
+        {
+          label: '未能正确获取配置',
+          key: 'doneNum'
+        },
+        {
+          label: '未能正确获取配置',
+          key: 'todoNum'
+        },
+        {
+          label: '未能正确获取配置',
+          key: 'ratio',
+          type: 'percent'
+        }
+      ]
+    }
+
+    // 初始化数据
+    if (this.dataContent) {
+      this.data = this.dataContent
+    } else {
+      this.data = {
+        totalUser: 0,
+        totalResidentArea: 0,
+        doneNum: 0,
+        todoNum: 0,
+        ratio: 20
+      }
+    }
+  },
+  methods: {
+    // 根据完成率决定颜色
+    determineColor (ratio) {
+      let result
+      if (ratio >= 90) {
+        result = 'rgb(   1,245, 38 )'
+      } else if (ratio >= 75) {
+        result = 'rgb( 139,245,  0)'
+      } else if (ratio >= 40) {
+        result = 'rgb(245,163,  0)'
+      } else if (ratio >= 20) {
+        result = 'rgb(244, 96,  0)'
+      } else {
+        result = 'rgb(255,  0,  0)'
+      }
+      return result
+    }
+  },
+  watch: {
+    dataContent: {
+      handler (newValue) {
+        this.data = newValue
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.item {
+  padding: 5%;
+
+  .label {
+    color: rgba(117, 117, 117, 0.8);
+    text-align: center;
+  }
+
+  .value {
+    color: rgb( 51,157,255 );
+    font-size: 1.6em;
+    text-align: center;
+  }
+}
+
+.divider-col {
+  display: flex;
+  justify-content: center;
+
+  .divider {
+    margin-top: 35%;
+    height: 40px;
+  }
+}
+</style>