提交代码

src/views/gas/building/index.vue

@@ -77,7 +77,7 @@
 
     <el-table v-loading="loading" :data="buildingList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="id" align="center" prop="id" v-if="true"/>
+      <el-table-column label="id" align="center" prop="id" v-if="false"/>
       <el-table-column label="所属小区" align="center" prop="areaName"/>
       <el-table-column label="楼宇名" align="center" prop="name"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/gas/regulatorBox/index.vue

@@ -97,7 +97,7 @@
     <el-table v-loading="loading" :data="regulatorBoxList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键" align="center" prop="id" v-if="false"/>
-      <el-table-column label="调压箱名称" align="center" prop="areaName"/>
+      <el-table-column label="调压箱名称" align="center" prop="name"/>
       <!--      <el-table-column label="所属楼宇" align="center" prop="buildingName"/>-->
       <!--      <el-table-column label="所属单元" align="center" prop="unitName"/>-->
       <el-table-column label="管理所" align="center" prop="administrativeOffice">

src/views/gas/valveWellInspection/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="位置id" prop="positionId">
+      <el-form-item label="位置" prop="positionId">
         <el-select v-model="queryParams.positionId" placeholder="请选择阀井名称" filterable clearable size="small"
                    @keyup.enter.native="handleQuery" style="width: 100%">
           <el-option
@@ -21,14 +21,14 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="发现时间" prop="discoverTime">
-        <el-date-picker clearable size="small"
-                        v-model="queryParams.discoverTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择发现时间">
-        </el-date-picker>
-      </el-form-item>
+<!--      <el-form-item label="发现时间" prop="discoverTime">-->
+<!--        <el-date-picker clearable size="small"-->
+<!--                        v-model="queryParams.discoverTime"-->
+<!--                        type="date"-->
+<!--                        value-format="yyyy-MM-dd"-->
+<!--                        placeholder="选择发现时间">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -96,11 +96,13 @@
           <dict-tag :options="dict.type.find_problem" :value="scope.row.discoverProblems"/>
         </template>
       </el-table-column>
-      <el-table-column label="发现时间" align="center" prop="discoverTime" width="180">
+      <el-table-column label="上传时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.discoverTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          <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="remark"/>
       <el-table-column label="照片" align="center">
         <template slot-scope="scope">
@@ -167,14 +169,6 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="发现时间" prop="discoverTime">
-          <el-date-picker clearable size="small"
-                          v-model="form.discoverTime"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择发现时间" style="width: 100%">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入备注"/>
         </el-form-item>
@@ -252,9 +246,6 @@ export default {
         discoverProblems: [
           {required: true, message: "发现问题不能为空", trigger: "blur"}
         ],
-        discoverTime: [
-          {required: true, message: "发现时间不能为空", trigger: "blur"}
-        ],
       },
       listValveWellPositionList: []
     };