From 2d7b82461ff2daeee500a9f160363c2e3f5c2ed3 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Sun, 23 Apr 2023 11:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Login.vue                           |   2 +-
 src/views/devicePhotoSchedule/index.vue       | 110 +++++++++++++-----
 .../photographicDevice/index.vue              |  15 ++-
 3 files changed, 91 insertions(+), 36 deletions(-)

diff --git a/src/views/Login.vue b/src/views/Login.vue
index e4a9542..55133b3 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -150,7 +150,7 @@ export default {
     background: rgba(0, 0, 0, 0.6);
   }
   .loginFilter {
-    width: 1000px;
+    width: 800px;
     height: 450px;
     background: #fff;
     box-shadow: 0px 4px 12px 0px rgba(51, 51, 51, 0.15);
diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue
index 65e2ece..73f6d6b 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -2,11 +2,23 @@
   <div class="deviceInformation">
     <div class="deviceBox">
       <div class="deviceBtnGroup">
-        <el-button type="primary" icon="el-icon-plus" @click.native.stop="handleAdddevice()" >新增</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          @click.native.stop="handleAdddevice()"
+          >新增</el-button
+        >
       </div>
       <div class="deviceTable">
-        <el-table ref="multipleTable" :data="deviceTableData" tooltip-effect="dark" style="width: 100%" 
-        height="calc(100% - 40px)" @selection-change="handleSelectionChange" @row-click="handleRowClick">
+        <el-table
+          ref="multipleTable"
+          :data="deviceTableData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          height="calc(100% - 40px)"
+          @selection-change="handleSelectionChange"
+          @row-click="handleRowClick"
+        >
           <!-- <el-table-column type="index" width="55"> </el-table-column>
           <el-table-column type="selection" width="55"> </el-table-column> -->
           <el-table-column label="单位" show-overflow-tooltip>
@@ -15,40 +27,76 @@
           <el-table-column label="时间表类型" show-overflow-tooltip>
             <template>时间表类型</template>
           </el-table-column>
-          <el-table-column prop="startTime" label="开始时间" show-overflow-tooltip ></el-table-column>
-          <el-table-column prop="endTime" label="结束时间" show-overflow-tooltip ></el-table-column>
-          <el-table-column prop="span" label="间隔（分）" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
+          <el-table-column
+            prop="startTime"
+            label="开始时间"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="结束时间"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="span"
+            label="间隔（分）"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="remark"
+            label="备注"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
-              <el-button @click.native.stop="handleResive(scope.row)" type="text" >修改</el-button>
-              <el-button  type="text" class="deleteText" @click.native.stop="handleDelete(scope.row)">删除</el-button>
-              <el-button  type="text"  @click.native.stop="handleSet(scope.row)">设置</el-button>
+              <el-button
+                @click.native.stop="handleResive(scope.row)"
+                type="text"
+                >修改</el-button
+              >
+              <el-button
+                type="text"
+                class="deleteText"
+                @click.native.stop="handleDelete(scope.row)"
+                >删除</el-button
+              >
+              <el-button type="text" @click.native.stop="handleSet(scope.row)"
+                >设置</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
         <div class="pageNation">
-          <el-pagination @current-change="handleCurrentChange" :current-page="page" :page-size="pageSize" 
-          layout=" prev, pager, next, jumper,total" :total="total" background >
+          <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="page"
+            :page-size="pageSize"
+            layout=" prev, pager, next, jumper,total"
+            :total="total"
+            background
+          >
           </el-pagination>
         </div>
       </div>
     </div>
     <!-- 新增时间表 -->
-    <adddeviceDialog  :title="title" ref="adddeviceDialogref" ></adddeviceDialog>
+    <adddeviceDialog :title="title" ref="adddeviceDialogref"></adddeviceDialog>
     <!-- 设置时间表 -->
-    <setdevice ref="setdeviceDialogref"  ></setdevice>
+    <setdevice ref="setdeviceDialogref"></setdevice>
   </div>
 </template>
 <script>
-import { getScheduleRulelListJoggle,deleteScheduleRulel } from "@/utils/api/index";
+import {
+  getScheduleRulelListJoggle,
+  deleteScheduleRulel,
+} from "@/utils/api/index";
 import adddeviceDialog from "./components/adddeviceDialog.vue";
-import setdevice from './components/setdevice.vue';
+import setdevice from "./components/setdevice.vue";
 
 export default {
   components: {
     adddeviceDialog,
-    setdevice
+    setdevice,
   },
   data() {
     return {
@@ -68,11 +116,11 @@ export default {
     deviceList() {
       getScheduleRulelListJoggle({
         pageindex: this.page,
-        pagesize: this.pageSize
+        pagesize: this.pageSize,
       })
         .then((res) => {
           this.deviceTableData = res.data.list;
-          this.total = res.data.total
+          this.total = res.data.total;
         })
         .catch((err) => {});
     },
@@ -88,26 +136,26 @@ export default {
     // 新建
     handleAdddevice() {
       this.title = "新增";
-      this.$refs.adddeviceDialogref.display()
-      this.$refs.adddeviceDialogref.getdataform(null)
+      this.$refs.adddeviceDialogref.display();
+      this.$refs.adddeviceDialogref.getdataform(null);
     },
 
     //修改
     handleResive(data) {
       this.title = "修改";
-      this.$refs.adddeviceDialogref.display()
-      this.$refs.adddeviceDialogref.getdataform(data)
+      this.$refs.adddeviceDialogref.display();
+      this.$refs.adddeviceDialogref.getdataform(data);
     },
 
     //设置
-    handleSet(data){
-      this.$refs.setdeviceDialogref.display()
-      this.$refs.setdeviceDialogref.getdataform(data)
+    handleSet(data) {
+      this.$refs.setdeviceDialogref.display();
+      this.$refs.setdeviceDialogref.getdataform(data);
     },
 
     //删除数据
     handleDelete(data) {
-      let deleteArr=[]
+      let deleteArr = [];
       deleteArr.push({
         id: data.id,
       });
@@ -123,7 +171,7 @@ export default {
           this.$message({ type: "success", message: "删除成功!" });
         })
         .catch(() => {
-          this.$message({ type: "info",  message: "已取消删除" });
+          this.$message({ type: "info", message: "已取消删除" });
         });
     },
     //点击分页
@@ -131,7 +179,7 @@ export default {
       this.page = val;
       this.deviceList();
     },
-  }
+  },
 };
 </script>
 <style lang="less">
@@ -154,8 +202,8 @@ export default {
   }
 
   .deviceTable {
-    padding: 16px 8px 0 8px;
-    height: calc(100% - 80px);
+    margin-top: 16px;
+    height: calc(100% - 48px);
     //background: #fcc;
   }
 }
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index c02b728..c2554be 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -18,8 +18,15 @@
         >
           <!-- <el-table-column type="index" width="55"> </el-table-column>
           <el-table-column type="selection" width="55"> </el-table-column> -->
-          <el-table-column prop="displayName" label="显示名"> </el-table-column>
-          <el-table-column prop="equipName" label="装置名称"> </el-table-column>
+          <el-table-column
+            prop="displayName"
+            label="显示名"
+            show-overflow-tooltip
+            width="160px"
+          >
+          </el-table-column>
+          <el-table-column prop="equipName" label="装置名称" width="140px">
+          </el-table-column>
           <el-table-column
             prop="cmdid"
             label="图像监测装置ID"
@@ -74,10 +81,10 @@
             label="修改时间"
             :show-overflow-tooltip="true"
             :formatter="dateFormat"
-            width="140px"
+            width="100px"
           >
           </el-table-column>
-          <el-table-column fixed="right" label="操作" width="200">
+          <el-table-column fixed="right" label="操作" width="160">
             <template slot-scope="scope">
               <el-button
                 @click.native.stop="handleRevisePhoto(scope.row)"