vue2-client 1.2.4 → 1.2.7

package/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Change Log
+> 所有关于本项目的变化都在该文档里。
+
+**##1.2.7 -2022-03-24 @江超**
+- 功能新增：
+- [系统设置]：新增 [工单提交] 功能（submitTicket），用户在操作业务时如发现系统异常，可使用该功能反馈问题
+- [登录页面]：登陆人部门为 [用户工单登记] 时会直接跳转到[工单提交]页面（在基于新架构的营收全面使用时，会取消该限制，并将[工单提交]作为常驻功能）
+
+**##1.0.0 - 1.2.6 -2022-03-23 @陈栋扬**
+- 初始化：
+- 公共组件和配置抽取完成

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.4",
+  "version": "1.2.7",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/components/iot/DataAnalysisView/DataAnalysisView.vue

@@ -1,244 +1,244 @@
-<template>
-  <a-row type="flex">
-    <baidu-map
-      :mapStyle="mapStyle"
-      class="bm-view"
-      :center="'西安'"
-      :scroll-wheel-zoom="true"
-      :zoom="zoom"
-      @ready="handler"
-      @click="searchClick"
-      ak="YOUR_APP_KEY">
-      <bm-view style="width: 100%; height:100%; flex: 1"></bm-view>
-      <bm-control :offset="{width: '10px', height: '10px'}">
-        <bm-auto-complete :sugStyle="{zIndex: 1}">
-          <a-input v-model="keyword" type="text" placeholder="地区信息搜索" style="width: 150px;height: 50px" /> <!-- 这里指代一个自定义搜索框组件 -->
-        </bm-auto-complete>
-      </bm-control>
-      <bm-navigation anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>
-      <bm-geolocation anchor="BMAP_ANCHOR_BOTTOM_RIGHT" :showAddressBar="true" :autoLocation="true"></bm-geolocation>
-      <bm-local-search :keyword="keyword" :panel="false" :auto-viewport="true" zoom="12.8" style="display: none" ></bm-local-search>
-    </baidu-map>
-  </a-row>
-</template>
-
-<script>
-    import { BaiduMap, BmView, BmNavigation, BMCityList, BmGeolocation, BmControl, BmLocalSearch } from 'vue-baidu-map'
-    export default {
-        components: {
-            BaiduMap,
-            BmNavigation,
-            BmView,
-            BMCityList,
-            BmGeolocation,
-            BmControl,
-            BmLocalSearch
-        },
-        data () {
-            return {
-              keyword: '',
-                center: {
-                    lng: 12131693.03,
-                    lat: 4063684.53
-                },
-                zoom: 17,
-                address: {
-                  propprovince: '', // 省
-                  propcity: '', // 市
-                  propcounty: '', // 县
-                  propaddress: '' // 详细地址
-                },
-              mapStyle: {
-                styleJson: [
-                  {
-                    featureType: 'water',
-                    elementType: 'all',
-                    stylers: {
-                      color: '#021019'
-                    }
-                  },
-                  {
-                    featureType: 'highway',
-                    elementType: 'geometry.fill',
-                    stylers: {
-                      color: '#000000'
-                    }
-                  },
-                  {
-                    featureType: 'highway',
-                    elementType: 'geometry.stroke',
-                    stylers: {
-                      color: '#147a92'
-                    }
-                  },
-                  {
-                    featureType: 'arterial',
-                    elementType: 'geometry.fill',
-                    stylers: {
-                      color: '#000000'
-                    }
-                  },
-                  {
-                    featureType: 'arterial',
-                    elementType: 'geometry.stroke',
-                    stylers: {
-                      color: '#0b3d51'
-                    }
-                  },
-                  {
-                    featureType: 'local',
-                    elementType: 'geometry',
-                    stylers: {
-                      color: '#000000'
-                    }
-                  },
-                  {
-                    featureType: 'land',
-                    elementType: 'all',
-                    stylers: {
-                      color: '#08304b'
-                    }
-                  },
-                  {
-                    featureType: 'railway',
-                    elementType: 'geometry.fill',
-                    stylers: {
-                      color: '#000000'
-                    }
-                  },
-                  {
-                    featureType: 'railway',
-                    elementType: 'geometry.stroke',
-                    stylers: {
-                      color: '#08304b'
-                    }
-                  },
-                  {
-                    featureType: 'subway',
-                    elementType: 'geometry',
-                    stylers: {
-                      lightness: -70
-                    }
-                  },
-                  {
-                    featureType: 'building',
-                    elementType: 'geometry.fill',
-                    stylers: {
-                      color: '#000000'
-                    }
-                  },
-                  {
-                    featureType: 'all',
-                    elementType: 'labels.text.fill',
-                    stylers: {
-                      color: '#857f7f'
-                    }
-                  },
-                  {
-                    featureType: 'all',
-                    elementType: 'labels.text.stroke',
-                    stylers: {
-                      color: '#000000'
-                    }
-                  },
-                  {
-                    featureType: 'building',
-                    elementType: 'geometry',
-                    stylers: {
-                      color: '#022338'
-                    }
-                  },
-                  {
-                    featureType: 'green',
-                    elementType: 'geometry',
-                    stylers: {
-                      color: '#062032'
-                    }
-                  },
-                  {
-                    featureType: 'boundary',
-                    elementType: 'all',
-                    stylers: {
-                      color: '#1e1c1c'
-                    }
-                  },
-                  {
-                    featureType: 'manmade',
-                    elementType: 'geometry',
-                    stylers: {
-                      color: '#022338'
-                    }
-                  },
-                  {
-                    featureType: 'poi',
-                    elementType: 'all',
-                    stylers: {
-                      visibility: 'off'
-                    }
-                  },
-                  {
-                    featureType: 'all',
-                    elementType: 'labels.icon',
-                    stylers: {
-                      visibility: 'off'
-                    }
-                  },
-                  {
-                    featureType: 'all',
-                    elementType: 'labels.text.fill',
-                    stylers: {
-                      color: '#2da0c6',
-                      visibility: 'on'
-                    }
-                  }
-                ]
-              }
-            }
-        },
-        methods: {
-            searchClick (e) {
-                const _this = this
-                this.longitude = e.point.lng// 经度
-                this.latitude = e.point.lat// 维度
-                this.center.lng = _this.longitude // 中心点
-                this.center.lat = _this.latitude// 中心点
-                // eslint-disable-next-line no-undef
-                const geocoder = new BMap.Geocoder() // 创建地址解析器的实例
-                geocoder.getLocation(e.point, function (rs) {
-                    console.log(rs)
-                    _this.address.propprovince = rs.addressComponents.province // 省
-                    _this.address.propcity = rs.addressComponents.city // 市
-                    _this.address.propcounty = rs.addressComponents.district // 县
-                    _this.address.propaddress = rs.address// 详细地址
-                })
-                console.log('geocoder', _this.address)
-                this.$emit('togShow', _this.address)
-            },
-
-            handler ({ BMap, map }) {
-                console.log(BMap, map)
-                this.center.lng = 116.404
-                this.center.lat = 39.915
-                this.zoom = 15
-            }
-        },
-      watch: {
-        'keyword' (val) {
-          console.log(val)
-        }
-      }
-    }
-</script>
-
-<style>
-    .bm-view {
-        width: 100%;
-        height:500px;
-    }
-    .BMap_cpyCtrl {
-        display: none;
-    }
-    .anchorBL {
-        display: none;
-    }
-</style>
+<template>
+  <a-row type="flex">
+    <baidu-map
+      :mapStyle="mapStyle"
+      class="bm-view"
+      :center="'西安'"
+      :scroll-wheel-zoom="true"
+      :zoom="zoom"
+      @ready="handler"
+      @click="searchClick"
+      ak="YOUR_APP_KEY">
+      <bm-view style="width: 100%; height:100%; flex: 1"></bm-view>
+      <bm-control :offset="{width: '10px', height: '10px'}">
+        <bm-auto-complete :sugStyle="{zIndex: 1}">
+          <a-input v-model="keyword" type="text" placeholder="地区信息搜索" style="width: 150px;height: 50px" /> <!-- 这里指代一个自定义搜索框组件 -->
+        </bm-auto-complete>
+      </bm-control>
+      <bm-navigation anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>
+      <bm-geolocation anchor="BMAP_ANCHOR_BOTTOM_RIGHT" :showAddressBar="true" :autoLocation="true"></bm-geolocation>
+      <bm-local-search :keyword="keyword" :panel="false" :auto-viewport="true" zoom="12.8" style="display: none" ></bm-local-search>
+    </baidu-map>
+  </a-row>
+</template>
+
+<script>
+    import { BaiduMap, BmView, BmNavigation, BMCityList, BmGeolocation, BmControl, BmLocalSearch } from 'vue-baidu-map'
+    export default {
+        components: {
+            BaiduMap,
+            BmNavigation,
+            BmView,
+            BMCityList,
+            BmGeolocation,
+            BmControl,
+            BmLocalSearch
+        },
+        data () {
+            return {
+              keyword: '',
+                center: {
+                    lng: 12131693.03,
+                    lat: 4063684.53
+                },
+                zoom: 17,
+                address: {
+                  propprovince: '', // 省
+                  propcity: '', // 市
+                  propcounty: '', // 县
+                  propaddress: '' // 详细地址
+                },
+              mapStyle: {
+                styleJson: [
+                  {
+                    featureType: 'water',
+                    elementType: 'all',
+                    stylers: {
+                      color: '#021019'
+                    }
+                  },
+                  {
+                    featureType: 'highway',
+                    elementType: 'geometry.fill',
+                    stylers: {
+                      color: '#000000'
+                    }
+                  },
+                  {
+                    featureType: 'highway',
+                    elementType: 'geometry.stroke',
+                    stylers: {
+                      color: '#147a92'
+                    }
+                  },
+                  {
+                    featureType: 'arterial',
+                    elementType: 'geometry.fill',
+                    stylers: {
+                      color: '#000000'
+                    }
+                  },
+                  {
+                    featureType: 'arterial',
+                    elementType: 'geometry.stroke',
+                    stylers: {
+                      color: '#0b3d51'
+                    }
+                  },
+                  {
+                    featureType: 'local',
+                    elementType: 'geometry',
+                    stylers: {
+                      color: '#000000'
+                    }
+                  },
+                  {
+                    featureType: 'land',
+                    elementType: 'all',
+                    stylers: {
+                      color: '#08304b'
+                    }
+                  },
+                  {
+                    featureType: 'railway',
+                    elementType: 'geometry.fill',
+                    stylers: {
+                      color: '#000000'
+                    }
+                  },
+                  {
+                    featureType: 'railway',
+                    elementType: 'geometry.stroke',
+                    stylers: {
+                      color: '#08304b'
+                    }
+                  },
+                  {
+                    featureType: 'subway',
+                    elementType: 'geometry',
+                    stylers: {
+                      lightness: -70
+                    }
+                  },
+                  {
+                    featureType: 'building',
+                    elementType: 'geometry.fill',
+                    stylers: {
+                      color: '#000000'
+                    }
+                  },
+                  {
+                    featureType: 'all',
+                    elementType: 'labels.text.fill',
+                    stylers: {
+                      color: '#857f7f'
+                    }
+                  },
+                  {
+                    featureType: 'all',
+                    elementType: 'labels.text.stroke',
+                    stylers: {
+                      color: '#000000'
+                    }
+                  },
+                  {
+                    featureType: 'building',
+                    elementType: 'geometry',
+                    stylers: {
+                      color: '#022338'
+                    }
+                  },
+                  {
+                    featureType: 'green',
+                    elementType: 'geometry',
+                    stylers: {
+                      color: '#062032'
+                    }
+                  },
+                  {
+                    featureType: 'boundary',
+                    elementType: 'all',
+                    stylers: {
+                      color: '#1e1c1c'
+                    }
+                  },
+                  {
+                    featureType: 'manmade',
+                    elementType: 'geometry',
+                    stylers: {
+                      color: '#022338'
+                    }
+                  },
+                  {
+                    featureType: 'poi',
+                    elementType: 'all',
+                    stylers: {
+                      visibility: 'off'
+                    }
+                  },
+                  {
+                    featureType: 'all',
+                    elementType: 'labels.icon',
+                    stylers: {
+                      visibility: 'off'
+                    }
+                  },
+                  {
+                    featureType: 'all',
+                    elementType: 'labels.text.fill',
+                    stylers: {
+                      color: '#2da0c6',
+                      visibility: 'on'
+                    }
+                  }
+                ]
+              }
+            }
+        },
+        methods: {
+            searchClick (e) {
+                const _this = this
+                this.longitude = e.point.lng// 经度
+                this.latitude = e.point.lat// 维度
+                this.center.lng = _this.longitude // 中心点
+                this.center.lat = _this.latitude// 中心点
+                // eslint-disable-next-line no-undef
+                const geocoder = new BMap.Geocoder() // 创建地址解析器的实例
+                geocoder.getLocation(e.point, function (rs) {
+                    console.log(rs)
+                    _this.address.propprovince = rs.addressComponents.province // 省
+                    _this.address.propcity = rs.addressComponents.city // 市
+                    _this.address.propcounty = rs.addressComponents.district // 县
+                    _this.address.propaddress = rs.address// 详细地址
+                })
+                console.log('geocoder', _this.address)
+                this.$emit('togShow', _this.address)
+            },
+
+            handler ({ BMap, map }) {
+                console.log(BMap, map)
+                this.center.lng = 116.404
+                this.center.lat = 39.915
+                this.zoom = 15
+            }
+        },
+      watch: {
+        'keyword' (val) {
+          console.log(val)
+        }
+      }
+    }
+</script>
+
+<style>
+    .bm-view {
+        width: 100%;
+        height:500px;
+    }
+    .BMap_cpyCtrl {
+        display: none;
+    }
+    .anchorBL {
+        display: none;
+    }
+</style>

package/src/base-client/components/ticket/TicketSubmitSuccessView/TicketSubmitSuccessView.vue

@@ -396,7 +396,7 @@ export default {
           return '由于您的工单等待时间过长，系统已为您自动加急工单，请保持电话畅通，感谢您的理解'
         } else {
           // 超过十分钟
-          return '很抱歉让您久等，029-88888888 您可以直接拨打此电话，与我们技术人员直接交谈！'
+          return '很抱歉让您久等，请电询：14709288966'
         }
       } else {
         // 高优先级
@@ -409,7 +409,7 @@ export default {
           return '您的工单已经被加急处理，我们的工作人员会马上与您取得联系'
         } else {
           // 超过十分钟
-          return '很抱歉让您久等，029-88888888 您可以直接拨打此电话，与我们技术人员直接交谈！'
+          return '很抱歉让您久等，请电询：14709288966'
         }
       }
     },

package/src/config/default/setting.config.js

@@ -18,6 +18,7 @@ module.exports = {
   cachePage: true, // 是否缓存页面数据，仅多页签模式下生效，true 缓存, false 不缓存
   hideSetting: false, // 隐藏设置抽屉，true:隐藏，false:不隐藏
   homePage: '/system/dictionaryManage', // 首页路由, 登陆后默认打开
+  ticketPage: '/submitTicket', // 提交工单路由
   systemName: '物联网监控平台', // 系统名称
   copyright: '2021 Mr.Jiang', // copyright
   asyncRoutes: true, // 异步加载路由，true:开启，false:不开启

package/src/pages/login/Login.vue

@@ -63,7 +63,7 @@ import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
 import Vue from 'vue'
 import Mock from 'mockjs'
 import { positions } from '@vue2-client/mock/common'
-const { homePage } = require('@vue2-client/config')
+const { homePage, ticketPage } = require('@vue2-client/config')
 // import { router } from '@vue2-client/mock/user/routes'
 
 export default {
@@ -123,7 +123,11 @@ export default {
             const dateAfter = new Date(timestamp)
             setAuthorization({ token: data, expireAt: dateAfter })
             loadRoutes(funcToRouter(user.functions))
-            this.$router.push(homePage).catch(() => {})
+            if (result.deps === '用户工单登记') {
+              this.$router.push(ticketPage).catch(() => {})
+            } else {
+              this.$router.push(homePage).catch(() => {})
+            }
             this.$message.success(Mock.mock('@TIMEFIX').CN + '，欢迎回来', 3)
           })
         })