1

3 years ago · 2b3014098f
5 changed files with 191 additions and 180 deletions
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@ -574,16 +574,12 @@ export default {

      if (code === 0) {
        if (data.type) {
-          if (data.msg) {
            this.$message({
              type: "success",
-              message: "同步成功"
+              message: data.msg || "同步成功"
            });
-            this.loadTable()
-          } else {
-            this.$message.error(data.msg)
-          }
          
+            this.loadTable()
        } else {
          this.$message.error(data.msg)
        }
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@ -520,15 +520,12 @@ export default {

      if (code === 0) {
        if (data.type) {
-          if (data.msg) {
          this.$message({
            type: "success",
-              message: "同步成功"
+            message: data.msg || "同步成功"
          });
+        
          this.loadTable()
-          } else {
-            this.$message.error(data.msg)
-          }

        } else {
          this.$message.error(data.msg)
--- a/src/views/modules/visual/command/cpts/eventInfo.vue
+++ b/src/views/modules/visual/command/cpts/eventInfo.vue
@ -4,15 +4,15 @@
      <cpt-card>
        <div class="title">
          <img src="@/assets/img/shuju/title-tip.png" />
-          <span>需求详情</span>
+          <span>事件详情</span>
        </div>

-        <div class="btn-close"
-             @click="handleClose">
+        <div class="btn-close" @click="handleClose">
          <img src="@/assets/img/shuju/people/close.png" />
        </div>

-        <event-info v-if="loading"
+        <event-info
+          v-if="loading"
          ref="eleEditForm"
          :pageType="pageType"
          :eventId="eventId"
@ -20,8 +20,8 @@
          :source="'visiual'"
          @handleClose="handleClose"
          @handleOk="handleOk"
-                    @dialogOk="handleEditSuccess" />
-
+          @dialogOk="handleEditSuccess"
+        />
      </cpt-card>
    </div>
  </div>
@ -38,7 +38,7 @@ export default {
  props: {
    eventId: {
      type: String,
-      required: 'true'
+      required: "true",
    },
  },

@ -51,21 +51,20 @@ export default {
    return {
      loading: false,

-      pageType: 'dispose',
+      pageType: "dispose",
      // eventId: '',
      eventDetailData: {},
    };
  },

  async mounted() {
-    this.loading = false
-    await this.handleSearch()
-    this.loading = true
+    this.loading = false;
+    await this.handleSearch();
+    this.loading = true;
  },

  methods: {
    async handleSearch() {
-
      const url = "/gov/project/icEvent/detail";
      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";

@ -74,7 +73,6 @@ export default {
      });

      if (code === 0) {
-
        this.eventDetailData = { ...data };
        this.pageType = "dispose";
      } else {
@ -84,18 +82,17 @@ export default {

    handleClose() {
      this.pageType = "";
-      this.$emit("handleClose")
+      this.$emit("handleClose");
      // this.eventId = ""
    },
    handleOk() {
      this.pageType = "";
      // this.eventId = ""
-      this.pageNo = 1
+      this.pageNo = 1;
    },

    handleEditSuccess() {
      this.handleClose();
-
    },
  },
 };
--- a/src/views/modules/visual/command/cpts/popup.vue
+++ b/src/views/modules/visual/command/cpts/popup.vue
@ -794,7 +794,7 @@ export default {

 .m-pop {
  @include scrollBar2;
-  width: 380px;
+  max-width: 380px;
  color: #333;
  font-size: 14px;
  line-height: 20px;
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@ -4,23 +4,24 @@
    <div class="m-crumb">
      <div class="router_line"></div>
      <div class="div_router">
-        <span class="router_parents"
+        <span
+          class="router_parents"
          v-for="(item, index) in runAgencyArray"
          @click="handleClickAgency(index)"
-              :key="index">{{ item.name }}<span class="arrow">></span></span>
+          :key="index"
+          >{{ item.name }}<span class="arrow">></span></span
+        >

        <span class="router_child">{{ orgData.name }}</span>
      </div>
    </div>

-    <people v-if="orgLevel === 'people'"
-            :uid="selUserId" />
+    <people v-if="orgLevel === 'people'" :uid="selUserId" />

-    <div v-show="orgLevel !== 'people'"
-         class="g-cnt">
-      <div class="m-map"
-           @click="handleClickMapBox">
-        <grid-map ref="map"
+    <div v-show="orgLevel !== 'people'" class="g-cnt">
+      <div class="m-map" @click="handleClickMapBox">
+        <grid-map
+          ref="map"
          v-if="orgData.id"
          @clickAgency="clickAgencyItem"
          @clickDotBtn="handleClickDotBtn"
@ -30,40 +31,49 @@
          :dotList2="dotList2"
          :dotIcoList2="dotIcoList2"
          :gridCountData="gridCountData"
-                  :pitch="0" />
+          :pitch="0"
+        />

        <div class="m-mapmenu">
-          <sidemenu-left :orgId="orgId"
-                         @change="handleChangeMenuLeft"></sidemenu-left>
+          <sidemenu-left
+            :orgId="orgId"
+            @change="handleChangeMenuLeft"
+          ></sidemenu-left>
        </div>

        <div class="m-search">
          <div class="input">
            <img src="@/assets/img/shuju/command/search.png" />
-            <input type="text"
+            <input
+              type="text"
              placeholder="请输入"
              @keyup.enter="handleSearch"
-                   v-model="searchName" />
-            <div class="btn"
-                 @click="handleSearch">搜索</div>
+              v-model="searchName"
+            />
+            <div class="btn" @click="handleSearch">搜索</div>
          </div>
-          <div class="result"
-               v-if="showedSearchResult">
+          <div class="result" v-if="showedSearchResult">
            <template v-for="item in searchResult">
-              <div :key="'searchResult' + item.type"
+              <div
+                :key="'searchResult' + item.type"
                class="result-item"
-                   v-show="item.list.length > 0">
+                v-show="item.list.length > 0"
+              >
                <div class="result-type">{{ item.title }}</div>
-                <div class="result-more"
+                <div
+                  class="result-more"
                  @click.stop="handleClickSearchResultMore(item)"
-                     v-show="item.allList.length > 2">
+                  v-show="item.allList.length > 2"
+                >
                  更多
                </div>
                <div class="result-ul">
-                  <div class="result-li z-toe"
+                  <div
+                    class="result-li z-toe"
                    :key="item.type + 'li' + index"
                    v-for="(li, index) in item.list"
-                       @click.stop="handleClickSearchLi(li, item)">
+                    @click.stop="handleClickSearchLi(li, item)"
+                  >
                    <span v-if="item.type == 'position'">{{
                      li.name + " " + li.address
                    }}</span>
@ -77,14 +87,15 @@
                  </div>
                </div>

-                <div class="result-panel"
-                     v-show="item.showedMore">
+                <div class="result-panel" v-show="item.showedMore">
                  <div class="result-type">{{ item.title }}</div>
                  <div class="result-ul">
-                    <div class="result-li z-toe"
+                    <div
+                      class="result-li z-toe"
                      :key="item.type + 'li2_' + index"
                      v-for="(li, index) in item.allList"
-                         @click.stop="handleClickSearchLi(li, item)">
+                      @click.stop="handleClickSearchLi(li, item)"
+                    >
                      <span v-if="item.type == 'position'">{{
                        li.name + " " + li.address
                      }}</span>
@ -103,37 +114,38 @@
          </div>
        </div>

-        <div class="m-sidebar"
-             v-show="false">
-          <div class="wrap"
-               :class="[{ 'wrap-hidden': !showAgencyList }]">
-            <div @click="hideAgencyList"
-                 class="arrow_tip">
-              <img src="@/assets/img/modules/visual/popup.png"
-                   alt />
+        <div class="m-sidebar" v-show="false">
+          <div class="wrap" :class="[{ 'wrap-hidden': !showAgencyList }]">
+            <div @click="hideAgencyList" class="arrow_tip">
+              <img src="@/assets/img/modules/visual/popup.png" alt />
            </div>

            <div class="div_agency_list">
              <div class="agency_main">
-                <el-scrollbar style="height: 98%"
-                              wrap-style="overflow-x:hidden">
-                  <div v-if="subAgencyArray.length > 0"
-                       class="agency_list">
-                    <div v-for="(item, index) in subAgencyArray"
+                <el-scrollbar
+                  style="height: 98%"
+                  wrap-style="overflow-x:hidden"
+                >
+                  <div v-if="subAgencyArray.length > 0" class="agency_list">
+                    <div
+                      v-for="(item, index) in subAgencyArray"
                      :key="index"
                      @click="clickAgencyItem(item, index)"
                      :class="[
                        'agency_item',
                        { agency_item_on: index % 2 == 0 },
-                      ]">
+                      ]"
+                    >
                      <div class="agency_item_name">{{ item.name }}</div>
                    </div>
                  </div>
                  <div v-else>
-                    <img src="@/assets/img/modules/visual/noData.png"
+                    <img
+                      src="@/assets/img/modules/visual/noData.png"
                      alt=""
                      srcset=""
-                         class="no-data-img" />
+                      class="no-data-img"
+                    />
                  </div>
                </el-scrollbar>
              </div>
@ -150,32 +162,42 @@
          </div>

          <div class="list">
-            <sidemenu :orgId="orgId"
+            <sidemenu
+              :orgId="orgId"
              @change="handleChangeMenu"
-                      :grandIcoList="dotIcoList"></sidemenu>
+              :grandIcoList="dotIcoList"
+            ></sidemenu>
          </div>
        </cpt-card>
      </div>
    </div>

-    <event-info v-if="pageType==='watch-event'"
+    <event-info
+      v-if="pageType === 'watch-event'"
      ref="ref_event"
      :eventId="eventId"
-                @handleClose="handleClose" />
+      @handleClose="handleClose"
+    />

-    <service-info v-if="pageType==='create-service'"
+    <service-info
+      v-if="pageType === 'create-service'"
      ref="ref_service"
-                  @handleClose="handleClose" />
+      @handleClose="handleClose"
+    />

-    <demand-info v-if="pageType==='create-demand'"
+    <demand-info
+      v-if="pageType === 'create-demand'"
      ref="ref_demand"
      :icResiUserId="icResiUserId"
-                 @handleClose="handleClose" />
+      @handleClose="handleClose"
+    />

-    <qsydw v-if="pageType==='watch-xuncha'"
+    <qsydw
+      v-if="pageType === 'watch-xuncha'"
      ref="ref_xuncha"
      :enterpriseId="enterpriseId"
-           @handleClose="handleClose" />
+      @handleClose="handleClose"
+    />

    <!-- <people v-if="pageType==='watch-resi'"
          :uid="icResiUserId"
@ -248,7 +270,7 @@ export default {
    eventInfo,
    serviceInfo,
    demandInfo,
-    qsydw
+    qsydw,
  },

  props: {},
@ -396,11 +418,11 @@ export default {
      showedSearchResult: false,
      searchResult: iniSearchResult(),

-      pageType: '',
-      icResiUserId: '',
-      selGridId: '',
-      eventId: '',
-      enterpriseId: '',
+      pageType: "",
+      icResiUserId: "",
+      selGridId: "",
+      eventId: "",
+      enterpriseId: "",
    };
  },

@ -426,23 +448,22 @@ export default {

  methods: {
    handleClickDotBtn(type, info) {
-
-      this.pageType = type
+      this.pageType = type;
      if (type == "create-service") {
        // 点击网格发起服务
      } else if (type == "watch-resi") {
-        this.toSubAgency('people', info.icResiUserId)
-        this.icResiUserId = info.icResiUserId
+        this.toSubAgency("people", info.icResiUserId);
+        this.icResiUserId = info.icResiUserId;
        // 查看居民详情
      } else if (type == "watch-event") {
        // 查看事件
+        this.eventId = info.icEventId;
      } else if (type == "create-demand") {
        // 发起需求
-        this.icResiUserId = info.icResiUserId
-        this.selGridId = info.gridId
+        this.icResiUserId = info.icResiUserId;
+        this.selGridId = info.gridId;
      } else if (type == "watch-xuncha") {
-
-        this.enterpriseId = info.enterpriseId
+        this.enterpriseId = info.enterpriseId;
      }
    },

@ -770,7 +791,7 @@ export default {
    },

    handleClickSearchLi(li) {
-      console.log('handleClickSearchLi', li)
+      console.log("handleClickSearchLi", li);
      if (!li.longitude) {
        return this.$message.error("请先设置坐标");
      }