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 class="info-title-2">发生时间：</span>
-            <span>{{ info.createdTime }}</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,7 +48,9 @@
             </el-form-item>
             <el-form-item label="事件类型"
                           prop="firstIdList">
-              <el-cascader ref="cascaderEvent" v-model="eventTypeCheck" :options="cateOptions"
+              <el-cascader ref="cascaderEvent"
+                           v-model="eventTypeCheck"
+                           :options="cateOptions"
                            collapse-tags
                            :show-all-levels="false"
                            :props="{
@@ -58,7 +60,10 @@
                   children:'subCategory',
                   label:'name',
                   value:'id'
-                }" clearable class="item_width_2" @change="handleEventType" />
+                }"
+                           clearable
+                           class="item_width_2"
+                           @change="handleEventType" />
               <!-- <template slot-scope="{ node, data }">
                   <div @click="cascaderClick(node, data)">
                     <span>{{ data.name }}</span>
@@ -177,13 +182,11 @@
                            label="所属网格"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column
+          <el-table-column prop="categoryName"
-            prop="categoryName"
                            label="事件类型"
                            min-width="140"
                            align="center"
-            :show-overflow-tooltip="true"
+                           :show-overflow-tooltip="true" />
-          />
           <!-- <template slot-scope="scope">
               {{ scope.row.firstName + '-' + scope.row.secondName }}
             </template>
@@ -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"
@@ -831,5 +834,4 @@ export default {
     width: 200px;
   }
 }
-
 </style>