manage-client 3.2.255 → 3.2.257

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.255",
+  "version": "3.2.257",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -54,7 +54,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-spec-reporter": "0.0.31",
     "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.55-test-1",
+    "ldap-clients": "3.0.7",
     "less": "^2.7.3",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
@@ -68,10 +68,10 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "swiper": "^5.4.5",
-    "system-clients": "3.2.54-test-1",
+    "system-clients": "3.2.55",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.24.51",
+    "vue-client": "1.24.80",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "8.2.1",

package/src/filiale/rongcheng/UserQuery.vue

@@ -61,11 +61,11 @@
                            condition="f_idnumber like '%{}%'" placeholder="身份证号">
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">客户状态</label>
-                    <v-select :value.sync="model.f_user_state"
-                              v-model="model.f_user_state"
-                              :options='$parent.$parent.userstates' placeholder='请选择'
-                              condition="f_user_state = '{}'"
+                    <label class="font_normal_body">使用状态</label>
+                    <v-select :value.sync="model.f_usestate"
+                              v-model="model.f_usestate"
+                              :options='$parent.$parent.usestate' placeholder='请选择'
+                              condition="f_usestate = '{}'"
                               close-on-select></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
@@ -477,6 +477,7 @@
           f_filialeids: ''
         },
         userstates:this.$appdata.getParam('用户状态') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')] : [],
+        usestate: this.$appdata.getParam('使用状态'),
         show:false,
         rowdata:{},
         meterInfo:{},

package/src/filiale/shanxian/BankManager.vue

@@ -19,13 +19,17 @@ let getData = function* (self) {
       self.texttile = '用户类型'
       // let arrparams = []
       console.log('获取数据。。', res.data)
+      let num1 = []
+      let num2 = []
+      let num3 = []
       let naturedata = []
-      let num = []
       for (var i = 0; i < res.data.length; i++) {
         naturedata[i] = res.data[i].f_user_nature
-        num[i] = res.data[i].number
       }
-      self.set(naturedata, num)
+      num1[0] = res.data[0].number
+      num2[0] = res.data[1].number
+      num3[0] = res.data[2].number
+      self.set(naturedata, num1, num2, num3)
     })
 }
 export default {
@@ -53,30 +57,27 @@ export default {
     }
   },
   methods: {
-    set (naturedata, num) {
+    set (naturedata, num1, num2, num3) {
       this.xc = echarts.init(document.getElementById('bm'))
       this.xc.setOption({
-        color: ['#FE974B', '#3D72FF'],
+        color: ['#FE974B', '#3D72FF', '#00C953'],
         title: {
           text: '新增用户散列图',
           subtext: '数据查询来源',
           x: 'left'
         },
         tooltip: {
-          trigger: 'axis',
+          trigger: 'item',
           formatter: function (params) {
-            var str = ''
-            str += params[0].name + '</br>'
-            for (var i = 0; i < params.length; i++) {
-              str += params[i].marker + params[i].seriesName + ': ' + params[i].data + '户' + '</br>'
-            }
+            let str = ''
+            str += params.marker + params.seriesName + ': ' + params.value + '户'
             return str
           }
         },
         legend: {
           x: 'left',
           y: 'bottom',
-          data: ['户数']
+          data: ['工业户数', '民用户数', '商业户数']
         },
         toolbox: {
           show: true,
@@ -91,7 +92,7 @@ export default {
         xAxis: [
           {
             type: 'category',
-            data: naturedata
+            data: ['新增用户数据']
           }
         ],
         yAxis: [
@@ -101,23 +102,33 @@ export default {
         ],
         series: [
           {
-            name: '户数',
+            name: '工业户数',
+            type: 'bar',
+            data: num1,
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '民用户数',
+            type: 'bar',
+            data: num2,
+            markLine: {
+              data: [
+                {type: 'average', name: '平均值'}
+              ]
+            }
+          },
+          {
+            name: '商业户数',
             type: 'bar',
-            data: num,
+            data: num3,
             markLine: {
               data: [
                 {type: 'average', name: '平均值'}
               ]
-            },
-            itemStyle: {
-              normal: {
-                color: function (params) {
-                  // 给出颜色组
-                  var colorList = ['#FE974B', '#3D72FF', '#00C953']
-                  // 循环调用
-                  return colorList[params.dataIndex % colorList.length]
-                }
-              }
             }
           }
         ]