Merge branch 'dev-fivelayer0725' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-fivelayer0725

src/views/modules/communityService/measure/info.vue

@@ -459,7 +459,7 @@ export default {
   async created () {
 
     this.customerId = localStorage.getItem("customerId");
-    this.getGridList();
+    this.getGridList('addorupdate');
     this.getDemandOptions();
     await this.getDemandUserList();
     this.getServiceuserList();

src/views/modules/visual/command/index.vue

@@ -167,14 +167,17 @@
                   @handleClose="handleClose" />
 
     <demand-info v-if="pageType==='create-demand'"
-                 ref="eleEditForm"
+                 ref="ref_demand"
                  :icResiUserId="icResiUserId"
                  @handleClose="handleClose" />
 
-    <qsydw v-if="pageType==='qsydw'"
-           ref="eleEditForm"
+    <qsydw v-if="pageType==='watch-xuncha'"
+           ref="ref_xuncha"
            @handleClose="handleClose" />
 
+    <!-- <people v-if="pageType==='watch-resi'"
+          :uid="icResiUserId"
+          ref="ref_people"></people> -->
   </div>
 </template>
 
@@ -423,12 +426,16 @@ export default {
       if (type == "create-service") {
         // 点击网格发起服务
       } else if (type == "watch-resi") {
+        this.toSubAgency('people',info.icResiUserId)
+         this.icResiUserId = info.icResiUserId
         // 查看居民详情
       } else if (type == "watch-event") {
         // 查看事件
       } else if (type == "create-demand") {
         // 发起需求
         this.icResiUserId = info.icResiUserId
+      }else if(type=="watch-xuncha"){
+
       }
     },