优化图片展示时间

src/views/components/carouselChart.vue

@@ -40,7 +40,7 @@
       >
         <img :src="item.path" alt="" />
         <p class="timeInfo" v-if="item.path.indexOf('nopic') == -1">
-          {{ $moment(item.photoTime).format("YYYY-MM-DD ") }}
+          {{ $moment(item.photoTime).format("HH:mm:ss") }}
         </p>
       </swiper-slide>
       <!-- <div

src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue

@@ -3,7 +3,7 @@
     class="addPhotoDialog"
     :title="photoDialogTitle"
     :visible.sync="photoDialog"
-    width="830px"
+    width="868px"
   >
     <el-form
       label-position="left"
@@ -12,48 +12,55 @@
       :rules="rules"
       :model="formInfo"
     >
-      <el-form-item label="显示名：" prop="displayName" required>
-        <el-input v-model="formInfo.displayName"></el-input>
-      </el-form-item>
       <el-form-item label="装置ID：" prop="cmdid" required>
-        <el-input v-model="formInfo.cmdid"></el-input>
+        <el-input v-model="formInfo.cmdid" auto-complete="on"></el-input>
+      </el-form-item>
+      <el-form-item label="显示名：" prop="displayName">
+        <el-input v-model="formInfo.displayName"></el-input>
       </el-form-item>
+
       <el-form-item label="线路编号：" prop="lineid" required>
-        <el-input v-model="formInfo.lineid"></el-input>
+        <el-input v-model="formInfo.lineid" auto-complete="on"></el-input>
       </el-form-item>
       <el-form-item label="杆塔编号：" prop="towerid" required>
-        <el-input v-model="formInfo.towerid"></el-input>
+        <el-input v-model="formInfo.towerid" auto-complete="on"></el-input>
       </el-form-item>
       <el-form-item label="是否带云台：" prop="hasPan" required>
-        <el-input v-model="formInfo.hasPan"></el-input>
+        <!-- <el-input v-model="formInfo.hasPan"></el-input> -->
+        <el-switch
+          v-model="formInfo.hasPan"
+          :active-value="1"
+          :inactive-value="0"
+        >
+        </el-switch>
       </el-form-item>
 
-      <el-form-item label="装置名称：" prop="equipName" required>
+      <el-form-item label="装置名称：" prop="equipName">
         <el-input v-model="formInfo.equipName"></el-input>
       </el-form-item>
-      <el-form-item label="装置型号：" prop="model" required>
+      <el-form-item label="装置型号：" prop="model">
         <el-input v-model="formInfo.model"></el-input>
       </el-form-item>
-      <el-form-item label="纬度：" prop="latitude" required>
+      <!-- <el-form-item label="纬度：" prop="latitude">
         <el-input v-model.number="formInfo.latitude"></el-input>
       </el-form-item>
 
-      <el-form-item label="经度：" prop="longitude" required>
+      <el-form-item label="经度：" prop="longitude">
         <el-input v-model.number="formInfo.longitude"></el-input>
-      </el-form-item>
-      <el-form-item label="原始 ID：" prop="orgId" required>
+      </el-form-item> -->
+      <el-form-item label="原始 ID：" prop="orgId">
         <el-input v-model="formInfo.orgId"></el-input>
       </el-form-item>
-      <el-form-item label="版本号：" prop="essentialInfoVersion" required>
+      <el-form-item label="版本号：" prop="essentialInfoVersion">
         <el-input v-model="formInfo.essentialInfoVersion"></el-input>
       </el-form-item>
-      <el-form-item label="出厂编号：" prop="bsIdentifier" required>
+      <el-form-item label="出厂编号：" prop="bsIdentifier">
         <el-input v-model="formInfo.bsIdentifier"></el-input>
       </el-form-item>
-      <el-form-item label="生产厂家：" prop="bsManufacturer" required>
+      <el-form-item label="生产厂家：" prop="bsManufacturer">
         <el-input v-model="formInfo.bsManufacturer"></el-input>
       </el-form-item>
-      <el-form-item label="生产日期：" prop="bsProductionDate" required>
+      <el-form-item label="生产日期：" prop="bsProductionDate">
         <el-input v-model="formInfo.bsProductionDate"></el-input>
       </el-form-item>
     </el-form>
@@ -86,9 +93,9 @@ export default {
     return {
       formInfo: {},
       rules: {
-        displayName: [
-          { required: true, message: "请输入显示名", trigger: "blur" },
-        ],
+        // displayName: [
+        //   { required: true, message: "请输入显示名", trigger: "blur" },
+        // ],
         cmdid: [{ required: true, message: "请输入装置ID", trigger: "blur" }],
         lineid: [
           { required: true, message: "请输入线路编号", trigger: "blur" },
@@ -100,25 +107,25 @@ export default {
           { required: true, message: "请输入是否带云台", trigger: "blur" },
         ],
 
-        equipName: [
-          { required: true, message: "请输入装置名称", trigger: "blur" },
-        ],
-        model: [{ required: true, message: "请输入装置型号", trigger: "blur" }],
-        latitude: [{ required: true, message: "请输入纬度", trigger: "blur" }],
-        longitude: [{ required: true, message: "请输入经度", trigger: "blur" }],
-        orgId: [{ required: true, message: "请输入原始 ID", trigger: "blur" }],
-        essentialInfoVersion: [
-          { required: true, message: "请输入版本号", trigger: "blur" },
-        ],
-        bsIdentifier: [
-          { required: true, message: "请输入出厂编号", trigger: "blur" },
-        ],
-        bsManufacturer: [
-          { required: true, message: "请输入生产厂家", trigger: "blur" },
-        ],
-        bsProductionDate: [
-          { required: true, message: "请输入生产日期", trigger: "blur" },
-        ],
+        // equipName: [
+        //   { required: true, message: "请输入装置名称", trigger: "blur" },
+        // ],
+        // model: [{ required: true, message: "请输入装置型号", trigger: "blur" }],
+        // latitude: [{ required: true, message: "请输入纬度", trigger: "blur" }],
+        // longitude: [{ required: true, message: "请输入经度", trigger: "blur" }],
+        // orgId: [{ required: true, message: "请输入原始 ID", trigger: "blur" }],
+        // essentialInfoVersion: [
+        //   { required: true, message: "请输入版本号", trigger: "blur" },
+        // ],
+        // bsIdentifier: [
+        //   { required: true, message: "请输入出厂编号", trigger: "blur" },
+        // ],
+        // bsManufacturer: [
+        //   { required: true, message: "请输入生产厂家", trigger: "blur" },
+        // ],
+        // bsProductionDate: [
+        //   { required: true, message: "请输入生产日期", trigger: "blur" },
+        // ],
       },
       //表单数组，对象
       formArr: [],
@@ -227,7 +234,7 @@ export default {
       display: flex;
       flex-wrap: wrap;
       .el-form-item {
-        width: 246px;
+        width: 260px;
         margin-right: 16px;
         .el-form-item__label {
           padding-right: 0px;

src/views/management/monitoringEquipment/photographicDevice/index.vue

@@ -17,6 +17,13 @@
           @row-click="handleRowClick"
           v-loading="loading"
         >
+          <el-table-column
+            prop="cmdid"
+            label="图像监测装置ID(cmdid)"
+            show-overflow-tooltip
+            width="160px"
+          >
+          </el-table-column>
           <el-table-column
             prop="displayName"
             label="显示名"
@@ -30,13 +37,7 @@
               <span v-else>{{ scope.row.cmdid }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="cmdid"
-            label="图像监测装置ID"
-            show-overflow-tooltip
-            width="160px"
-          >
-          </el-table-column>
+
           <el-table-column prop="lineid" label="线路编号"> </el-table-column>
           <el-table-column prop="towerid" label="杆塔编号"> </el-table-column>
           <el-table-column prop="hasPan" label="是否带云台">

src/views/realTimeMonitor/components/deviceUpgrade.vue

@@ -15,9 +15,9 @@
         :file-list="fileList"
       >
         <el-button size="small" type="primary">点击上传</el-button>
-        <div slot="tip" class="el-upload__tip">
+        <!-- <div slot="tip" class="el-upload__tip">
           只能上传jpg/png文件，且不超过500kb
-        </div>
+        </div> -->
       </el-upload>
     </div>
     <div slot="footer" class="dialog-footer">

src/views/realTimeMonitor/components/pictureTags.vue

@@ -11,14 +11,14 @@
         <img
           src="http://47.96.238.157/image/2023/04/24/01/DSH10H00000000001_1_FF_20230424192442.jpg"
         />
-        <canvas
+        <!-- <canvas
           id="myCanvas"
           class="myCanvas"
           ref="myCanvas"
           @mousedown="mousedown"
           @mouseup="mouseup"
           @mousemove="mousemove"
-        ></canvas>
+        ></canvas> -->
       </div>
 
       <div class="setBox">