vue2-client 1.2.46 → 1.2.49-1

package/CHANGELOG.md

@@ -1,6 +1,22 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.2.49 -2022-05-07 @江超**
+- 问题修复：
+- 解决售后工单定时器内存泄露问题
+
+**1.2.48 -2022-05-07 @江超**
+- 功能修改：
+- 登录后不再请求加载燃气公司列表，以及燃气设备报警信息了
+
+**1.2.47 -2022-04-27 @何文强**
+- 功能修改：
+- 新增根据地址串获取经纬度
+
+**1.2.46 -2022-04-26 @陈栋扬**
+- 问题修复：
+- 主题颜色可以替换即时生效了
+
 **1.2.44 - 1.2.45 -2022-04-26 @苗艳强**
 - 问题修复：
 - 修复单页面刷新无效的问题

package/docs/notice.md

@@ -1,22 +1,22 @@
-# 开发规范(持续跟新)
-## 引入各种文件时,必须写绝对路径, 不允许写相对路径
-```js
-// 引自己项目时文件时,  @ 表示自己项目的src目录
-import('@vue2-client/pages/system/queryParams')
-```
-## 编写vue文件的样式时, 必须使用less, 样式必须在最外层添加当前页面html的id, id与vue文件名相同
-```vue
-helloWorld.vue
-<template>
-  <div id="helloWorld">
-  
-  </div>
-</template>
-
-<style lang="less">
- #helloWorld{
-  /*写自己的样式*/
- }
-</style>
-```
-
+# 开发规范(持续跟新)
+## 引入各种文件时,必须写绝对路径, 不允许写相对路径
+```js
+// 引自己项目时文件时,  @ 表示自己项目的src目录
+import('@vue2-client/pages/system/queryParams')
+```
+## 编写vue文件的样式时, 必须使用less, 样式必须在最外层添加当前页面html的id, id与vue文件名相同
+```vue
+helloWorld.vue
+<template>
+  <div id="helloWorld">
+  
+  </div>
+</template>
+
+<style lang="less">
+ #helloWorld{
+  /*写自己的样式*/
+ }
+</style>
+```
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.46",
+  "version": "1.2.49-1",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/App.vue

@@ -1,99 +1,99 @@
-<template>
-  <a-config-provider :locale="locale" :get-popup-container="popContainer">
-    <router-view/>
-  </a-config-provider>
-</template>
-
-<script>
-import { enquireScreen } from '@vue2-client/utils/util'
-import { mapState, mapMutations } from 'vuex'
-import themeUtil from '@vue2-client/utils/themeUtil'
-import { getI18nKey } from '@vue2-client/utils/routerUtil'
-
-export default {
-  name: 'App',
-  data () {
-    return {
-      locale: {}
-    }
-  },
-  created () {
-    this.setHtmlTitle()
-    this.setLanguage(this.lang)
-    enquireScreen(isMobile => this.setDevice(isMobile))
-  },
-  mounted () {
-   this.setWeekModeTheme(this.weekMode)
-  },
-  watch: {
-    weekMode (val) {
-      this.setWeekModeTheme(val)
-    },
-    lang (val) {
-      this.setLanguage(val)
-      this.setHtmlTitle()
-    },
-    $route () {
-      this.setHtmlTitle()
-    },
-    'theme.mode': {
-      immediate: true,
-      handler: function (val) {
-        const closeMessage = this.$message.loading(`您选择了主题模式 ${val}, 正在切换...`)
-        themeUtil.changeThemeColor(this.theme.color, val).then(closeMessage)
-      }
-    },
-    'theme.color': {
-      immediate: true,
-      handler: function (val) {
-        const closeMessage = this.$message.loading(`您选择了主题色 ${val}, 正在切换...`)
-        themeUtil.changeThemeColor(val, this.theme.mode).then(closeMessage)
-      }
-    },
-    'layout': function () {
-      window.dispatchEvent(new Event('resize'))
-    }
-  },
-  computed: {
-    ...mapState('setting', ['layout', 'theme', 'weekMode', 'lang'])
-  },
-  methods: {
-    ...mapMutations('setting', ['setDevice']),
-    setWeekModeTheme (weekMode) {
-      if (weekMode) {
-        document.body.classList.add('week-mode')
-      } else {
-        document.body.classList.remove('week-mode')
-      }
-    },
-    setLanguage (lang) {
-      this.$i18n.locale = lang
-      switch (lang) {
-        case 'CN':
-          this.locale = require('ant-design-vue/es/locale-provider/zh_CN').default
-          break
-        case 'HK':
-          this.locale = require('ant-design-vue/es/locale-provider/zh_TW').default
-          break
-        case 'US':
-        default:
-          this.locale = require('ant-design-vue/es/locale-provider/en_US').default
-          break
-      }
-    },
-    setHtmlTitle () {
-      const route = this.$route
-      const key = route.path === '/' ? 'home.name' : getI18nKey(route.matched[route.matched.length - 1].path)
-      document.title = process.env.VUE_APP_NAME + ' | ' + this.$t(key)
-    },
-    popContainer () {
-      return document.getElementById('popContainer')
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-  #id{
-  }
-</style>
+<template>
+  <a-config-provider :locale="locale" :get-popup-container="popContainer">
+    <router-view/>
+  </a-config-provider>
+</template>
+
+<script>
+import { enquireScreen } from '@vue2-client/utils/util'
+import { mapState, mapMutations } from 'vuex'
+import themeUtil from '@vue2-client/utils/themeUtil'
+import { getI18nKey } from '@vue2-client/utils/routerUtil'
+
+export default {
+  name: 'App',
+  data () {
+    return {
+      locale: {}
+    }
+  },
+  created () {
+    this.setHtmlTitle()
+    this.setLanguage(this.lang)
+    enquireScreen(isMobile => this.setDevice(isMobile))
+  },
+  mounted () {
+   this.setWeekModeTheme(this.weekMode)
+  },
+  watch: {
+    weekMode (val) {
+      this.setWeekModeTheme(val)
+    },
+    lang (val) {
+      this.setLanguage(val)
+      this.setHtmlTitle()
+    },
+    $route () {
+      this.setHtmlTitle()
+    },
+    'theme.mode': {
+      immediate: true,
+      handler: function (val) {
+        const closeMessage = this.$message.loading(`您选择了主题模式 ${val}, 正在切换...`)
+        themeUtil.changeThemeColor(this.theme.color, val).then(closeMessage)
+      }
+    },
+    'theme.color': {
+      immediate: true,
+      handler: function (val) {
+        const closeMessage = this.$message.loading(`您选择了主题色 ${val}, 正在切换...`)
+        themeUtil.changeThemeColor(val, this.theme.mode).then(closeMessage)
+      }
+    },
+    'layout': function () {
+      window.dispatchEvent(new Event('resize'))
+    }
+  },
+  computed: {
+    ...mapState('setting', ['layout', 'theme', 'weekMode', 'lang'])
+  },
+  methods: {
+    ...mapMutations('setting', ['setDevice']),
+    setWeekModeTheme (weekMode) {
+      if (weekMode) {
+        document.body.classList.add('week-mode')
+      } else {
+        document.body.classList.remove('week-mode')
+      }
+    },
+    setLanguage (lang) {
+      this.$i18n.locale = lang
+      switch (lang) {
+        case 'CN':
+          this.locale = require('ant-design-vue/es/locale-provider/zh_CN').default
+          break
+        case 'HK':
+          this.locale = require('ant-design-vue/es/locale-provider/zh_TW').default
+          break
+        case 'US':
+        default:
+          this.locale = require('ant-design-vue/es/locale-provider/en_US').default
+          break
+      }
+    },
+    setHtmlTitle () {
+      const route = this.$route
+      const key = route.path === '/' ? 'home.name' : getI18nKey(route.matched[route.matched.length - 1].path)
+      document.title = process.env.VUE_APP_NAME + ' | ' + this.$t(key)
+    },
+    popContainer () {
+      return document.getElementById('popContainer')
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  #id{
+  }
+</style>

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/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)
+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,104 +1,105 @@
-<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>
+<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>
+  import { GetGDMap } from '@vue2-client/utils/map-utils'
+  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 () {
+    },
+    async mounted () {
+     await this.initMap()
+     await this.initData()
+    },
+    methods: {
+      async initData () {
+        // 创建一个 Marker 实例：
+        if (this.markers && this.markers.lng && this.markers.lat) {
+          const that = this
+          const marker = new (await GetGDMap()).Marker({
+            position: new (await GetGDMap()).LngLat(this.markers.lng, this.markers.lat), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+            title: '北京',
+            icon: new (await GetGDMap()).Icon({
+              size: new (await GetGDMap()).Size(26, 28), // 图标大小
+              url: this.imgurl, // 报警图标URL
+              anchor: new (await GetGDMap()).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()
+        }
+      },
+      async initMap() {
+        this.map = new (await GetGDMap()).Map('amap_point_rendering_map', { // 设置地图容器id
+          resizeEnable: true, // 是否监控地图容器尺寸变化
+          zoom: 17, // 初始化地图层级
+          center: [108.943784, 34.265] // 初始化地图中心点
+        })
+        this.geocoder = new (await GetGDMap()).Geocoder({
+          radius: 500 // 范围，默认：500
+        })
+        this.map.addControl(new (await GetGDMap()).ToolBar()) // 初始化工具插件
+        // 初始化窗体
+        this.infoWindow = new (await GetGDMap()).InfoWindow({
+          anchor: 'bottom-center',
+          isCustom: false, // 使用自定义窗体
+          autoMove: true,
+          content: '',
+          showShadow: true,
+          offset: new (await GetGDMap()).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