Merge branch 'dev-jmlb0908'

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

@@ -10,8 +10,8 @@
             <span>{{ info.gridName }}</span>
           </div>
           <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
-            <span class="info-title-2">上报时间：</span>
-            <span>{{ info.createdTime }}</span>
+            <span class="info-title-2">发生时间：</span>
+            <span>{{ info.happenTime }}</span>
           </div>
           <div :class="['info-prop',{'info-prop-vis':source==='visiual'}]">
             <span class="info-title-2">事件内容：</span>

src/views/modules/shequzhili/event/eventList.vue

@@ -48,18 +48,23 @@
             </el-form-item>
             <el-form-item label="事件类型"
                           prop="firstIdList">
-              <el-cascader ref="cascaderEvent" v-model="eventTypeCheck" :options="cateOptions"
-                collapse-tags
-                :show-all-levels="false"
-                :props="{
+              <el-cascader ref="cascaderEvent"
+                           v-model="eventTypeCheck"
+                           :options="cateOptions"
+                           collapse-tags
+                           :show-all-levels="false"
+                           :props="{
                   multiple: true,
                   checkStrictly: false,
                   emitPath: false,
                   children:'subCategory',
                   label:'name',
                   value:'id'
-                }" clearable class="item_width_2" @change="handleEventType" />
-                <!-- <template slot-scope="{ node, data }">
+                }"
+                           clearable
+                           class="item_width_2"
+                           @change="handleEventType" />
+              <!-- <template slot-scope="{ node, data }">
                   <div @click="cascaderClick(node, data)">
                     <span>{{ data.name }}</span>
                   </div>
@@ -177,14 +182,12 @@
                            label="所属网格"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column
-            prop="categoryName"
-            label="事件类型"
-            min-width="140"
-            align="center"
-            :show-overflow-tooltip="true"
-          />
-            <!-- <template slot-scope="scope">
+          <el-table-column prop="categoryName"
+                           label="事件类型"
+                           min-width="140"
+                           align="center"
+                           :show-overflow-tooltip="true" />
+          <!-- <template slot-scope="scope">
               {{ scope.row.firstName + '-' + scope.row.secondName }}
             </template>
           </el-table-column> -->
@@ -259,11 +262,11 @@
           </template> -->
           </el-table-column>
 
-          <el-table-column prop="createdTime"
+          <el-table-column prop="happenTime"
                            align="center"
                            width="140"
                            :show-overflow-tooltip="true"
-                           label="上报时间">
+                           label="发生时间">
           </el-table-column>
           <el-table-column prop="operationTypeShow"
                            align="center"
@@ -505,7 +508,7 @@ export default {
     this.getCateOptions()
   },
   methods: {
-    handleEventType(val) {
+    handleEventType (val) {
       // console.log('val-----eee', val)
       console.log('nodes---', this.$refs.cascaderEvent.getCheckedNodes())
       const nodes = this.$refs.cascaderEvent.getCheckedNodes()
@@ -709,11 +712,11 @@ export default {
         this.delEvent(rowData.icEventId);
       }).catch((err) => { });
     },
-    async delEvent (eventId){
+    async delEvent (eventId) {
       const url = "/gov/project/icEvent/delete";
       let idsArr = [eventId];
 
-      const { data, code, msg } =await requestPost(url, idsArr);
+      const { data, code, msg } = await requestPost(url, idsArr);
 
       if (code === 0) {
         this.$message.success("删除成功！");
@@ -757,7 +760,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getCateOptions() {
+    async getCateOptions () {
       const url = "/gov/issue/issueprojectcategorydict/list";
 
       const { data, code, msg } = await requestPost(url, {});
@@ -807,7 +810,7 @@ export default {
       this.getTableData();
       // this.loadTable()
     },
-    deepTree(arr, child) {
+    deepTree (arr, child) {
       if (Array.isArray(arr) && arr.length > 0) {
         return arr.map(item => {
           // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
@@ -831,5 +834,4 @@ export default {
     width: 200px;
   }
 }
-
 </style>