巡更

operationSupport/src/views/newWorkBench/components/PatrolProblem.vue

@@ -102,18 +102,29 @@ export default {
     //   });
     // },
     changeTime (v) {
-      this.mixins_query.queryDate = v + '-01';
+      this.mixins_query.queryDate = v;
       this.getData();
     },
     getData () {
       this.$http.get('/czc-community/patrol/record/standard/top', this.mixins_query).then(({ data, msg, status }) => {
-        debugger
+        if (status == 0) {
+          let name = [];
+          let resDate = [];
+          data.map((item, index) => {
+            name.push(item.content)
+            resDate.push({
+              name: item.content,
+              data: item.count
+            })
+          })
+          this.clientOptions = columnOptionsChartName('(个)', name, resDate, [], 10);
+        }
       })
     }
   },
   created () {
     this.queryDate = this.$moment().format('YYYY-MM');
-    this.mixins_query.queryDate = this.$moment().format('YYYY-MM') + '-01';
+    this.mixins_query.queryDate = this.$moment().format('YYYY-MM');
     this.getData();
   }
 };

operationSupport/src/views/newWorkBench/components/indexOptionChart.js

@@ -1255,7 +1255,7 @@ export const quantitativeAnalysisProblems = (name = [], namexAxis = '', nameyAxi
                 data: item.data,
                 color: defaultColor[index][0],
                 symbolSize: function (data) {
-                    return data || 10;
+                    return data || 0;
                 }
             });
         });

operationSupport/src/views/newWorkBench/components/quantitativeAnalysis.vue

@@ -74,17 +74,56 @@ export default {
   },
   methods: {
     changeTime (v) {
-      this.mixins_query.queryDate = v + '-01';
+      this.mixins_query.queryDate = v;
       this.getData();
     },
     getData () {
       this.$http.get('/czc-community/patrol/record/standard/statistics/content', this.mixins_query).then(({ status, data, msg }) => {
         debugger
+        if (status == 0) {
+          let name = [];
+          let resData = [];
+          let date1 = []; let date2 = []; let date3 = []; let date4 = []; let date5 = [];
+          let res = ['1日', '2日', '3日', '4日', '5日', '6日', '7日', '8日', '9日', '10日', '11日', '12日', '13日', '14日', '15日', '16日', '17日', '18日', '19日', '20日', '21日', '22日', '23日', '24日', '25日', '26日', '27日', '28日', '29日', '30日', '31日']
+          for (let i = 0; i < data.length; i++) {
+            if (data[i].list != null) {
+              for (let k = 0; k < data[i].list.length; k++) {
+                if (data[i].list[k].patrolType == '1') {
+                  debugger
+                  date1.push(data[i].list[k].count || 0)
+                } else if (data[i].list[k].patrolType == '2') {
+                  date2.push(data[i].list[k].count || 0)
+                } else if (data[i].list[k].patrolType == '3') {
+                  date3.push(data[i].list[k].count || 0)
+                } else if (data[i].list[k].patrolType == '4') {
+                  date4.push(data[i].list[k].count || 0)
+                } else if (data[i].list[k].patrolType == '5') {
+                  date5.push(data[i].list[k].count || 0)
+                }
+                name.push(data[14].list[k].patrolType == '1' ? '市容市貌' : data[14].list[k].patrolType == '2' ? '环境卫生' : data[14].list[k].patrolType == '3' ? '公共秩序' : data[14].list[k].patrolType == '4' ? '设备实施' : '消防安全')
+              }
+            } else {
+              date1.push(0);
+              date2.push(0);
+              date3.push(0);
+              date4.push(0);
+              date5.push(0);
+            }
+          }
+          name.map((item, index) => {
+            resData.push({
+              name: item,
+              data: item == '市容市貌' ? date1 : item == '环境卫生' ? date2 : item == '公共秩序' ? date3 : item == '设备实施' ? date4 : date5
+            })
+          })
+          console.log(resData)
+          this.clientOptions = quantitativeAnalysisProblems(name, '日期', '问题数量', res, resData, []);
+        }
       })
     }
   },
   created () {
-    this.mixins_query.queryDate = this.$moment().format('YYYY-MM') + '-01';
+    this.mixins_query.queryDate = this.$moment().format('YYYY-MM');
     this.queryDate = this.$moment().format('YYYY-MM');
     this.getData();
   }

operationSupport/src/views/patrolManagement/popups/patrolDetails.vue

@@ -80,6 +80,11 @@
             </el-table-column>
             <el-table-column
               prop="patrolDate"
+              label="巡更日期"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="patrolTime"
               label="巡更时间"
             >
             </el-table-column>
@@ -94,7 +99,7 @@
                 v-for="(it,ine) in item.twoTitle"
                 :key="ine"
               >
-              </el-table-column>
+                {{it.optionValue}} </el-table-column>
             </el-table-column>
 
           </el-table>
@@ -242,8 +247,10 @@ export default {
           twoTitle: [
             {
               title: '111',
+
             }, {
               title: '22',
+
             }
           ]
         }
@@ -275,12 +282,37 @@ export default {
   },
   methods: {
     exportExcel () {
-      // this.__exportExcel('/czc-charge/charge/bill/export/excel', this.mixins_query);
+      this.__exportExcel('/czc-community/patrol/record/standard/export/excel', { recordId: this.thisObj.id });
     },
 
     standard () {
       this.$http.get('/czc-community/patrol/record/standard/detail', { recordId: this.thisObj.id }).then(({ data, status, msg }) => {
-        debugger;
+        if (status == 0) {
+
+          this.tableData.communityName = data.communityName;
+          this.tableData.routeName = data.routeName;
+
+          this.tableData.partolName = data.userName
+          this.tableData.patrolDate = (data.patrolDate).substr(0, 10);
+          this.tableData.patrolTime = data.patrolTime;
+
+
+          this.outermostTitle = [];
+          for (let i = 0; i < data.details.length; i++) {
+            this.outermostTitle.push({
+              oneTitle: data.details[i].patrolType == '1' ? '市容市貌' : data.details[i].patrolType == '2' ? '环境卫生' : data.details[i].patrolType == '3' ? '公共秩序' : data.details[i].patrolType == '4' ? '设备实施' : '消防安全',
+              twoTitle: []
+            })
+            console.log(this.outermostTitle);
+            for (let k = 0; k < data.details[i].list.length; k++) {
+              this.outermostTitle[i].twoTitle.push({
+                title: data.details[i].list[k].content,
+                optionValue: data.details[i].list[k].optionValue,
+              })
+            }
+          }
+
+        }
       });
     },
 
@@ -355,7 +387,7 @@ export default {
       this.thisObj = this.params.thisObj;
       this.getDetail(this.params.thisObj.id);
       this.getTrack(this.params.thisObj.id);
-      debugger
+
       this.standard();
     } else {
       this.tableData.push(this.thisObj);