vue2-client 1.2.1 → 1.2.4

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

@@ -1,250 +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 from 'vue-baidu-map/components/map/Map.vue'
-    import BmView from 'vue-baidu-map/components/map/MapView.vue'
-    import BmNavigation from 'vue-baidu-map/components/controls/Navigation.vue'
-    import BMCityList from 'vue-baidu-map/components/controls/CityList.vue'
-    import BmGeolocation from 'vue-baidu-map/components/controls/Geolocation.vue'
-    import BmControl from 'vue-baidu-map/components/others/AutoComplete'
-    import BmLocalSearch from 'vue-baidu-map/components/search/LocalSearch'
-    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/EmployeeDetailsView/EmployeeDetailsView.vue

@@ -153,16 +153,10 @@ export default {
       // 7日新增完成数
       finishLastWeekCount: 0,
       // 控制订单完成比例颜色
-      finishRatioColor: '',
-      // 部门名字典
-      departmentDictionary: [],
-      // 模块名字典
-      modelDictionary: []
+      finishRatioColor: ''
     }
   },
   mounted () {
-    this.getDepartmentDictionary()
-    this.getModelDictionary()
     this.loadConfirmCount()
     this.loadFinishCount()
     this.initView()
@@ -199,9 +193,14 @@ export default {
           this.finishRatioColor = this.getFinishedRatioColor(this.details.finished_ticket_ratio)
           // 字典值解析
           const departmentValue = this.details.department
-          this.details.department = this.resolveDepartmentDictionary(departmentValue)
+          this.details.department = this.$appdata.getDictionaryList('departmentMap')[departmentValue].label
           const modelInChargeValue = this.details.model_in_charge
-          this.details.model_in_charge = this.resolveDepartmentDictionary(modelInChargeValue)
+          const modelDictionary = this.$appdata.getDictionaryList('serviceModuleType')
+          for (let i = 0; i < modelDictionary.length; i++) {
+            if (modelInChargeValue === modelDictionary[i].value) {
+              this.details.model_in_charge = this.$appdata.getDictionaryList('serviceModuleType')[i].label
+            }
+          }
           this.finishedRatioLoadStatus = 'success'
           this.loadTicketDetails = false
         }, err => {
@@ -209,40 +208,6 @@ export default {
           console.error(err)
         })
     },
-    // 获取部门名字典
-    getDepartmentDictionary () {
-      return post(EmployeeDetailsViewApi.getDepartmentDictionary)
-        .then(res => {
-          this.departmentDictionary = res
-        }, err => {
-          console.log(err)
-        })
-    },
-    // 解析部门名字典
-    resolveDepartmentDictionary (key) {
-      for (let i = 0; i < this.departmentDictionary.length; i++) {
-        if (this.departmentDictionary[i].value == key) {
-          return this.departmentDictionary[i].name
-        }
-      }
-    },
-    // 获取模块名字典
-    getModelDictionary () {
-      return post(EmployeeDetailsViewApi.getModelDictionary)
-        .then(res => {
-          this.modelDictionary = res
-        }, err => {
-          console.log(err)
-        })
-    },
-    // 解析模块名字典
-    resolveModelDictionary (key) {
-      for (let i = 0; i < this.modelDictionary.length; i++) {
-        if (this.modelDictionary[i].value == key) {
-          return this.modelDictionary[i].name
-        }
-      }
-    },
     // 获取应答订单数量
     loadConfirmCount () {
       this.confirmSumWeekly = []