Merge branch 'feature/dev_stat' into dev

src/views/modules/plugins/stats/factagencyuserhousedaily.vue

@@ -18,17 +18,17 @@
             >
             </el-option>
           </el-select> -->
-          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}" popper-class="cascader-block">
+          <el-cascader ref="cascaderUnit" v-model.trim="dataForm.objectId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
             <template slot-scope="{ node, data }">
               <div @click="cascaderClick(data)">
                 <!-- <span class="block"></span> -->
-                <span>{{ data.agencyName }}</span>
-                <span v-if="!node.isLeaf"> ({{ data.subAgencyList.length }}) </span>
+                <span>{{ data.objectName }}</span>
+                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
               </div>
             </template>
           </el-cascader>
         </el-form-item>
-        <el-form-item label="入黑名单时间"
+        <el-form-item label="时间范围"
                       prop="startTime">
           <el-date-picker v-model="timeRange"
                           type="daterange"
@@ -198,9 +198,9 @@ export default {
       })
     },
     cascaderClick (nodeData) {
-      this.dataForm.agencyId = nodeData.agencyId;
-      this.dataForm.level = nodeData.level
-      this.$refs.cascaderUnit.checkedValue = nodeData.agencyId;
+      this.dataForm.objectId = nodeData.objectId;
+      this.dataForm.objectType = nodeData.objectType
+      this.$refs.cascaderUnit.checkedValue = nodeData.objectId;
       this.$refs.cascaderUnit.computePresentText();
       this.$refs.cascaderUnit.toggleDropDownVisible(false);
 
@@ -208,16 +208,17 @@ export default {
     getGridList() {
       const { user } = this.$store.state
       this.$http
-              .post('/gov/org/customeragency/agencygridtree')
+              .post('/gov/org/icServiceProject/service/serviceScopeTree')
               .then(({ data: res }) => {
                 if (res.code !== 0) {
                   return this.$message.error(res.msg)
                 } else {
                   console.log('获取查询详情成功', res.data)
                   // this.optionsA = res.data
+                  // console.log(this.optionsA);
                   this.optionsA.push(res.data)
-                  this.dataForm.agencyId = res.data.agencyId
-                  this.dataForm.level = res.data.level
+                  this.dataForm.objectId = res.data.objectId
+                  this.dataForm.objectType = res.data.objectType
                 }
               })
               .catch(() => {