Merge remote-tracking branch 'origin/dev-0715' into yantai_master

src/views/modules/shequzhili/event/cpts/event-info.vue

@@ -412,8 +412,8 @@ export default {
           this.demand = this.$refs.ref_processinfo_add.demand
           this.demand.gridId = this.eventInfoData.gridId
           //需求的属性同事件一样
-          this.eventInfoData.categoryList = []
+          // this.eventInfoData.categoryList = []
-          this.eventInfoData.categoryList.push(this.demand.categoryId)
+          // this.eventInfoData.categoryList.push(this.demand.categoryId)
           console.log('demond', this.demand)
         }
 

src/views/modules/shequzhili/event/cpts/process-form-demand.vue

@@ -5,7 +5,7 @@
              :model="formData"
              :rules="dataRule"
              label-width="100px">
-      <el-form-item label="事件分类"
+      <!-- <el-form-item label="事件分类"
                     label-width="150px"
                     prop="categoryId">
         <el-cascader class="cell-width-2"
@@ -16,7 +16,7 @@
                      :props="optionProps"
                      :show-all-levels="false"
                      @change="handleChangeCate"></el-cascader>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="服务内容"
                     label-width="150px"
                     prop="content">
@@ -197,7 +197,7 @@ function iniFmData () {
     serviceLocation: '',//事件地址	
     latitude: '',//	经度	
     longitude: '',//维度	
-    categoryId: ''
+    // categoryId: ''
   };
 }
 export default {
@@ -236,9 +236,9 @@ export default {
     dataRule () {
 
       return {
-        categoryId: [
+        // categoryId: [
-          { required: true, message: "请填写事件分类", trigger: "blur" },
+        //   { required: true, message: "请填写事件分类", trigger: "blur" },
-        ],
+        // ],
         content: [
           { required: true, message: "服务内容不能为空", trigger: "blur" },
         ],
@@ -330,15 +330,15 @@ export default {
       this.formData.demandUserMobile = this.eventDetailCopy.mobile
 
       if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
-        this.selCategoryArray = []
+        // this.selCategoryArray = []
-        this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
+        // this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
-        this.selCategoryArray.push(this.eventDetailCopy.categoryId)
+        // this.selCategoryArray.push(this.eventDetailCopy.categoryId)
-        this.formData.categoryId = this.eventDetailCopy.categoryId
+        // this.formData.categoryId = this.eventDetailCopy.categoryId
-
+
-        this.selCateObj = {
+        // this.selCateObj = {
-          name: this.eventDetailCopy.categoryName,
+        //   name: this.eventDetailCopy.categoryName,
-          id: this.eventDetailCopy.categoryId
+        //   id: this.eventDetailCopy.categoryId
-        }
+        // }
       }
 
     } else {

src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

@@ -636,6 +636,7 @@ const vueGis = {
         'ep_lg': require('../../../../../assets/img/shuju/fiveLayer/ep_lg.png'),
         'sr_xfz': require('../../../../../assets/img/shuju/fiveLayer/sr_xfz.png'),
         'pu_jgzsbm': require('../../../../../assets/img/shuju/fiveLayer/pu_jgzsbm.png'),
+        'ep_qt': require('../../../../../assets/img/shuju/fiveLayer/ep_qt.png'),
 
         'gr_czw': require('../../../../../assets/img/shuju/fiveLayer/gr_czw.png'),
         'ep_cycs': require('../../../../../assets/img/shuju/fiveLayer/ep_cycs.png'),