aliyun8775019416 3 mesi fa
parent
commit
05097bc0e6

+ 9 - 2
src/views/inspection/Inspectionpath/PathForm.vue

@@ -48,8 +48,12 @@
                   <Icon icon="ic:round-drag-indicator" class="drag-icon cursor-move" />
                 </el-tooltip>
                 <span class="point-info">
-                  {{ element.name }}
-                  <el-tag size="small">ID: {{ element.pointId }}</el-tag>
+                  <el-tag size="small">
+                    巡检点名称: {{ element.name }} -
+                    ID: {{ element.pointId }} -
+                    类型: {{ element.type }} -
+                    备注: {{ element.remarks }}
+                  </el-tag>
                 </span>
               </div>
 
@@ -66,6 +70,9 @@
           </el-button>
         </div>
       </el-form-item>
+      <el-form-item label="地址描述" prop="address">
+        <el-input v-model="formData.address" placeholder="请输入地址描述" />
+      </el-form-item>
       <el-form-item label="备注" prop="remarks">
         <el-input v-model="formData.remarks" placeholder="请输入备注" />
       </el-form-item>

+ 0 - 1
src/views/inspection/Inspectionpath/PointSelectorDialog.vue

@@ -67,7 +67,6 @@
         <el-table-column label="纬度" align="center" prop="latitude" />
         <el-table-column label="巡检点类型" align="center" prop="type" />
         <el-table-column label="备注" align="center" prop="remarks" />
-        <el-table-column label="图片" align="center" prop="picture" />
         <el-table-column
             label="创建时间"
             align="center"

+ 2 - 3
src/views/inspection/Inspectionpath/index.vue

@@ -104,10 +104,9 @@
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="巡检路线名称" align="center" prop="name" />
       <el-table-column label="巡检人" align="center" prop="username" />
-      <el-table-column label="巡检点" align="center" prop="sequence" />
-      <el-table-column label="关联图层名" align="center" prop="shpName" />
-      <el-table-column label="用户ID" align="center" prop="id" />
+      <el-table-column label="巡检人ID" align="center" prop="id" />
       <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="地址描述" align="center" prop="address" />
       <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column
           label="创建时间"

+ 11 - 1
src/views/inspection/Inspectionpoint/index.vue

@@ -111,7 +111,17 @@
       <el-table-column label="纬度" align="center" prop="latitude" />
       <el-table-column label="巡检点类型" align="center" prop="type" />
       <el-table-column label="备注" align="center" prop="remarks" />
-      <el-table-column label="图片" align="center" prop="picture" />
+      <el-table-column label="文件内容" align="center" prop="picture" width="110px">
+        <template #default="{ row }">
+          <el-image
+              class="h-80px w-80px"
+              lazy
+              :src="row.picture"
+              preview-teleported
+              fit="cover"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
           label="创建时间"
           align="center"

+ 17 - 19
src/views/inspection/inspectionrecord/index.vue

@@ -69,14 +69,7 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['inspection:record:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
+
         <el-button
           type="success"
           plain
@@ -93,20 +86,25 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="关联图层名" align="center" prop="shpName" />
-      <el-table-column label="用户ID" align="center" prop="id" />
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="巡检人ID" align="center" prop="creator" />
       <el-table-column label="巡检人" align="center" prop="username" />
-      <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="路线记录" align="center" prop="geom" />
       <el-table-column label="备注" align="center" prop="remarks" />
-      <el-table-column label="图片路径" align="center" prop="picture" />
+      <el-table-column
+          label="开始时间"
+          align="center"
+          prop="createTime"
+          :formatter="dateFormatter"
+          width="180px"
+      />
+      <el-table-column
+          label="结束时间"
+          align="center"
+          prop="endTime"
+          :formatter="dateFormatter"
+          width="180px"
+      />
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button