From 3720047ab4e7017da0dbf89a7bbe0d4640ac06ad Mon Sep 17 00:00:00 2001
From: liuyi <l_cheny@foxmail.com>
Date: Mon, 8 May 2023 18:31:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4=E8=A1=A8?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api/index.js                        |  9 ++
 .../components/adddeviceDialog.vue            | 88 +++++++++++++------
 src/views/devicePhotoSchedule/index.vue       |  7 +-
 src/views/realTimeSearch/index.vue            | 38 ++++----
 4 files changed, 92 insertions(+), 50 deletions(-)

diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index a3e6519..c6c6dad 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -56,6 +56,15 @@ export function getSearchInfo(data){
     data
   })
 }
+//获取实时图片数据
+export function getRealtimePhoto(data){
+  return request({
+    url: "/test/getPhotoList",
+    method: "post",
+    data
+  })
+}
+
 
 //杆塔信息
 //1.获取杆塔列表
diff --git a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
index 7661763..6bb0c20 100644
--- a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
+++ b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
@@ -5,6 +5,7 @@
     :visible.sync="isShow"
     :close-on-click-modal="false"
     width="670px"
+    @close="handleclose"
   >
     <el-form
       label-position="left"
@@ -19,10 +20,10 @@
       <div class="addtimeBox" ref="timescrollref">
         <div
           class="timeBoxArr"
-          v-for="(item, index) in ruleForm.formList"
+          v-for="(item, index) in ruleForm.list"
           :key="index"
         >
-          <el-form-item label="时间" :prop="'formList.' + index + '.time'">
+          <el-form-item label="时间" :prop="'list.' + index + '.time'" :rules="{ required: true, message:'请选择时间', trigger:'blur' }">
             <el-time-picker
               is-range
               v-model="item.time"
@@ -35,9 +36,9 @@
           </el-form-item>
           <el-form-item
             label="间隔（分）"
-            :prop="'formList.' + index + '.span'"
+            :prop="'list.' + index + '.span'"
           >
-            <!-- <el-input v-model="formdata.span" autocomplete="off" type="number"></el-input> -->
+            <!-- <el-input v-model="ruleForm.span" autocomplete="off" type="number"></el-input> -->
             <el-input-number v-model="item.span" :min="1"></el-input-number>
           </el-form-item>
           <div class="btngrop">
@@ -51,7 +52,7 @@
               icon="el-icon-plus"
               type="primary"
               @click="addModule()"
-              v-if="index + 1 == ruleForm.formList.length"
+              v-if="index + 1 == ruleForm.list.length"
             ></el-button>
           </div>
         </div>
@@ -67,7 +68,7 @@
   </el-dialog>
 </template>
 <script>
-//import { addScheduleRulel, updateScheduleRulel } from "@/utils/api/index";
+import { addScheduleRulel, updateScheduleRulel } from "@/utils/api/index";
 export default {
   props: {
     title: String,
@@ -76,26 +77,35 @@ export default {
     return {
       isShow: false,
       rules: {
-        name: [{ required: true, message: "请输入名称", trigger: "blur" }],
-        time: [{ required: true, message: "请选择时间", trigger: "blur" }],
-        span: [{ required: true, message: "请输入间隔", trigger: "blur" }],
-      },
-      ruleForm: {
-        name: "",
-        formList: [
-          {
-            time: "",
-            span: "",
-          },
-        ],
-        remark: "",
+        name: [{ required: true, message: "请输入名称", trigger: "blur" }]
       },
+      ruleForm: {},
     };
   },
   methods: {
+    //判断
+    getdataform(val) {
+      console.log(val);
+      if (val == null) {
+        return this.ruleForm = {
+          name: "",
+          list: [
+            {
+              time: "",
+              span: "",
+            },
+          ],
+          remark: "",
+        };
+      }
+      this.ruleForm = val;
+      this.ruleForm.list.forEach(val => {
+        this.$set(val, "time", [val.startTime, val.endTime]);
+      });
+    },
     addModule() {
       //新增一行
-      this.ruleForm.formList.push({
+      this.ruleForm.list.push({
         time: "",
         span: "",
       });
@@ -112,21 +122,42 @@ export default {
     //删除一行
     deleteModule(item, index) {
       console.log(item, index);
-      const itemList = this.ruleForm.formList.indexOf(item);
+      const itemList = this.ruleForm.list.indexOf(item);
       if (itemList !== -1) {
-        this.ruleForm.formList.splice(index, 1);
+        this.ruleForm.list.splice(index, 1);
       }
     },
-
-    //判断
-
     // 保存确定操作
     submitForm() {
       this.$refs.formInfo.validate((valid) => {
         if (valid) {
-          console.log(valid);
+          // delete this.ruleForm.time;
+          this.ruleForm.list.forEach(val => {
+            this.$set(val, "startTime", val.time[0]);
+            this.$set(val, "endTime", val.time[1]);
+          });
+          if (this.title == "新增") {
+            addScheduleRulel( this.ruleForm )
+              .then((res) => {
+                this.isShow = false;
+                this.$message.success("添加成功");
+                this.$parent.deviceList();
+              })
+              .catch((err) => {
+                this.$message.error("添加失败");
+              });
+          } else {
+            updateScheduleRulel(this.ruleForm)
+              .then((res) => {
+                this.isShow = false;
+                this.$message.success("修改成功");
+                this.$parent.deviceList();
+              })
+              .catch((err) => {
+                this.$message.error("修改失败");
+              });
+          }
         } else {
-          console.log("error submit!!");
           return false;
         }
       });
@@ -137,6 +168,9 @@ export default {
     hide() {
       this.isShow = false;
     },
+    handleclose(){
+      this.$parent.deviceList();
+    }
   },
   mounted() {},
 };
diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue
index 6a546f3..97d656a 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -31,7 +31,7 @@
           </el-table-column>
           <el-table-column label="时间表规则" width="600">
             <template slot-scope="scope">
-              <ul class="rulesBox" v-for="item in scope.row.list">
+              <ul class="rulesBox" v-for="(item,value) in scope.row.list" :key="value">
                 <li><span>开始时间：</span>{{ item.startTime }}</li>
                 <li><span>结束时间：</span>{{ item.endTime }}</li>
                 <li>
@@ -137,7 +137,6 @@ export default {
         .then((res) => {
           this.deviceTableData = res.data.list;
           this.total = res.data.total;
-          console.log(this.deviceTableData);
           this.loading = false;
         })
         .catch((err) => {});
@@ -155,14 +154,14 @@ export default {
     handleAdddevice() {
       this.title = "新增";
       this.$refs.adddeviceDialogref.display();
-      //this.$refs.adddeviceDialogref.getdataform(null);
+      this.$refs.adddeviceDialogref.getdataform(null);
     },
 
     //修改
     handleResive(data) {
       this.title = "修改";
       this.$refs.adddeviceDialogref.display();
-      //this.$refs.adddeviceDialogref.getdataform(data);
+      this.$refs.adddeviceDialogref.getdataform(data);
     },
 
     //设置
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index c8d4a49..dbeb07b 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -4,22 +4,22 @@
       <div class="searchBox">
         <el-form :inline="true" :model="formdata" class="demo-form-inline">
           <el-form-item label="电压名称">
-            <el-select v-model="formdata.dyVal" @change="getSearchxl">
+            <el-select v-model="formdata.dyid" @change="getSearchxl">
               <el-option v-for="item in dyOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="线路名称">
-            <el-select v-model="formdata.xlVal" @change="getSearchgt">
+            <el-select v-model="formdata.lineid" @change="getSearchgt">
               <el-option v-for="item in xlOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="杆塔名称">
-            <el-select v-model="formdata.gtVal" @change="getSearchtd">
+            <el-select v-model="formdata.towerid" @change="getSearchtd">
               <el-option v-for="item in gtOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="通道监拍点">
-            <el-select v-model="formdata.tdVal">
+            <el-select v-model="formdata.channelid">
               <el-option v-for="item in tdOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
@@ -74,7 +74,7 @@
 </template>
 
 <script>
-import { getSearchInfo, getPictureList } from "@/utils/api/index";
+import { getSearchInfo, getRealtimePhoto } from "@/utils/api/index";
 export default {
   data() {
     return {
@@ -83,10 +83,10 @@ export default {
       gtOptions: [],//杆塔数据
       tdOptions: [],//通道数据
       formdata: {
-        dyVal:'',
-        xlVal:'',
-        gtVal: '',
-        tdVal: '',
+        dyid:'',
+        lineid:'',
+        towerid: '',
+        channelid: '',
         timeVal: '',
       },
       picList: [],
@@ -106,31 +106,31 @@ export default {
     getSearchdy(){
       getSearchInfo({ type:1 }).then((res) => {
         this.dyOptions = res.data.list;
-        this.formdata.dyVal = res.data.list[0].id
+        this.formdata.dyid = res.data.list==[] ? '' : res.data.list[0].id
         this.getSearchxl()
       }).catch((err) => {});
     },
     //获取线路数据
     getSearchxl(){
-      getSearchInfo({ type: 2, id: this.formdata.dyVal }).then((res) => {
+      getSearchInfo({ type: 2, id: this.formdata.dyid }).then((res) => {
         this.xlOptions = res.data.list;
-        this.formdata.xlVal = res.data.list[0].id
+        this.formdata.lineid = res.data.list==[] ? '' : res.data.list[0].id
         this.getSearchgt()
       }).catch((err) => {});
     },
     //获取杆塔数据
     getSearchgt(){
-      getSearchInfo({ type: 3, id: this.formdata.xlVal }).then((res) => {
+      getSearchInfo({ type: 3, id: this.formdata.lineid }).then((res) => {
         this.gtOptions = res.data.list;
-        this.formdata.gtVal = res.data.list[0].id
+        this.formdata.towerid = res.data.list==[] ? '' : res.data.list[0].id
         this.getSearchtd()
       }).catch((err) => {});
     },
     //获取通道数据
     getSearchtd(){
-      getSearchInfo({ type: 4, id: this.formdata.gtVal }).then((res) => {
+      getSearchInfo({ type: 4, id: this.formdata.towerid }).then((res) => {
         this.tdOptions = res.data.list;
-        this.formdata.tdVal = res.data.list[0].id
+        this.formdata.channelid = res.data.list==[] ? '' : res.data.list[0].id
       }).catch((err) => {});
     },
     //获取图片列表
@@ -138,9 +138,9 @@ export default {
       this.loading = true;
       this.$set(this.formdata, "pageindex", this.page);
       this.$set(this.formdata, "pagesize", this.pageSize);
-      this.$set(this.formdata, "startTimeVal", this.formdata.timeVal[0]);
-      this.$set(this.formdata, "endTimeVal", this.formdata.timeVal[1]);
-      getPictureList(this.formdata)
+      this.$set(this.formdata, "starttime", this.formdata.timeVal[0]);
+      this.$set(this.formdata, "endtime", this.formdata.timeVal[1]);
+      getRealtimePhoto(this.formdata)
         .then((res) => {
           this.picList = res.data.list;
           this.total = res.data.total;