coys 1 år sedan
förälder
incheckning
358b2ab267

+ 3 - 3
src/views/menu/cockpit/baseInfoMixins.js

@@ -18,7 +18,7 @@ export const baseInfoApi = {
       getAllbaseInfo(data).then(res => {
         let { code, data } = res
         if (code == 200) {
-          this.baseData = data
+          this.baseData = data||[]
           this.baseInit()
         }
       })
@@ -28,7 +28,7 @@ export const baseInfoApi = {
       getAllresumption(data).then(res => {
         let { code, data } = res
         if (code == 200) {
-          this.resumptionList = data
+          this.resumptionList = data||[]
           this.resumptionInit()
         }
       })
@@ -38,7 +38,7 @@ export const baseInfoApi = {
       getSyntheticResumption(data).then(res => {
         let { code, data } = res
         if (code == 200) {
-          let { rateByType, infoByType } = data
+          let { rateByType, infoByType } = data||[]
           this.infoByType = infoByType
           this.keysList = Object.keys(infoByType)
           let list = []

+ 4 - 2
src/views/menu/cockpit/index.vue

@@ -227,6 +227,8 @@ export default {
       this.cascaderValue=data.id
       this.getResumptionfoHandler({ desc: this.desc, month: this.month, orgId: this.cascaderValue })
       this.getBaseInfoHandler({ orgId: this.cascaderValue })
+
+      
     },
     onConfirm(val) {
       this.monthVal = val
@@ -235,7 +237,7 @@ export default {
       } else {
         this.month = newDateMonth(new Date(), 1)
       }
-      this.getResumptionfoHandler({ desc: this.desc, month: this.month })
+      this.getResumptionfoHandler({ desc: this.desc, month: this.month ,orgId: this.cascaderValue})
 
       this.showEndDate = false
     },
@@ -246,7 +248,7 @@ export default {
       } else {
         this.desc = 1
       }
-      this.getResumptionfoHandler({ desc: this.desc, month: this.month })
+      this.getResumptionfoHandler({ desc: this.desc, month: this.month ,orgId: this.cascaderValue})
       this.showlz = false
     },
     // 基础信息初始化

+ 45 - 41
src/views/menu/cockpit/indexEcharts.js

@@ -1,10 +1,12 @@
 //安全防范设施改造情况数据
+
+// [
+//   { value: 1048, name: 'GA38-2021' },
+//   { value: 735, name: 'GA38-2015' },
+//   { value: 580, name: '未达标' }
+// ]
 let securityPrecautions = (
-  data = [
-    { value: 1048, name: 'GA38-2021' },
-    { value: 735, name: 'GA38-2015' },
-    { value: 580, name: '未达标' }
-  ]
+  data = []
 ) => {
   var colors = ['#146de0', '#27ef5e', '#ffc140']
   let option = {
@@ -87,28 +89,29 @@ let securityPrecautions = (
   return option
 }
 //GA38-2021标准
+// [
+//   {
+//     value: 55,
+//     name: '203',
+//     label: {
+//       normal: {
+//         show: true
+//       }
+//     }
+//   },
+//   {
+//     value: 45,
+//     name: '正常1',
+//     label: {
+//       normal: {
+//         show: false
+//       }
+//     }
+//   }
+// ]
 let pieGaData = (
   title = '暂无设置标题',
-  data = [
-    {
-      value: 55,
-      name: '203',
-      label: {
-        normal: {
-          show: true
-        }
-      }
-    },
-    {
-      value: 45,
-      name: '正常1',
-      label: {
-        normal: {
-          show: false
-        }
-      }
-    }
-  ]
+  data = []
 ) => {
   let option = {
     tooltip: {
@@ -157,16 +160,17 @@ let pieGaData = (
   return option
 }
 //网点业务总览
+// [
+//   { value: 666, name: '巡查上报' },
+//   { value: 193, name: '自行处置' },
+//   { value: 300, name: '微信市民举报' },
+//   { value: 200, name: '微治理上报' },
+//   { value: 100, name: '视频抓拍' }
+// ]
 let dotData = (
   title = '网点业务库总览',
 
-  data = [
-    { value: 666, name: '巡查上报' },
-    { value: 193, name: '自行处置' },
-    { value: 300, name: '微信市民举报' },
-    { value: 200, name: '微治理上报' },
-    { value: 100, name: '视频抓拍' }
-  ]
+  data = []
 ) => {
   console.log(data, 'sss')
   var color = ['#146de0', '#27ef5e', '#ffc140', '#d151d8', 'red']
@@ -269,8 +273,8 @@ let securityData = (
   title = '保安配备情况',
 
   data = [
-    { value: 666, name: '已配备' },
-    { value: 193, name: '未配备' }
+    // { value: 666, name: '已配备' },
+    // { value: 193, name: '未配备' }
   ]
 ) => {
   var color = ['#146de0', '#27ef5e', '#ffc140', '#d151d8', 'red']
@@ -373,8 +377,8 @@ let LHSData = (
   title = '',
 
   data = [
-    { value: 666, name: '已配备' },
-    { value: 193, name: '未配备' }
+    // { value: 666, name: '已配备' },
+    // { value: 193, name: '未配备' }
   ]
 ) => {
   var color = ['#146de0', '#27ef5e', '#ffc140', '#d151d8', 'red']
@@ -472,8 +476,8 @@ let ZHSData = (
   title = '在行式自助银行',
 
   data = [
-    { value: 666, name: '穿墙式设备' },
-    { value: 193, name: '大堂式设备' }
+    // { value: 666, name: '穿墙式设备' },
+    // { value: 193, name: '大堂式设备' }
   ]
 ) => {
   let color = ['#146de0', '#27ef5e', '#ffc140', '#d151d8', 'red']
@@ -565,9 +569,9 @@ let ZHSData = (
 }
 //日常履职完成率
 let resumption = (data, type = 0) => {
-  var getzszy = ['每日履职', '报警测试', 'UPS维护', '夜间值守', '离行巡检'] //数据点名称
-  var getzswcl = [101, 100, 100, 98.65, 98.3] //招生完成率
-  var getzswcl2 = [101, 100, 100, 98.65, 98.3] //招生完成率
+  var getzszy = [] //数据点名称
+  var getzswcl = [] //招生完成率
+  var getzswcl2 = [] //招生完成率
   var getzswclzd = [] //招生完成率100%
   if (type == 0) {
     if (data && data.length > 0) {