提交

src/views/gas/area/index.vue

@@ -257,9 +257,9 @@
         <el-form-item label="小区规模" prop="areaSize">
           <el-input-number v-model="form.areaSize" :min="1" label="请输入小区规模" style="width: 100%"/>
         </el-form-item>
-        <el-form-item label="照片" prop="photoList">
-          <imageUpload v-model="form.photoList"/>
-        </el-form-item>
+<!--        <el-form-item label="照片" prop="photoList">-->
+<!--          <imageUpload v-model="form.photoList"/>-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>

src/views/gas/patrolTeam/index.vue

@@ -48,8 +48,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否告警" prop="isReport">
-        <el-select v-model="queryParams.isReport" placeholder="请选择是否告警" clearable size="small">
+      <el-form-item label="是否出警" prop="isReport">
+        <el-select v-model="queryParams.isReport" placeholder="请选择是否出警" clearable size="small">
           <el-option
             v-for="dict in dict.type.yes_and_no"
             :key="dict.value"
@@ -175,13 +175,14 @@
           <dict-tag :options="dict.type.yes_and_no" :value="scope.row.isNormalInspection"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否告警" align="center" prop="isReport" >
+      <el-table-column label="是否出警" align="center" prop="isReport" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.yes_and_no" :value="scope.row.isReport"/>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="上传时间" align="center" prop="createTime" />
+      <el-table-column label="上传人" align="center" prop="createByName" />
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus"
@@ -290,8 +291,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="是否告警" prop="isReport">
-          <el-select v-model="form.isReport" placeholder="请选择是否告警" clearable size="small" style="width: 100%">
+        <el-form-item label="是否出警" prop="isReport">
+          <el-select v-model="form.isReport" placeholder="请选择是否出警" clearable size="small" style="width: 100%">
             <el-option
               v-for="dict in dict.type.yes_and_no"
               :key="dict.value"
@@ -479,7 +480,7 @@ export default {
           { required: true, message: "是否正常巡检不能为空", trigger: "blur" }
         ],
         isReport: [
-          { required: true, message: "是否告警不能为空", trigger: "blur" }
+          { required: true, message: "是否出警不能为空", trigger: "blur" }
         ],
       }
     };

src/views/gas/regulatingBoxMaintenance/index.vue

@@ -176,10 +176,10 @@
       </el-table-column>
       <el-table-column label="维护项目" align="center" prop="maintenanceItem">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.regulating_box_maintenance" :value="scope.row.maintenanceItem.split(',')"/>
+          <dict-tag :options="dict.type.regulating_box_maintenance" :value="scope.row.maintenanceItem!=null?scope.row.maintenanceItem.split(','):''"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="上传人" align="center" prop="createByName"/>-->
+      <el-table-column label="上传人" align="center" prop="createByName"/>
       <el-table-column label="上传时间" align="center" prop="createTime"/>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">

src/views/gas/roadSectionInspection/index.vue

@@ -168,7 +168,7 @@
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="上传人" align="center" prop="createByName" width="180"/>-->
+      <el-table-column label="上传人" align="center" prop="createByName" width="180"/>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus"

src/views/gas/valveWellInspection/index.vue

@@ -220,8 +220,8 @@
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="上传人" align="center" prop="createByName" width="180">-->
-<!--      </el-table-column>-->
+      <el-table-column label="上传人" align="center" prop="createByName" width="180">
+      </el-table-column>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus"