vue2-client 1.2.37-1 → 1.2.38

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**##1.2.38 -2022-04-22 @朱子峰**
+- 功能修改：
+- [工单提交] 要求联系方式必须明确填写，不再从vuex中获取
+- [工单提交] 添加远程链接使用说明
+
 **##1.2.37 -2022-04-21 @张振宇**
 - `CreateQuery.vue`  还原不小心删除的内容
 - `CreateQuery.vue`  调整v_if的位置

package/package.json

@@ -1,90 +1,90 @@
-{
-  "name": "vue2-client",
-  "version": "1.2.37-1",
-  "private": false,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "@antv/data-set": "^0.11.4",
-    "@antv/f2": "^3.6.4",
-    "@antv/g2plot": "^2.3.33",
-    "@logicflow/core": "^1.1.7",
-    "@logicflow/extension": "^1.1.7",
-    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
-    "@vue/babel-preset-jsx": "^1.2.4",
-    "animate.css": "^4.1.0",
-    "ant-design-vue": "1.7.8",
-    "axios": "^0.19.2",
-    "clipboard": "^2.0.6",
-    "core-js": "^3.6.5",
-    "date-fns": "^2.14.0",
-    "default-passive-events": "^2.0.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^10.2.1",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.0.0-rc.1",
-    "lodash.get": "^4.4.2",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.6.11",
-    "vue-i18n": "^8.18.2",
-    "vue-json-viewer": "^2.2.15",
-    "vue-infinite-scroll": "^2.0.2",
-    "vue-router": "^3.3.4",
-    "vuedraggable": "^2.23.2",
-    "vuex": "^3.4.0",
-    "xlsx": "0.17.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^4.0.1",
-    "@vue/cli-plugin-babel": "^4.4.0",
-    "@vue/cli-plugin-eslint": "^4.4.0",
-    "@vue/cli-plugin-router": "^4.4.0",
-    "@vue/cli-plugin-unit-jest": "~5.0.0",
-    "@vue/cli-plugin-vuex": "^4.4.0",
-    "@vue/cli-service": "^4.4.0",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "@vue/test-utils": "^1.1.3",
-    "@vue/vue2-jest": "^27.0.0-alpha.2",
-    "@vuepress/plugin-back-to-top": "^1.5.2",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.0.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-polyfill": "^6.26.0",
-    "compression-webpack-plugin": "^2.0.0",
-    "deepmerge": "^4.2.2",
-    "echarts": "^4.9.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-standard": "^5.0.0",
-    "eslint-plugin-vue": "^6.2.2",
-    "fast-deep-equal": "^3.1.3",
-    "gh-pages": "^3.1.0",
-    "jest": "^27.0.5",
-    "less-loader": "^6.1.1",
-    "react-bmap": "^1.0.121",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.3.2",
-    "vue-amap": "^0.5.10",
-    "vue-baidu-map": "^0.21.22",
-    "vue-bmap-gl": "0.0.29",
-    "vue-cli-plugin-style-resources-loader": "^0.1.4",
-    "vue-mapvgl": "0.0.28",
-    "vue-template-compiler": "^2.6.11",
-    "vuepress": "^1.5.2",
-    "webpack-theme-color-replacer": "1.3.18",
-    "whatwg-fetch": "^3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 10"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.2.38",
+  "private": false,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "@antv/data-set": "^0.11.4",
+    "@antv/f2": "^3.6.4",
+    "@antv/g2plot": "^2.3.33",
+    "@logicflow/core": "^1.1.7",
+    "@logicflow/extension": "^1.1.7",
+    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+    "@vue/babel-preset-jsx": "^1.2.4",
+    "animate.css": "^4.1.0",
+    "ant-design-vue": "1.7.8",
+    "axios": "^0.19.2",
+    "clipboard": "^2.0.6",
+    "core-js": "^3.6.5",
+    "date-fns": "^2.14.0",
+    "default-passive-events": "^2.0.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^10.2.1",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.0.0-rc.1",
+    "lodash.get": "^4.4.2",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.6.11",
+    "vue-i18n": "^8.18.2",
+    "vue-json-viewer": "^2.2.15",
+    "vue-infinite-scroll": "^2.0.2",
+    "vue-router": "^3.3.4",
+    "vuedraggable": "^2.23.2",
+    "vuex": "^3.4.0",
+    "xlsx": "0.17.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^4.0.1",
+    "@vue/cli-plugin-babel": "^4.4.0",
+    "@vue/cli-plugin-eslint": "^4.4.0",
+    "@vue/cli-plugin-router": "^4.4.0",
+    "@vue/cli-plugin-unit-jest": "~5.0.0",
+    "@vue/cli-plugin-vuex": "^4.4.0",
+    "@vue/cli-service": "^4.4.0",
+    "@vue/eslint-config-standard": "^4.0.0",
+    "@vue/test-utils": "^1.1.3",
+    "@vue/vue2-jest": "^27.0.0-alpha.2",
+    "@vuepress/plugin-back-to-top": "^1.5.2",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "^27.0.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "babel-polyfill": "^6.26.0",
+    "compression-webpack-plugin": "^2.0.0",
+    "deepmerge": "^4.2.2",
+    "echarts": "^4.9.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-standard": "^5.0.0",
+    "eslint-plugin-vue": "^6.2.2",
+    "fast-deep-equal": "^3.1.3",
+    "gh-pages": "^3.1.0",
+    "jest": "^27.0.5",
+    "less-loader": "^6.1.1",
+    "react-bmap": "^1.0.121",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.3.2",
+    "vue-amap": "^0.5.10",
+    "vue-baidu-map": "^0.21.22",
+    "vue-bmap-gl": "0.0.29",
+    "vue-cli-plugin-style-resources-loader": "^0.1.4",
+    "vue-mapvgl": "0.0.28",
+    "vue-template-compiler": "^2.6.11",
+    "vuepress": "^1.5.2",
+    "webpack-theme-color-replacer": "1.3.18",
+    "whatwg-fetch": "^3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 10"
+  ]
+}

package/src/base-client/all.js

@@ -1,61 +1,61 @@
-import Vue from 'vue'
-
-import CustomColumnsDrawer from '@vue2-client/base-client/components/common/CustomColumnsDrawer'
-import InstructDetailsView from '@vue2-client/base-client/components/iot/InstructDetailsView'
-import MeterDetailsView from '@vue2-client/base-client/components/iot/MeterDetailsView'
-import CustomerDetailsView from '@vue2-client/base-client/components/iot/CustomerDetailsView'
-import LogDetailsView from '@vue2-client/base-client/components/iot/LogDetailsView'
-import WebmeterAnalysisView from '@vue2-client/base-client/components/iot/WebmeterAnalysisView'
-import XCard from '@vue2-client/base-client/components/common/XCard/XCard'
-import XFormCol from '@vue2-client/base-client/components/common/XFormCol'
-import XBadge from '@vue2-client/base-client/components/common/XBadge'
-import DataAnalysisView from '@vue2-client/base-client/components/iot/DataAnalysisView'
-import DataAnalysisUser from '@vue2-client/base-client/components/iot/DataAnalysisUser'
-import SrcollList from '@vue2-client/base-client/components/common/ScrollList'
-import AmapPointRendering from '@vue2-client/base-client/components/common/AmapPointRendering'
-import DeviceTypeDetailsView from '@vue2-client/base-client/components/iot/DeviceTypeDetailsView'
-import DeviceBrandDetailsView from '@vue2-client/base-client/components/iot/DeviceBrandDetailsView'
-import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
-import QueryParamsDetailsView from '@vue2-client/base-client/components/system/QueryParamsDetailsView'
-import DeviceDetailsView from '@vue2-client/base-client/components/iot/DeviceDetailsView'
-import TicketDetailsView from '@vue2-client/base-client/components/ticket/TicketDetailsView'
-import EmployeeDetailsView from '@vue2-client/base-client/components/ticket/EmployeeDetailsView'
-import submitTicketSuccess from '@vue2-client/base-client/components/ticket/TicketSubmitSuccessView'
-import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
-import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
-import FormGroupQuery from '@vue2-client/base-client/components/common/FormGroupQuery'
-import FormGroupEdit from '@vue2-client/base-client/components/common/FormGroupEdit'
-import JSONToTree from '@vue2-client/base-client/components/common/JSONToTree'
-import Upload from '@vue2-client/base-client/components/common/Upload'
-
-// 插件
-import Plugins from '@vue2-client/base-client/plugins'
-Vue.use(Plugins)
-
-Vue.component('custom-columns-drawer', CustomColumnsDrawer)
-Vue.component('InstructDetailsView', InstructDetailsView)
-Vue.component('MeterDetailsView', MeterDetailsView)
-Vue.component('CustomerDetailsView', CustomerDetailsView)
-Vue.component('LogDetailsView', LogDetailsView)
-Vue.component('WebmeterAnalysisView', WebmeterAnalysisView)
-Vue.component('XCard', XCard)
-Vue.component('XBadge', XBadge)
-Vue.component('XFormCol', XFormCol)
-Vue.component('DataAnalysisView', DataAnalysisView)
-Vue.component('DataAnalysisUser', DataAnalysisUser)
-Vue.component('SrcollList', SrcollList)
-Vue.component('DeviceTypeDetailsView', DeviceTypeDetailsView)
-Vue.component('DeviceBrandDetailsView', DeviceBrandDetailsView)
-Vue.component('DeviceDetailsView', DeviceDetailsView)
-Vue.component('DictionaryDetailsView', DictionaryDetailsView)
-Vue.component('QueryParamsDetailsView', QueryParamsDetailsView)
-Vue.component('TicketDetailsView', TicketDetailsView)
-Vue.component('EmployeeDetailsView', EmployeeDetailsView)
-Vue.component('submitTicketSuccess', submitTicketSuccess)
-Vue.component('CreateQuery', CreateQuery)
-Vue.component('CreateSimpleFormQuery', CreateSimpleFormQuery)
-Vue.component('FormGroupQuery', FormGroupQuery)
-Vue.component('FormGroupEdit', FormGroupEdit)
-Vue.component('JSONToTree', JSONToTree)
-Vue.component('Upload', Upload)
-Vue.component('AmapPointRendering', AmapPointRendering)
+import Vue from 'vue'
+
+import CustomColumnsDrawer from '@vue2-client/base-client/components/common/CustomColumnsDrawer'
+import InstructDetailsView from '@vue2-client/base-client/components/iot/InstructDetailsView'
+import MeterDetailsView from '@vue2-client/base-client/components/iot/MeterDetailsView'
+import CustomerDetailsView from '@vue2-client/base-client/components/iot/CustomerDetailsView'
+import LogDetailsView from '@vue2-client/base-client/components/iot/LogDetailsView'
+import WebmeterAnalysisView from '@vue2-client/base-client/components/iot/WebmeterAnalysisView'
+import XCard from '@vue2-client/base-client/components/common/XCard/XCard'
+import XFormCol from '@vue2-client/base-client/components/common/XFormCol'
+import XBadge from '@vue2-client/base-client/components/common/XBadge'
+import DataAnalysisView from '@vue2-client/base-client/components/iot/DataAnalysisView'
+import DataAnalysisUser from '@vue2-client/base-client/components/iot/DataAnalysisUser'
+import SrcollList from '@vue2-client/base-client/components/common/ScrollList'
+import AmapPointRendering from '@vue2-client/base-client/components/common/AmapMarker'
+import DeviceTypeDetailsView from '@vue2-client/base-client/components/iot/DeviceTypeDetailsView'
+import DeviceBrandDetailsView from '@vue2-client/base-client/components/iot/DeviceBrandDetailsView'
+import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
+import QueryParamsDetailsView from '@vue2-client/base-client/components/system/QueryParamsDetailsView'
+import DeviceDetailsView from '@vue2-client/base-client/components/iot/DeviceDetailsView'
+import TicketDetailsView from '@vue2-client/base-client/components/ticket/TicketDetailsView'
+import EmployeeDetailsView from '@vue2-client/base-client/components/ticket/EmployeeDetailsView'
+import submitTicketSuccess from '@vue2-client/base-client/components/ticket/TicketSubmitSuccessView'
+import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
+import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
+import FormGroupQuery from '@vue2-client/base-client/components/common/FormGroupQuery'
+import FormGroupEdit from '@vue2-client/base-client/components/common/FormGroupEdit'
+import JSONToTree from '@vue2-client/base-client/components/common/JSONToTree'
+import Upload from '@vue2-client/base-client/components/common/Upload'
+
+// 插件
+import Plugins from '@vue2-client/base-client/plugins'
+Vue.use(Plugins)
+
+Vue.component('custom-columns-drawer', CustomColumnsDrawer)
+Vue.component('InstructDetailsView', InstructDetailsView)
+Vue.component('MeterDetailsView', MeterDetailsView)
+Vue.component('CustomerDetailsView', CustomerDetailsView)
+Vue.component('LogDetailsView', LogDetailsView)
+Vue.component('WebmeterAnalysisView', WebmeterAnalysisView)
+Vue.component('XCard', XCard)
+Vue.component('XBadge', XBadge)
+Vue.component('XFormCol', XFormCol)
+Vue.component('DataAnalysisView', DataAnalysisView)
+Vue.component('DataAnalysisUser', DataAnalysisUser)
+Vue.component('SrcollList', SrcollList)
+Vue.component('DeviceTypeDetailsView', DeviceTypeDetailsView)
+Vue.component('DeviceBrandDetailsView', DeviceBrandDetailsView)
+Vue.component('DeviceDetailsView', DeviceDetailsView)
+Vue.component('DictionaryDetailsView', DictionaryDetailsView)
+Vue.component('QueryParamsDetailsView', QueryParamsDetailsView)
+Vue.component('TicketDetailsView', TicketDetailsView)
+Vue.component('EmployeeDetailsView', EmployeeDetailsView)
+Vue.component('submitTicketSuccess', submitTicketSuccess)
+Vue.component('CreateQuery', CreateQuery)
+Vue.component('CreateSimpleFormQuery', CreateSimpleFormQuery)
+Vue.component('FormGroupQuery', FormGroupQuery)
+Vue.component('FormGroupEdit', FormGroupEdit)
+Vue.component('JSONToTree', JSONToTree)
+Vue.component('Upload', Upload)
+Vue.component('AmapPointRendering', AmapPointRendering)

package/src/base-client/components/common/AmapMarker/AmapPointRendering.vue

@@ -1,106 +1,104 @@
-<template >
-  <div id="amap_point_rendering_map" :style="mapStyle">
-    <div v-show="false">
-      <div id="amap_point_rendering_template">
-        <a-descriptions>
-          <a-descriptions-item span="3" v-for="(des, index) in describeList" :key="index" :label="des.describe" >{{ selectrow[des.field] }}</a-descriptions-item>
-        </a-descriptions>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  export default {
-    name: 'AmapPointRendering',
-    props: {
-      // 选中点位后需要展示的信息描述
-      describeList: {
-        type: Array,
-        // eslint-disable-next-line vue/require-valid-default-prop
-        default: () => { return [ ] } // lng:描述信息 lat:描述信息对应的值的字段名 { describe: '用户名称', field: 'name' }
-      },
-      // 需要渲染的点位数据
-      markers: {
-        type: Object,
-        default: null // lng:精度值 lat:纬度值
-      },
-      // 渲染点位的图片
-      imgurl: {
-        type: String,
-        default: '/image/success1.png'
-      },
-      mapStyle: {
-        type: Object,
-        default: () => {
-          return {
-            width: '100%',
-            height: '85vh',
-            border: '2px solid lightgray',
-            'border-radius': '5px'
-          }
-        }
-      }
-    },
-    data () {
-      return {
-        map: null,
-        geocoder: null, // 逆地理编码
-        infoWindow: null,
-        selectrow: {}
-      }
-    },
-    created () {
-    },
-    mounted () {
-      this.initMap()
-      this.initData()
-    },
-    methods: {
-      initData () {
-        // 创建一个 Marker 实例：
-        if (this.markers && this.markers.lng && this.markers.lat) {
-          const that = this
-          const marker = new this.$AMap.Marker({
-            position: new this.$AMap.LngLat(this.markers.lng, this.markers.lat), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-            title: '北京',
-            icon: new this.$AMap.Icon({
-              size: new this.$AMap.Size(26, 28), // 图标大小
-              url: this.imgurl, // 报警图标URL
-              anchor: new this.$AMap.Pixel(0, 0), // 图标偏移位置
-            }),
-            extData: this.markers
-          })
-          marker.on('click', function (e) {
-            console.log(e.target.getExtData())
-            that.selectrow = e.target.getExtData()
-            that.infoWindow.setContent(document.getElementById('amap_point_rendering_template'))
-            that.infoWindow.open(that.map, [e.target.getExtData().lng, e.target.getExtData().lat])
-          })
-          // 将创建的点标记添加到已有的地图实例：
-          this.map.add(marker)
-          this.map.setFitView()
-        }
-      },
-      initMap () {
-        this.map = new this.$AMap.Map('amap_point_rendering_map', { // 设置地图容器id
-          resizeEnable: true, // 是否监控地图容器尺寸变化
-          zoom: 17, // 初始化地图层级
-          center: [108.943784, 34.265] // 初始化地图中心点
-        })
-        this.geocoder = new this.$AMap.Geocoder({
-          radius: 500 // 范围，默认：500
-        })
-        this.map.addControl(new this.$AMap.ToolBar()) // 初始化工具插件
-        // 初始化窗体
-        this.infoWindow = new this.$AMap.InfoWindow({
-          anchor: 'bottom-center',
-          isCustom: false, // 使用自定义窗体
-          autoMove: true,
-          content: '',
-          showShadow: true,
-          offset: new this.$AMap.Pixel(0, -25)
-        })
-      }
-    }
-  }
-</script>
+<template >
+  <div id="amap_point_rendering_map" :style="mapStyle">
+    <div v-show="false">
+      <div id="amap_point_rendering_template">
+        <a-descriptions :column="1">
+          <a-descriptions-item v-for="(des, index) in describeList" :key="index" :label="des.describe" >{{ markers[des.field] }}</a-descriptions-item>
+        </a-descriptions>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'AmapPointRendering',
+    props: {
+      // 选中点位后需要展示的信息描述
+      describeList: {
+        type: Array,
+        // eslint-disable-next-line vue/require-valid-default-prop
+        default: () => { return [ ] } // lng:描述信息 lat:描述信息对应的值的字段名 { describe: '用户名称', field: 'name' }
+      },
+      // 需要渲染的点位数据
+      markers: {
+        type: Object,
+        default: null // lng:精度值 lat:纬度值
+      },
+      // 渲染点位的图片
+      imgurl: {
+        type: String,
+        default: '/image/success1.png'
+      },
+      mapStyle: {
+        type: Object,
+        default: () => {
+          return {
+            width: '100%',
+            height: '85vh',
+            border: '2px solid lightgray',
+            'border-radius': '5px'
+          }
+        }
+      }
+    },
+    data () {
+      return {
+        map: null,
+        geocoder: null, // 逆地理编码
+        infoWindow: null,
+        selectrow: {}
+      }
+    },
+    created () {
+    },
+    mounted () {
+      this.initMap()
+      this.initData()
+    },
+    methods: {
+      initData () {
+        // 创建一个 Marker 实例：
+        if (this.markers && this.markers.lng && this.markers.lat) {
+          const that = this
+          const marker = new this.$AMap.Marker({
+            position: new this.$AMap.LngLat(this.markers.lng, this.markers.lat), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+            title: '北京',
+            icon: new this.$AMap.Icon({
+              size: new this.$AMap.Size(26, 28), // 图标大小
+              url: this.imgurl, // 报警图标URL
+              anchor: new this.$AMap.Pixel(0, 0), // 图标偏移位置
+            }),
+            extData: this.markers
+          })
+          marker.on('click', function (e) {
+            that.infoWindow.setContent(document.getElementById('amap_point_rendering_template'))
+            that.infoWindow.open(that.map, [e.target.getExtData().lng, e.target.getExtData().lat])
+          })
+          // 将创建的点标记添加到已有的地图实例：
+          this.map.add(marker)
+          this.map.setFitView()
+        }
+      },
+      initMap () {
+        this.map = new this.$AMap.Map('amap_point_rendering_map', { // 设置地图容器id
+          resizeEnable: true, // 是否监控地图容器尺寸变化
+          zoom: 17, // 初始化地图层级
+          center: [108.943784, 34.265] // 初始化地图中心点
+        })
+        this.geocoder = new this.$AMap.Geocoder({
+          radius: 500 // 范围，默认：500
+        })
+        this.map.addControl(new this.$AMap.ToolBar()) // 初始化工具插件
+        // 初始化窗体
+        this.infoWindow = new this.$AMap.InfoWindow({
+          anchor: 'bottom-center',
+          isCustom: false, // 使用自定义窗体
+          autoMove: true,
+          content: '',
+          showShadow: true,
+          offset: new this.$AMap.Pixel(0, -25)
+        })
+      }
+    }
+  }
+</script>

package/src/base-client/components/common/AmapMarker/index.js

@@ -1,3 +1,3 @@
-import AmapPointRendering from './AmapPointRendering'
-
-export default AmapPointRendering
+import AmapPointRendering from './AmapPointRendering'
+
+export default AmapPointRendering