From 3ac4f2c9343626e4755cdfdcb8cfd8a25a554408 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 27 Jul 2023 14:28:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/adddeviceDialog.vue            |   8 +-
 .../components/setdevicebak.vue               | 386 ------------------
 src/views/devicePhotoSchedule/index copy.vue  | 280 +++++++++++++
 vue.config.js                                 |   6 +-
 4 files changed, 288 insertions(+), 392 deletions(-)
 delete mode 100644 src/views/devicePhotoSchedule/components/setdevicebak.vue
 create mode 100644 src/views/devicePhotoSchedule/index copy.vue

diff --git a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
index 717a4e4..e9fc558 100644
--- a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
+++ b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
@@ -35,7 +35,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               format="HH:mm"
-              value-format="HH:mm:ss"
+              value-format="HH:mm"
             >
             </el-time-picker>
           </el-form-item>
@@ -93,8 +93,9 @@ export default {
           name: "",
           list: [
             {
-              time: "",
-              span: "",
+              hour: "",
+              minute: "",
+              preset: "",
             },
           ],
           remark: "",
@@ -136,6 +137,7 @@ export default {
         if (valid) {
           // delete this.ruleForm.time;
           this.ruleForm.list.forEach((val) => {
+            console.log(val);
             this.$set(val, "startTime", val.time[0]);
             this.$set(val, "endTime", val.time[1]);
           });
diff --git a/src/views/devicePhotoSchedule/components/setdevicebak.vue b/src/views/devicePhotoSchedule/components/setdevicebak.vue
deleted file mode 100644
index d3255b3..0000000
--- a/src/views/devicePhotoSchedule/components/setdevicebak.vue
+++ /dev/null
@@ -1,386 +0,0 @@
-<template>
-  <el-dialog
-    class="photoSetDialog"
-    title="设置"
-    :visible.sync="isShow"
-    :close-on-click-modal="false"
-    width="1020px"
-    @close="handleclose"
-  >
-    <div class="setTimeTd">
-      <h3>时间表规则</h3>
-      <div class="flexTimeGz">
-        <p class="timeGz" v-for="(val, index) in ruleSchedule" :key="index">
-          <span>
-            {{
-              val.startTime.substring(0, val.startTime.lastIndexOf(":"))
-            }}</span
-          >
-          ~
-          <span>{{
-            val.endTime.substring(0, val.endTime.lastIndexOf(":"))
-          }}</span>
-          间隔：<b>{{ val.span }}分钟</b>
-        </p>
-      </div>
-      <h3>设置通道</h3>
-      <div class="chooseTDBox">
-        <label>选择通道:</label>
-        <div class="checkBox">
-          <el-radio-group v-model="checkedAisle" @change="handleChange">
-            <el-radio
-              :label="val.id"
-              border
-              v-for="val in aisleList"
-              :key="val.id"
-              >{{ val.name }}</el-radio
-            >
-          </el-radio-group>
-        </div>
-      </div>
-      <div class="flexnr" v-loading="loading" v-if="newzzList.length !== 0">
-        <el-tree
-          :data="newzzList"
-          show-checkbox
-          :props="defaultProps"
-          ref="tree"
-          node-key="id"
-          :default-expand-all="true"
-          @check-change="getCheckedNodes"
-        >
-          <span
-            v-if="!data.list"
-            class="custom-tree-node"
-            slot-scope="{ data }"
-          >
-            <span class="mr10">{{ data.name }}</span>
-            <!-- <el-tag size="mini" type="success" v-if="zzsuccess"
-              >装置下发成功</el-tag
-            >
-            <el-tag size="mini" v-if="zzpending"
-              ><i class="el-icon-loading"></i>装置下发中</el-tag
-            >
-            <el-tag size="mini" type="danger" v-if="zzerror"
-              >装置下发失败</el-tag
-            > -->
-          </span>
-          <span v-else class="custom-tree-node" slot-scope="{ data }">
-            <span>{{ data.name }}</span>
-          </span>
-        </el-tree>
-      </div>
-      <div class="flexnr" v-else>
-        <p class="nochannel">图像监测装置</p>
-      </div>
-    </div>
-    <div slot="footer" class="dialog-footer">
-      <!-- <el-button @click="getCheckedNodes">获取</el-button> -->
-      <el-button @click="handleclose">取 消</el-button>
-      <el-button type="primary" @click="submitForm()" :loading="sureloading"
-        >确 定</el-button
-      >
-    </div>
-  </el-dialog>
-</template>
-<script>
-import {
-  setScheduleRulel,
-  getScheduleRulelAccessList,
-  getTermListByChannelJoggle,
-  getCmaSchelduleUpload,
-} from "@/utils/api/index";
-export default {
-  props: {
-    title: String,
-  },
-  data() {
-    return {
-      contentStyle: { width: "90px" },
-      isShow: false,
-      selid: 0, //选中时间表id
-      ruleSchedule: [], //时间表规则
-      checkedAisle: "", //选中通道数据
-      aisleList: [], //通道数据内容
-      listnr: [], //通道树状结构
-      defaultProps: {
-        children: "list",
-        label: "name",
-      },
-      termidArr: [],
-      ruleid: "",
-      parmsList: [], //选中的通道
-      multipleSelection: [],
-      //新是数据结构参数
-      newzzList: [],
-      zzListCheck: [],
-      loading: false,
-
-      //全选
-      checkAll: true,
-      isIndeterminate: true, //全选设置默认选中
-      timer: null,
-      termidArrNum: -1,
-      requestList: [],
-
-      timer: null,
-      i: 0,
-      zzsuccess: false,
-      zzpending: false,
-      zzerror: false,
-
-      allCheckNode: [], //获取选中的节点
-
-      requestArr: [], //通过requestid获取状态
-      termzzid: [],
-      flag: false,
-      sureloading: false,
-    };
-  },
-  mounted() {},
-  methods: {
-    //判断
-    getdataform(val) {
-      this.selid = val.id;
-      this.ruleSchedule = val.list;
-      console.log(this.ruleSchedule, "时间规则");
-      this.getlistnr();
-    },
-    //获取所有通道
-    getlistnr() {
-      getScheduleRulelAccessList({})
-        .then((res) => {
-          this.listnr = res.data.list;
-          this.aisleList = res.data.channellist;
-        })
-        .catch((err) => {});
-    },
-
-    //选择通道
-    handleChange() {
-      console.log(this.checkedAisle);
-      this.loading = true;
-      getTermListByChannelJoggle({
-        id: this.checkedAisle,
-      })
-        .then((res) => {
-          console.log(res);
-          this.newzzList = res.data.list;
-          console.log(this.listnr);
-          console.log(this.newzzList);
-          console.log(this.zzListCheck);
-          this.loading = false;
-        })
-        .catch((err) => {});
-    },
-    handleCheckBox() {
-      console.log(this.zzListCheck);
-    },
-
-    // //获取所选值
-    getCheckedNodes() {
-      this.allCheckNode = this.$refs.tree.getCheckedNodes();
-      console.log(this.allCheckNode);
-    },
-
-    // 保存确定操作
-    submitForm() {
-      //console.log(this.termidArr);
-      this.sureSum();
-    },
-    //时间表
-    sureSum() {
-      //console.log(this.termidArr);
-      console.log(this.checkedAisle);
-      var ruleBox = [];
-      for (var i = 0; i < this.allCheckNode.length; i++) {
-        var parmsobj = {
-          termid: this.allCheckNode[i].id,
-          channelidlist: [this.checkedAisle],
-          offset: Math.floor(Math.random() * 10),
-        };
-        console.log(parmsobj);
-        ruleBox.push(parmsobj);
-      }
-      console.log(ruleBox);
-      setScheduleRulel({
-        list: ruleBox,
-        scheduleid: this.selid,
-      })
-        .then((res) => {
-          console.log(res);
-          this.requestList = res.data.list;
-          this.requestTime();
-          this.timer = window.setInterval(() => {
-            //console.log(this.requestList);
-            this.requestTime();
-            this.i++;
-          }, 3000);
-        })
-        .catch((err) => {
-          this.$message({
-            showClose: true,
-            message: "添加失败",
-            type: "error",
-          });
-        });
-    },
-    //根据requestid查询时间表下发状态
-    requestTime() {
-      this.sureloading = true;
-      getCmaSchelduleUpload({
-        list: this.requestList,
-      })
-        .then((res) => {
-          this.requestArr = res.data.list;
-          this.requestList = this.requestArr.filter(function (
-            value,
-            index,
-            arr
-          ) {
-            console.log(value, index, arr);
-            return value.status !== 1;
-          });
-          if (this.requestList.length == 0) {
-            this.zzsuccess = true;
-            this.$message.success("下发成功");
-            clearInterval(this.timer);
-            this.timer = null;
-            this.isShow = false;
-            this.sureloading = false;
-          } else if (this.i > 9) {
-            this.zzerror = true;
-            this.i = 0;
-            this.$message.warning("下发失败，请稍后再试！");
-            clearInterval(this.timer);
-            this.timer = null;
-            this.isShow = false;
-            this.sureloading = false;
-          }
-        })
-        .catch((err) => {});
-    },
-    display() {
-      this.isShow = true;
-    },
-    handleclose() {
-      this.isShow = false;
-      this.newzzList = [];
-      this.checkedAisle = "";
-      console.log(this.allCheckNode, "1111111111");
-      clearTimeout(this.timer);
-      this.timer = null;
-    },
-  },
-};
-</script>
-<style lang="less" scoped>
-.photoSetDialog {
-  .el-dialog__body {
-    // height: 360px;
-    // overflow: auto;
-  }
-
-  .flexnr {
-    height: 360px;
-    overflow: auto;
-    display: flex;
-    align-items: flex-start;
-    border: 1px solid #eee;
-    padding: 16px;
-    border-radius: 4px;
-    .mr10 {
-      margin-right: 10px;
-    }
-    .dybox {
-      h4 {
-        font-size: 14px;
-        color: #333;
-        line-height: 24px;
-        font-weight: normal;
-      }
-      .xlbox {
-        h4 {
-          font-size: 14px;
-          color: #333;
-          line-height: 24px;
-          font-weight: normal;
-        }
-        margin-left: 16px;
-        .zzbox {
-          h4 {
-          }
-          .el-checkbox-group {
-            // display: flex;
-            // flex-direction: column;
-            margin-left: 22px;
-            .el-checkbox {
-              line-height: 28px;
-              //width: 196px;
-              .el-checkbox__label {
-                b {
-                  margin-left: 18px;
-                  font-weight: normal;
-                  font-size: 12px;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    .nochannel {
-      width: 100%;
-      height: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
-  .w50 {
-    width: 50px;
-  }
-  .setTimeTd {
-    h3 {
-      margin: 8px 0px;
-      font-size: 16px;
-      line-height: 24px;
-    }
-    .flexTimeGz {
-      display: flex;
-      flex-wrap: wrap;
-      .timeGz {
-        line-height: 32px;
-        margin-right: 16px;
-        b {
-          font-weight: normal;
-          color: @color-primary;
-        }
-        span {
-          margin: 0px 8px;
-        }
-      }
-    }
-
-    .setCheckbox {
-      .el-table__header .el-table-column--selection .cell .el-checkbox:after {
-        color: #333;
-        content: "全选";
-        font-size: 16px;
-        margin-left: 12px;
-        font-weight: bold;
-      }
-    }
-  }
-  .chooseTDBox {
-    display: flex;
-    align-items: center;
-    margin-bottom: 8px;
-    label {
-      margin-right: 8px;
-    }
-  }
-  .treeTable {
-    margin-top: 16px;
-  }
-}
-</style>
diff --git a/src/views/devicePhotoSchedule/index copy.vue b/src/views/devicePhotoSchedule/index copy.vue
new file mode 100644
index 0000000..40c3a2c
--- /dev/null
+++ b/src/views/devicePhotoSchedule/index copy.vue	
@@ -0,0 +1,280 @@
+<template>
+  <div class="deviceInformation">
+    <div class="deviceBox">
+      <div class="deviceBtnGroup">
+        <h4>拍照时间表设置</h4>
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          @click.native.stop="handleAdddevice()"
+          >新增</el-button
+        >
+      </div>
+      <div class="deviceTable">
+        <el-table
+          ref="multipleTable"
+          :data="deviceTableData"
+          stripe
+          tooltip-effect="dark"
+          style="width: 100%"
+          height="calc(100% - 40px)"
+          @selection-change="handleSelectionChange"
+          @row-click="handleRowClick"
+          v-loading="loading"
+        >
+          <!-- <el-table-column type="index" width="55"> </el-table-column>
+          <el-table-column type="selection" width="55"> </el-table-column> -->
+          <template slot="empty">
+            <el-empty :image-size="160" description="暂无数据"></el-empty>
+          </template>
+          <el-table-column label="名称" show-overflow-tooltip>
+            <template slot-scope="scope">{{ scope.row.name }}</template>
+          </el-table-column>
+          <!-- <el-table-column label="时间表类型" show-overflow-tooltip>
+            <template>时间表类型</template>
+          </el-table-column> -->
+          <el-table-column label="时间表规则">
+            <template slot-scope="scope">
+              <p
+                class="timeGz"
+                v-for="(val, index) in scope.row.list"
+                :key="index"
+              >
+                <span>
+                  {{
+                    val.startTime.substring(0, val.startTime.lastIndexOf(":"))
+                  }}</span
+                >
+                ~
+                <span>{{
+                  val.endTime.substring(0, val.endTime.lastIndexOf(":"))
+                }}</span>
+                间隔：<b>{{ val.span }}分钟</b>
+              </p>
+              <!-- <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>
+                  <span>时间间隔（分）:</span>
+                  <el-tag>{{ item.span }}</el-tag>
+                </li>
+              </ul> -->
+            </template>
+          </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
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pageNation">
+          <el-pagination
+            @current-change="handleCurrentChange"
+            @size-change="handleSizeChange"
+            :current-page="page"
+            :page-size="pageSize"
+            layout="sizes, prev, pager, next, jumper,total"
+            :total="total"
+            background
+          >
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+    <!-- 新增时间表 -->
+    <adddeviceDialog :title="title" ref="adddeviceDialogref"></adddeviceDialog>
+    <!-- 设置时间表 -->
+    <setdevice ref="setdeviceDialogref"></setdevice>
+  </div>
+</template>
+<script>
+import {
+  getScheduleRulelListJoggle,
+  deleteScheduleRulel,
+} from "@/utils/api/index";
+import adddeviceDialog from "./components/adddeviceDialog.vue";
+import setdevice from "./components/setdevice.vue";
+
+export default {
+  components: {
+    adddeviceDialog,
+    setdevice,
+  },
+  data() {
+    return {
+      title: "", //弹窗标题
+      deviceTableData: [],
+      //multipleSelection: [], //获取当前选中
+      page: 1, // 当前页数
+      pageSize: 20, // 每页数量
+      total: 0, //总条数
+      loading: true,
+    };
+  },
+  created() {
+    this.deviceList();
+  },
+  methods: {
+    //获取拍照时间表数据列表
+    deviceList() {
+      this.loading = true;
+      getScheduleRulelListJoggle({
+        pageindex: this.page,
+        pagesize: this.pageSize,
+      })
+        .then((res) => {
+          this.deviceTableData = res.data.list;
+          this.total = res.data.total;
+          this.loading = false;
+        })
+        .catch((err) => {});
+    },
+    //点击行选中
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+    //获取选中的行
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+    // 新建
+    handleAdddevice() {
+      this.title = "新增";
+      this.$refs.adddeviceDialogref.display();
+      this.$refs.adddeviceDialogref.getdataform(null);
+    },
+
+    //修改
+    handleResive(data) {
+      this.title = "修改";
+      this.$refs.adddeviceDialogref.display();
+      this.$refs.adddeviceDialogref.getdataform(data);
+    },
+
+    //设置
+    handleSet(data) {
+      this.$refs.setdeviceDialogref.display();
+      this.$refs.setdeviceDialogref.getdataform(data);
+    },
+
+    //删除数据
+    handleDelete(data) {
+      let deleteArr = [];
+      deleteArr.push({
+        id: data.id,
+      });
+      this.$confirm("确定要删除记录吗,同时删除关联关系?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteScheduleRulel({ list: deleteArr }).then((res) => {
+            this.deviceList(); //刷新
+          });
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            type: "success",
+            message: "删除成功!",
+          });
+        })
+        .catch(() => {
+          this.$message({
+            duration: 1500,
+            showClose: true,
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    //点击分页
+    handleCurrentChange(val) {
+      this.page = val;
+      this.deviceList();
+    },
+    //每页条数
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.deviceList();
+    },
+  },
+};
+</script>
+<style lang="less">
+.deviceInformation {
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
+  background: @color-white;
+
+  .deviceBox {
+    border: 1px solid #dddddd;
+    height: calc(100% - 24px);
+    padding: 12px;
+    border-radius: 4px;
+  }
+  .deviceBtnGroup {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .deviceTable {
+    margin-top: 16px;
+    height: calc(100% - 48px);
+    //background: #fcc;
+    .rulesBox {
+      display: flex;
+      flex-direction: row;
+      li {
+        list-style: none;
+        margin-right: 24px;
+        line-height: 24px;
+        span {
+          margin-right: 4px;
+        }
+        .el-tag--small {
+          height: 16px;
+          padding: 0 8px;
+          line-height: 16px;
+        }
+      }
+    }
+    .timeGz {
+      line-height: 32px;
+      b {
+        font-weight: normal;
+        color: @color-primary;
+      }
+      span {
+        margin: 0px 8px;
+      }
+    }
+  }
+}
+</style>
diff --git a/vue.config.js b/vue.config.js
index 2d81f4c..040028d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,11 +29,11 @@ module.exports = defineConfig({
     proxy: {
       "/api": {
         //表示拦截以/api开头的请求路径
-        //target: "http://47.96.238.157:8093", //阿里云服务器环境
-        target: "http://180.166.218.222:40080", //dell
+        target: "http://47.96.238.157:8093", //阿里云服务器环境
+        //target: "http://180.166.218.222:40080", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
-          "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
+          "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
         },
       },
     },