111

src/views/modules/visual/command/cpts/demandInfo.vue

@@ -0,0 +1,176 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>新增需求</span>
+        </div>
+
+        <div class="btn-close"
+             @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+
+        <demand-info-origin ref="demandEditForm"
+                            :source="'visiual'"
+                            :formType="'add'"
+                            @handleClose="handleClose"
+                            @handleOk="handleOk"
+                            @dialogOk="handleEditSuccess" />
+
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+
+import { requestPost } from "@/js/dai/request";
+import eventInfo from "@/views/modules/shequzhili/event/cpts/event-info";
+import demandInfoOrigin from "@/views/modules/communityService/measure/info";
+
+export default {
+  name: "dialogInfo",
+  props: {
+
+  },
+
+  components: {
+    cptCard,
+    eventInfo,
+    demandInfoOrigin,
+  },
+
+  data () {
+    return {
+      loading: false,
+
+      pageType: 'dispose',
+      eventId: '1529724450524061698',
+      eventDetailData: {},
+    };
+  },
+
+  async mounted () {
+    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";
+
+      const { data, code, msg } = await requestPost(url, {
+        icEventId: this.eventId,
+      });
+
+      if (code === 0) {
+
+        this.eventDetailData = { ...data };
+        this.pageType = "dispose";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handleClose () {
+      this.pageType = "";
+      this.$emit("handleClose")
+      // this.eventId = ""
+    },
+    handleOk () {
+      this.pageType = "";
+      // this.eventId = ""
+      this.pageNo = 1
+    },
+
+    handleEditSuccess () {
+      this.handleClose();
+
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/people.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/a_customize.scss";
+
+.m-pop {
+  color: #fff;
+  .wrap {
+    .list {
+      display: block;
+      width: 60%;
+      .item {
+        display: flex;
+        width: 100%;
+        box-sizing: border-box;
+        margin-top: 0;
+        margin-bottom: 15px;
+        font-size: 16px;
+        cursor: pointer;
+
+        .item-field {
+          flex-shrink: 0;
+        }
+
+        .item-filed-height {
+          line-height: 30px;
+        }
+      }
+      .item-desc {
+        font-size: 16px;
+        color: #fff;
+        margin-bottom: 10px;
+        line-height: 24px;
+      }
+    }
+  }
+  .list-title {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 20px 0 10px 62px;
+    font-size: 20px;
+    color: #fff;
+    cursor: pointer;
+  }
+}
+.list-wr {
+  display: flex;
+  padding: 0 32px;
+}
+
+.sel-service {
+  display: flex;
+  justify-content: flex-start;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: center;
+
+  .item_btn {
+    font-size: 14px;
+    padding: 8px 16px;
+    cursor: pointer;
+
+    border: 1px dashed #0c81fe;
+    border-radius: 6px;
+    background-color: #0c81fe;
+  }
+
+  .mgl {
+    margin-left: 20px;
+  }
+}
+</style>

src/views/modules/visual/command/cpts/eventInfo.vue

@@ -0,0 +1,177 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>需求详情</span>
+        </div>
+
+        <div class="btn-close"
+             @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+
+        <event-info v-if="loading"
+                    ref="eleEditForm"
+                    :pageType="pageType"
+                    :eventId="eventId"
+                    :eventDetailData="eventDetailData"
+                    :source="'visiual'"
+                    @handleClose="handleClose"
+                    @handleOk="handleOk"
+                    @dialogOk="handleEditSuccess" />
+
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+
+import { requestPost } from "@/js/dai/request";
+import eventInfo from "@/views/modules/shequzhili/event/cpts/event-info";
+
+export default {
+  name: "dialogInfo",
+  props: {
+
+  },
+
+  components: {
+    cptCard,
+    eventInfo,
+  },
+
+  data () {
+    return {
+      loading: false,
+
+      pageType: 'dispose',
+      eventId: '1552537796854706177',
+      eventDetailData: {},
+    };
+  },
+
+  async mounted () {
+    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";
+
+      const { data, code, msg } = await requestPost(url, {
+        icEventId: this.eventId,
+      });
+
+      if (code === 0) {
+
+        this.eventDetailData = { ...data };
+        this.pageType = "dispose";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handleClose () {
+      this.pageType = "";
+      this.$emit("handleClose")
+      // this.eventId = ""
+    },
+    handleOk () {
+      this.pageType = "";
+      // this.eventId = ""
+      this.pageNo = 1
+    },
+
+    handleEditSuccess () {
+      this.handleClose();
+
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/people.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/a_customize.scss";
+
+.m-pop {
+  color: #fff;
+  .wrap {
+    .list {
+      display: block;
+      width: 60%;
+      .item {
+        display: flex;
+        width: 100%;
+        box-sizing: border-box;
+        margin-top: 0;
+        margin-bottom: 15px;
+        font-size: 16px;
+        cursor: pointer;
+
+        .item-field {
+          flex-shrink: 0;
+        }
+
+        .item-filed-height {
+          line-height: 30px;
+        }
+      }
+      .item-desc {
+        font-size: 16px;
+        color: #fff;
+        margin-bottom: 10px;
+        line-height: 24px;
+      }
+    }
+  }
+  .list-title {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 20px 0 10px 62px;
+    font-size: 20px;
+    color: #fff;
+    cursor: pointer;
+  }
+}
+.list-wr {
+  display: flex;
+  padding: 0 32px;
+}
+
+.sel-service {
+  display: flex;
+  justify-content: flex-start;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: center;
+
+  .item_btn {
+    font-size: 14px;
+    padding: 8px 16px;
+    cursor: pointer;
+
+    border: 1px dashed #0c81fe;
+    border-radius: 6px;
+    background-color: #0c81fe;
+  }
+
+  .mgl {
+    margin-left: 20px;
+  }
+}
+</style>

src/views/modules/visual/command/cpts/qsydw.vue

@@ -0,0 +1,223 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>企事业单位巡查详情</span>
+        </div>
+
+        <div class="btn-close"
+             @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+
+        <div class="list-wr">
+          <div class="list">
+
+            <div class="item">
+              <span class="item-field">场所类型：</span>
+              <span>{{ eventDetailData.placeTypeName }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">场所名称：</span>
+              <span>{{ eventDetailData.placeOrgName }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">规模：</span>
+              <span>{{ eventDetailData.scaleName }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">联系电话：</span>
+              <span>{{ eventDetailData.mobile }}</span>
+            </div>
+
+          </div>
+          <div class="list">
+            <div class="item">
+              <span class="item-field">场所区域：</span>
+              <span>{{ eventDetailData.agencyName+eventDetailData.gridName }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">场所地址：</span>
+              <span>{{ eventDetailData.address }}</span>
+            </div>
+            <div class="item">
+              <span class="item-field">负责人：</span>
+              <span>{{ eventDetailData.personInCharge }}</span>
+            </div>
+
+          </div>
+
+        </div>
+        <div class="div_record">
+          <record :formType="'edit'"
+                  :source="'visiual'"
+                  :enterpriseId="enterpriseId"
+                  :enterpriseInfo="enterpriseInfo"></record>
+        </div>
+        <div class="div-btn "
+             style="padding-bottom:10px">
+          <el-button size="small"
+                     @click="handleClose">关闭</el-button>
+        </div>
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+
+import { requestPost } from "@/js/dai/request";
+import record from "@/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record";
+
+
+export default {
+  name: "dialogInfo",
+  props: {
+
+  },
+
+  components: {
+    cptCard,
+    record
+  },
+
+  data () {
+    return {
+      loading: false,
+
+      pageType: 'dispose',
+
+      eventDetailData: {},
+      enterpriseInfo: {},
+
+      enterpriseId: '1544585407179968514',
+
+
+    };
+  },
+
+  async mounted () {
+    this.loading = false
+
+    await this.loadInfo()
+
+    this.loading = true
+  },
+
+  methods: {
+    async loadInfo () {
+
+      const url = "/gov/org/enterprise/detail/" + this.enterpriseId;
+
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
+
+      const { data, code, msg } = await requestPost(url);
+
+      if (code === 0) {
+
+        this.eventDetailData = { ...data };
+
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handleClose () {
+      this.pageType = "";
+      this.$emit("handleClose")
+
+    },
+    handleOk () {
+      this.pageType = "";
+
+      this.pageNo = 1
+    },
+
+    handleEditSuccess () {
+      this.handleClose();
+
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/people.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/a_customize.scss";
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+
+.m-pop {
+  color: #fff;
+  .wrap {
+    .list {
+      display: block;
+      width: 60%;
+      .item {
+        display: flex;
+        width: 100%;
+        box-sizing: border-box;
+        margin-top: 0;
+        margin-bottom: 15px;
+        font-size: 16px;
+        cursor: pointer;
+
+        .item-field {
+          flex-shrink: 0;
+        }
+
+        .item-filed-height {
+          line-height: 30px;
+        }
+      }
+      .item-desc {
+        font-size: 16px;
+        color: #fff;
+        margin-bottom: 10px;
+        line-height: 24px;
+      }
+    }
+  }
+  .list-title {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 20px 0 10px 62px;
+    font-size: 20px;
+    color: #fff;
+    cursor: pointer;
+  }
+}
+.list-wr {
+  display: flex;
+  padding: 0 32px;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: center;
+
+  .item_btn {
+    font-size: 14px;
+    padding: 8px 16px;
+    cursor: pointer;
+
+    border: 1px dashed #0c81fe;
+    border-radius: 6px;
+    background-color: #0c81fe;
+  }
+
+  .mgl {
+    margin-left: 20px;
+  }
+}
+
+.div_record {
+  // padding-bottom: 30px;
+}
+</style>

src/views/modules/visual/command/cpts/serviceInfo.vue

@@ -0,0 +1,175 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>发起服务</span>
+        </div>
+
+        <div class="btn-close"
+             @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+
+        <add-form ref="demandEditForm"
+                  :source="'visiual'"
+                  :formType="'add'"
+                  @handleClose="handleClose"
+                  @handleOk="handleOk"
+                  @dialogOk="handleEditSuccess" />
+
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+
+import { requestPost } from "@/js/dai/request";
+
+import addForm from "@/views/modules/communityService/fuwujilu/addForm";
+
+export default {
+  name: "dialogInfo",
+  props: {
+
+  },
+
+  components: {
+    cptCard,
+    addForm
+  },
+
+  data () {
+    return {
+      loading: false,
+
+      pageType: 'dispose',
+      eventId: '1529724450524061698',
+      eventDetailData: {},
+    };
+  },
+
+  async mounted () {
+    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";
+
+      const { data, code, msg } = await requestPost(url, {
+        icEventId: this.eventId,
+      });
+
+      if (code === 0) {
+
+        this.eventDetailData = { ...data };
+        this.pageType = "dispose";
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    handleClose () {
+      this.pageType = "";
+      this.$emit("handleClose")
+      // this.eventId = ""
+    },
+    handleOk () {
+      this.pageType = "";
+      // this.eventId = ""
+      this.pageNo = 1
+    },
+
+    handleEditSuccess () {
+      this.handleClose();
+
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/people.scss"
+  scoped
+></style>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/a_customize.scss";
+
+.m-pop {
+  color: #fff;
+  .wrap {
+    .list {
+      display: block;
+      width: 60%;
+      .item {
+        display: flex;
+        width: 100%;
+        box-sizing: border-box;
+        margin-top: 0;
+        margin-bottom: 15px;
+        font-size: 16px;
+        cursor: pointer;
+
+        .item-field {
+          flex-shrink: 0;
+        }
+
+        .item-filed-height {
+          line-height: 30px;
+        }
+      }
+      .item-desc {
+        font-size: 16px;
+        color: #fff;
+        margin-bottom: 10px;
+        line-height: 24px;
+      }
+    }
+  }
+  .list-title {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 20px 0 10px 62px;
+    font-size: 20px;
+    color: #fff;
+    cursor: pointer;
+  }
+}
+.list-wr {
+  display: flex;
+  padding: 0 32px;
+}
+
+.sel-service {
+  display: flex;
+  justify-content: flex-start;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: center;
+
+  .item_btn {
+    font-size: 14px;
+    padding: 8px 16px;
+    cursor: pointer;
+
+    border: 1px dashed #0c81fe;
+    border-radius: 6px;
+    background-color: #0c81fe;
+  }
+
+  .mgl {
+    margin-left: 20px;
+  }
+}
+</style>

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

@@ -4,75 +4,65 @@
     <div class="m-crumb">
       <div class="router_line"></div>
       <div class="div_router">
-        <span
-          class="router_parents"
-          v-for="(item, index) in runAgencyArray"
-          @click="handleClickAgency(index)"
-          :key="index"
-          >{{ item.name }}<span class="arrow">></span></span
-        >
+        <span class="router_parents"
+              v-for="(item, index) in runAgencyArray"
+              @click="handleClickAgency(index)"
+              :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" />
-
-    <div v-show="orgLevel !== 'people'" class="g-cnt">
-      <div class="m-map" @click="handleClickMapBox">
-        <grid-map
-          ref="map"
-          v-if="orgData.id"
-          @clickAgency="clickAgencyItem"
-          :srcGridData="orgData"
-          :dotList="dotList"
-          :dotIcoList="dotIcoList"
-          :dotList2="dotList2"
-          :dotIcoList2="dotIcoList2"
-          :gridCountData="gridCountData"
-          :pitch="0"
-        />
+    <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"
+                  v-if="orgData.id"
+                  @clickAgency="clickAgencyItem"
+                  :srcGridData="orgData"
+                  :dotList="dotList"
+                  :dotIcoList="dotIcoList"
+                  :dotList2="dotList2"
+                  :dotIcoList2="dotIcoList2"
+                  :gridCountData="gridCountData"
+                  :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"
-              placeholder="请输入"
-              @keyup.enter="handleSearch"
-              v-model="searchName"
-            />
-            <div class="btn" @click="handleSearch">搜索</div>
+            <input type="text"
+                   placeholder="请输入"
+                   @keyup.enter="handleSearch"
+                   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"
-                class="result-item"
-                v-show="item.list.length > 0"
-              >
+              <div :key="'searchResult' + item.type"
+                   class="result-item"
+                   v-show="item.list.length > 0">
                 <div class="result-type">{{ item.title }}</div>
-                <div
-                  class="result-more"
-                  @click.stop="handleClickSearchResultMore(item)"
-                  v-show="item.allList.length > 2"
-                >
+                <div class="result-more"
+                     @click.stop="handleClickSearchResultMore(item)"
+                     v-show="item.allList.length > 2">
                   更多
                 </div>
                 <div class="result-ul">
-                  <div
-                    class="result-li z-toe"
-                    :key="item.type + 'li' + index"
-                    v-for="(li, index) in item.list"
-                    @click.stop="handleClickSearchLi(li, item)"
-                  >
+                  <div class="result-li z-toe"
+                       :key="item.type + 'li' + index"
+                       v-for="(li, index) in item.list"
+                       @click.stop="handleClickSearchLi(li, item)">
                     <span v-if="item.type == 'position'">{{
                       li.name + " " + li.address
                     }}</span>
@@ -86,15 +76,14 @@
                   </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"
-                      :key="item.type + 'li2_' + index"
-                      v-for="(li, index) in item.allList"
-                      @click.stop="handleClickSearchLi(li, item)"
-                    >
+                    <div class="result-li z-toe"
+                         :key="item.type + 'li2_' + index"
+                         v-for="(li, index) in item.allList"
+                         @click.stop="handleClickSearchLi(li, item)">
                       <span v-if="item.type == 'position'">{{
                         li.name + " " + li.address
                       }}</span>
@@ -113,38 +102,37 @@
           </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"
-                      :key="index"
-                      @click="clickAgencyItem(item, index)"
-                      :class="[
+                <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"
-                      alt=""
-                      srcset=""
-                      class="no-data-img"
-                    />
+                    <img src="@/assets/img/modules/visual/noData.png"
+                         alt=""
+                         srcset=""
+                         class="no-data-img" />
                   </div>
                 </el-scrollbar>
               </div>
@@ -161,15 +149,31 @@
           </div>
 
           <div class="list">
-            <sidemenu
-              :orgId="orgId"
-              @change="handleChangeMenu"
-              :grandIcoList="dotIcoList"
-            ></sidemenu>
+            <sidemenu :orgId="orgId"
+                      @change="handleChangeMenu"
+                      :grandIcoList="dotIcoList"></sidemenu>
           </div>
         </cpt-card>
       </div>
     </div>
+
+
+    <event-info v-if="pageType==='watch-event'"
+                ref="ref_event"
+                @handleClose="handleClose" />
+
+    <service-info v-if="pageType==='create-service'"
+                  ref="ref_service"
+                  @handleClose="handleClose" />
+
+    <demand-info v-if="pageType==='create-demand'"
+                  ref="eleEditForm"
+                  @handleClose="handleClose" />
+
+    <qsydw v-if="pageType==='qsydw'"
+           ref="eleEditForm"
+           @handleClose="handleClose" />
+
   </div>
 </template>
 
@@ -185,9 +189,14 @@ import sidemenu from "@/views/modules/visual/command/cpts/sidemenu";
 import sidemenuLeft from "@/views/modules/visual/command/cpts/sidemenu-left";
 import ScreenLoading from "@/views/modules/visual/cpts/loading";
 
+import eventInfo from "@/views/modules/visual/command/cpts/eventInfo";
+import serviceInfo from "@/views/modules/visual/command/cpts/serviceInfo";
+import demandInfo from "@/views/modules/visual/command/cpts/demandInfo";
+import qsydw from "@/views/modules/visual/command/cpts/qsydw";
+
 let loading; //加载动画
 
-function iniSearchResult() {
+function iniSearchResult () {
   return [
     {
       type: "position",
@@ -230,6 +239,10 @@ export default {
     gridMap,
     sidemenu,
     sidemenuLeft,
+    eventInfo, 
+    serviceInfo, 
+    demandInfo, 
+    qsydw
   },
 
   props: {},
@@ -238,7 +251,7 @@ export default {
     ...mapGetters(["clientHeight"]),
   },
 
-  data() {
+  data () {
     return {
       showAgencyList: false,
 
@@ -365,23 +378,25 @@ export default {
       searchName: "",
       showedSearchResult: false,
       searchResult: iniSearchResult(),
+
+      pageType:'',
     };
   },
 
   watch: {
-    categoryKeys() {
+    categoryKeys () {
       this.requestMapDot();
     },
-    categoryKeys2() {
+    categoryKeys2 () {
       this.requestMapDot2();
     },
-    searchName() {
+    searchName () {
       this.showedSearchResult = false;
       this.searchResult = iniSearchResult();
     },
   },
 
-  async mounted() {
+  async mounted () {
     //加载组织数据
     await this.loadOrgData();
     await this.requestMapDot();
@@ -389,7 +404,8 @@ export default {
   },
 
   methods: {
-    handleClickDotBtn(type, info) {
+    handleClickDotBtn (type, info) {
+      this.pageType = type
       if (type == "create-service") {
         // 点击网格发起服务
       } else if (type == "watch-resi") {
@@ -401,11 +417,15 @@ export default {
       }
     },
 
-    handleClickMapBox() {
+    handleClose () {
+      this.pageType = "";
+    },
+
+    handleClickMapBox () {
       this.showedSearchResult = false;
     },
 
-    handleTo(item) {
+    handleTo (item) {
       this.$router.push({
         path: `/main-shuju/visual-basicinfo-people-list`,
         query: {
@@ -416,12 +436,12 @@ export default {
         },
       });
     },
-    hideAgencyList() {
+    hideAgencyList () {
       this.showAgencyList = !this.showAgencyList;
     },
 
     //加载组织数据
-    async loadOrgData() {
+    async loadOrgData () {
       const url = "/gov/org/agency/maporg";
       let params = {
         orgId: this.orgId,
@@ -444,13 +464,13 @@ export default {
       }
     },
 
-    handleChangeMenuLeft(obj) {
+    handleChangeMenuLeft (obj) {
       this.coverageTypes2 = [obj.coverageType];
       this.categoryKeys2 = [obj.categoryKey];
       this.placeType2 = obj.placeType;
     },
 
-    handleChangeMenu(list) {
+    handleChangeMenu (list) {
       console.log("handleChangeMenu", list);
       let categoryKeys = [];
       let coverageTypes = [];
@@ -478,7 +498,7 @@ export default {
       this.requestMapDot();
     },
 
-    async requestMapDot() {
+    async requestMapDot () {
       if (!this.orgId) return;
       const url = "/data/aggregator/coverage/dataList";
       let params = {
@@ -498,7 +518,7 @@ export default {
       }
     },
 
-    async requestMapDot2() {
+    async requestMapDot2 () {
       if (!this.orgId) return;
       this.requestMapDot2Count();
       const url = "/data/aggregator/coverage/dataList-left";
@@ -522,7 +542,7 @@ export default {
       }
     },
 
-    async requestMapDot2Count() {
+    async requestMapDot2Count () {
       const url = "/data/aggregator/coverage/dataList-left-subtotal";
       let params = {
         orgId: this.orgId,
@@ -542,13 +562,13 @@ export default {
     },
 
     //子组件点击房间，刷新右侧list
-    refreshInfoList(selId, type) {
+    refreshInfoList (selId, type) {
       this.orgId = selId;
       this.level = "";
     },
 
     //返回所选组织
-    handleClickAgency(index) {
+    handleClickAgency (index) {
       //如果是从小区返回，清空一下小区的人员显示列表
       if (this.orgLevel === "neighborHood") {
         this.$nextTick(() => {
@@ -580,7 +600,7 @@ export default {
     },
 
     //点击组织列表数据
-    clickAgencyItem(item, index) {
+    clickAgencyItem (item, index) {
       console.log(item);
       if (item.level == "grid") {
       } else {
@@ -597,7 +617,7 @@ export default {
     },
 
     //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区）    people 点击详情
-    async toSubAgency(type, e) {
+    async toSubAgency (type, e) {
       //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图
       if (type === "people") {
         this.runNum++;
@@ -645,7 +665,7 @@ export default {
     },
 
     //刷新地图
-    async refreshMap(isRefreshView) {
+    async refreshMap (isRefreshView) {
       //加载组织数据
       await this.loadOrgData();
 
@@ -653,7 +673,7 @@ export default {
       await this.requestMapDot2();
     },
 
-    async handleSearch() {
+    async handleSearch () {
       const { searchName } = this;
       if (!searchName) {
         return this.$message.error("请输入搜索内容");
@@ -699,7 +719,7 @@ export default {
       }
     },
 
-    async searchPos() {
+    async searchPos () {
       let data = await this.$refs.map.searchPos(this.searchName);
 
       console.log("检索位置", data);
@@ -720,7 +740,7 @@ export default {
       }
     },
 
-    handleClickSearchLi(li) {
+    handleClickSearchLi (li) {
       this.$refs.map.setDotMarker(li, [
         parseFloat(li.longitude),
         parseFloat(li.latitude),
@@ -728,7 +748,7 @@ export default {
       this.showedSearchResult = false;
     },
 
-    handleClickSearchResultMore(item) {
+    handleClickSearchResultMore (item) {
       console.log(item);
       let res = !item.showedMore;
       if (res) {
@@ -737,7 +757,7 @@ export default {
       item.showedMore = !item.showedMore;
     },
     //开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, //是否锁定
         text: "正在加载……", //加载中需要显示的文字
@@ -746,7 +766,7 @@ export default {
     },
 
     //结束加载动画
-    endLoading() {
+    endLoading () {
       //clearTimeout(timer);
       if (loading) {
         loading.close();