feat:页面优化及联调问题处理

src/views/announcement-management/index.vue

@@ -54,7 +54,11 @@
           {{ formatDate(scope.row.createTime) }}
         </template>
       </el-table-column>
-      <el-table-column prop="announcementStatus" label="公告状态" align="center"></el-table-column>
+      <el-table-column prop="announcementStatus" label="公告状态" align="center">
+        <template slot-scope="scope">
+          {{scope.row.announcementStatus == '1'?'已发布':'草稿'}}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
           <el-button size="small" type="text" @click="handleRelease(scope.row)" v-if="scope.row.announcementStatus == '草稿'"
@@ -255,8 +259,6 @@ export default {
         const fileName = row.images.substring(row.images.lastIndexOf('/') + 1)
         this.fileList = [{ name: fileName, url: row.images }]
       }
-      const obj = this.statusOptions.find((item) => item.label == row.announcementStatus)
-      this.form.announcementStatus = obj ? obj.value : 2
       this.title = '编辑公告'
       this.titleType = 'edit'
       this.addDialogVisible = true

src/views/csq-popup/index.vue

@@ -44,7 +44,7 @@ export default {
         this.popupStyle = {
           position: 'absolute',
           left: `${canvasPosition.x}px`,
-          top: `${canvasPosition.y -400}px`, // 向上偏移，避免遮挡点位
+          top: `${canvasPosition.y -300}px`, // 向上偏移，避免遮挡点位
           'z-index': 1000
         }
 

src/views/hydrological-station/jcInfo.vue

@@ -20,8 +20,8 @@
       <el-row justify="space-between" class="mb20">
         <el-col :span="12" style="text-align: left">
           <el-button size="small" icon="el-icon-plus" class="primaryBtn" @click="toAdd">新增监测数据</el-button>
-          <input type="file" ref="fileInput" style="display: none" @change="importData" />
-          <el-button class="primaryBtn ml10" size="small" @click="toImportData"><img src="@/assets/image/common/u88.png" class="vIcon" /> 导入</el-button>
+          <!-- <input type="file" ref="fileInput" style="display: none" @change="importData" /> -->
+          <!-- <el-button class="primaryBtn ml10" size="small" @click="toImportData"><img src="@/assets/image/common/u88.png" class="vIcon" /> 导入</el-button> -->
         </el-col>
         <el-col :span="12" style="text-align: right">
           <el-button size="small" icon="el-icon-search" @click="handleSearch" class="primaryBtn">查询</el-button>

src/views/safety-inspection/addInspectionTask.vue

@@ -5,7 +5,7 @@
       <img src="@/assets/image/common/close.png" style="cursor: pointer" alt="" @click="closeModal" />
     </div>
     <div class="add-inspection-task-content">
-      <el-form ref="addTaskFormRef" :rules="rules" :model="addTaskFrom" label-width="0.8rem" size="mini">
+      <el-form ref="addTaskFormRef" :rules="rules" :model="addTaskFrom" label-width="0.9rem" size="mini">
         <el-form-item label="方案名称" prop="securityPatrolName">
           <el-input v-model="addTaskFrom.securityPatrolName" placeholder="请输入"></el-input>
         </el-form-item>
@@ -291,7 +291,7 @@ export default {
   position: absolute;
   top: 0.8rem;
   right: 4.85rem;
-  width: px-to-rem(422);
+  width: px-to-rem(520);
   z-index: 9999;
   .add-inspection-task-title {
     background: url('@/assets/image/common/popup_title_bg.png') no-repeat;

src/views/safety-inspection/right.vue

@@ -135,6 +135,10 @@ export default {
     this.getSecurityPatrolList()
     this.$globalEventBus.$on('closeVideoPlay', () => {
       this.stopPatrol()
+      const endTime = moment().format('YYYY-MM-DD HH:mm:ss')
+        endPatrol({ id: this.xcId, endTime: endTime, startTime: this.currentTime }).then(() => {
+          this.refreshData()
+        })
     })
     this.$globalEventBus.$on('toPlayNextVideo', () => {
       this.goToNextPatrolPoint()