Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into dev

src/views/modules/shequzhili/event/cpts/add.vue

@@ -23,13 +23,13 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="报事人"
+          <el-form-item label="上报人"
                         prop="name"
                         label-width="150px"
                         style="display: block">
             <el-input class="cell-width-1"
                       maxlength="10"
-                      placeholder="请输入报事人姓名"
+                      placeholder="请输入上报人姓名"
                       v-model="formData.name">
             </el-input>
             <div>
@@ -76,14 +76,14 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="发生时间"
+          <el-form-item label="上报时间"
                         prop="happenTime"
                         label-width="150px"
                         style="display: block">
             <el-date-picker v-model="formData.happenTime"
                             class="cell-width-1"
                             type="datetime"
-                            placeholder="发生时间"
+                            placeholder="上报时间"
                             value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
           </el-form-item>
@@ -240,12 +240,12 @@ function iniFmData () {
   return {
 
     gridId: "", //所属网格
-    reportUserId: "", //	报事人ID
+    reportUserId: "", //	上报人ID
-    name: "", //	报事人姓名
+    name: "", //	上报人姓名
     mobile: "", //	联系电话
     idCard: "", //	证件号
     sourceType: "", //	反映渠道
-    happenTime: "", //发生时间
+    happenTime: "", //上报时间
     eventContent: "", //	事件内容
     imageList: [], //	图片集合
     // categoryList: [],//	二类分类Id
@@ -335,7 +335,7 @@ export default {
         gridId: [
           { required: true, message: "所属网格不能为空", trigger: "blur" },
         ],
-        name: [{ required: true, message: "报事人不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "上报人不能为空", trigger: "blur" }],
         mobile: [
           { required: true, message: "联系电话不能为空", trigger: "blur" },
         ],
@@ -350,7 +350,7 @@ export default {
           { required: true, message: "事件内容不能为空", trigger: "blur" },
         ],
         happenTime: [
-          { required: true, message: "发生时间不能为空", trigger: "blur" },
+          { required: true, message: "上报时间不能为空", trigger: "blur" },
         ],
         address: [
           { required: true, message: "事件地址不能为空", trigger: "blur" },

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

@@ -10,7 +10,7 @@
             <span>{{ info.gridName }}</span>
           </div>
           <div :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
-            <span class="u-info-title-2">发生时间：</span>
+            <span class="u-info-title-2">上报时间：</span>
             <span>{{ info.happenTime }}</span>
           </div>
           <div :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
@@ -48,7 +48,7 @@
             <span>{{ info.address }}</span>
           </div>
           <div :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
-            <span class="u-info-title-2">报事人：</span>
+            <span class="u-info-title-2">上报人：</span>
             <span>{{ info.name }}</span>
           </div>
           <div :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
@@ -60,7 +60,7 @@
             <span>{{ info.idCard?info.idCard:'--' }}</span>
           </div>
           <div :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
-            <span class="u-info-title-2">痛点难点：</span>
+            <span class="u-info-title-2">标记：</span>
             <span>{{ info.markTypeName|| '--' }}</span>
           </div>
           <div v-if="info.operationType==='1'"

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

@@ -79,7 +79,7 @@
                 </template>
               </el-cascader> -->
             </el-form-item>
-            <el-form-item label="报事人" prop="name">
+            <el-form-item label="上报人" prop="name">
               <el-input
                 v-model="formData.name"
                 class="u-item-width-normal"
@@ -99,7 +99,7 @@
               >
               </el-input>
             </el-form-item>
-            <el-form-item label="发生时间" prop="startTime">
+            <el-form-item label="上报时间" prop="startTime">
               <el-date-picker
                 v-model="formData.startTime"
                 :picker-options="startPickerOptions"
@@ -304,7 +304,7 @@
             prop="name"
             align="center"
             width="100"
-            label="报事人"
+            label="上报人"
             :show-overflow-tooltip="true"
           >
           </el-table-column>
@@ -336,7 +336,7 @@
             align="center"
             width="140"
             :show-overflow-tooltip="true"
-            label="发生时间"
+            label="上报时间"
           >
           </el-table-column>
           <el-table-column

src/views/modules/shequzhili/issue/cpts/eventDetail.vue

@@ -10,7 +10,7 @@
           </div>
 
           <div class="m-info-prop">
-            <span class="u-info-title-2">发生时间：</span>
+            <span class="u-info-title-2">上报时间：</span>
             <span>{{ eventDetailData.happenTime||'--' }}</span>
           </div>
 
@@ -55,7 +55,7 @@
             <span>{{ eventDetailData.address||'--'  }}</span>
           </div>
           <div class="m-info-prop">
-            <span class="u-info-title-2">报事人：</span>
+            <span class="u-info-title-2">上报人：</span>
             <span>{{ eventDetailData.name||'--'  }}</span>
           </div>
           <div class="m-info-prop">
@@ -67,7 +67,7 @@
             <span>{{ eventDetailData.idCard||'--'  }}</span>
           </div>
           <div class="m-info-prop">
-            <span class="u-info-title-2">痛点难点：</span>
+            <span class="u-info-title-2">标记：</span>
             <span>{{ eventDetailData.difficultPointName||'--'  }}</span>
           </div>
           <div v-if="eventDetailData.satisfactionName"

src/views/modules/shequzhili/issue/issueList.vue

@@ -135,7 +135,7 @@
                            align="center"
                            width="180"
                            :show-overflow-tooltip="true"
-                           label="转议题时间">
+                           label="议题创建时间">
           </el-table-column>
           <el-table-column prop="sourceTypeName"
                            label="来源"