From c2172954249e14ccfb87d7591c636a677c745684 Mon Sep 17 00:00:00 2001
From: liuyi <l_cheny@foxmail.com>
Date: Tue, 18 Apr 2023 17:26:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=A1=A8=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             |   5 -
 package.json                                  |   1 -
 .../components/adddeviceDialog.vue            | 166 ++++++++++++++++--
 src/views/devicePhotoSchedule/index.vue       |  49 +++++-
 src/views/stritl/chartFiles/mapChart.vue      |   1 -
 5 files changed, 200 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0a65a7a..ed9ee76 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,11 +15,6 @@
         "js-message": "1.0.7"
       }
     },
-    "@amap/amap-jsapi-loader": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz",
-      "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw=="
-    },
     "@ampproject/remapping": {
       "version": "2.2.0",
       "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.0.tgz",
diff --git a/package.json b/package.json
index 25ceb00..0ded87e 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,6 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
     "axios": "^1.3.4",
     "core-js": "^3.8.3",
     "echarts": "^5.4.2",
diff --git a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
index afeaa72..f111921 100644
--- a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
+++ b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
@@ -1,31 +1,175 @@
 <template>
   <el-dialog
-    class="adddeviceDialog"
-    :title="deviceDialogTitle"
-    :visible.sync="deviceDialog"
+    class="addLineDialog"
+    :title="lineDialogTitle"
+    :visible.sync="lineDialog"
     width="420px"
   >
-    <p>内容</p>
+    <el-form
+      label-position="left"
+      ref="formLineInfo"
+      label-width="100px"
+      :rules="rules"
+      :model="lineForm"
+    >
+      <el-form-item label="名称：" prop="name">
+        <el-input
+          v-model="lineForm.name"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="开始时间：" prop="startTime">
+        <el-input
+          v-model.number="lineForm.startTime"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="结束时间：" prop="endTime">
+        <el-input
+          v-model.number="lineForm.endTime"
+          autocomplete="off"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="间隔：" prop="span">
+        <el-input v-model="lineForm.span" autocomplete="off"></el-input>
+      </el-form-item>
+      <el-form-item label="备注：" prop="remark">
+        <el-input v-model="lineForm.remark" autocomplete="off"></el-input>
+      </el-form-item>
+    </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button @click="closeDialog()">取 消</el-button>
+      <el-button @click="closeDialog(0)">取 消</el-button>
       <el-button type="primary" @click="submitForm()">确 定</el-button>
     </div>
   </el-dialog>
 </template>
 <script>
+import { addLineJoggle, updateLineJoggle } from "@/utils/api/index";
 export default {
-  props: {},
+  props: {
+    lineDialog: {
+      type: Boolean,
+    },
+    lineDialogTitle: {
+      type: String,
+      default: "新增",
+    },
+    formItem: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+  },
 
   data() {
-    return {};
+    return {
+      lineForm: {},
+      rules: {
+        name: [
+          { required: true, message: "请输入公司名称", trigger: "blur" },
+        ],
+        startTime: [
+          { required: true, message: "请选择DY等级", trigger: "blur" },
+          { type: "number", message: "DY等级数字值" },
+        ],
+        endTime: [
+          { required: true, message: "请选择DY等级", trigger: "blur" },
+          { type: "number", message: "DY等级数字值" },
+        ],
+        span: [
+          {
+            required: true,
+            message: "请输入线路名称",
+            trigger: "blur",
+          },
+        ],
+        remark: [
+          {
+            required: true,
+            message: "请输入线路名称",
+            trigger: "blur",
+          },
+        ],
+      },
+      //表单数组，对象
+      formArr: [],
+    };
   },
   methods: {
     // 保存确定操作
-    submitForm() {},
+    submitForm() {
+      this.$refs.formLineInfo.validate((valid) => {
+        if (valid) {
+          let formObj = {
+            name: this.lineForm.name,
+            startTime: this.lineForm.startTime,
+            endTime: this.lineForm.endTime,
+            span: this.lineForm.span,
+            remark: this.lineForm.remark
+          };
+          this.formArr.push(formObj);
+          console.log(this.formArr);
+
+          // 走保存请求
+          if (this.lineDialogTitle == "新增") {
+            addLineJoggle({ list: this.formArr })
+              .then((res) => {
+                console.log(res);
+                this.$emit("lineDialogClose", 1); //关闭弹窗
+                this.$message.success("添加成功");
+              })
+              .catch((err) => {
+                console.log(err); //代码错误、请求失败捕获
+                this.$message.error("添加失败");
+              });
+          } else if (this.lineDialogTitle == "修改") {
+            let changeformObj = {
+              name: this.lineForm.name,
+              startTime: this.lineForm.startTime,
+              endTime: this.lineForm.endTime,
+              span: this.lineForm.span,
+              remark: this.lineForm.remark
+            };
+            updateLineJoggle(changeformObj)
+              .then((res) => {
+                console.log(res);
+                this.$emit("lineDialogClose", 1); //关闭弹窗
+                this.$message.success("修改成功");
+              })
+              .catch((err) => {
+                console.log(err); //代码错误、请求失败捕获
+                this.$message.error("修改失败");
+              });
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
     //取消关闭弹窗
-    closeDialog(flag) {},
+    closeDialog(flag) {
+      this.$refs.formLineInfo.resetFields();
+      this.$emit("lineDialogClose", flag);
+    },
+  },
+  mounted() {
+    console.log("打印传过来的对象", this.formItem);
+    console.log("打印传过来的对象", this.formItem.bsIdentifier);
+    this.lineForm = JSON.parse(JSON.stringify(this.formItem));
+  },
+  watch: {
+    formItem: {
+      handler(newVal, oldVal) {
+        // 调用函数
+        this.$nextTick(() => {
+          this.lineForm = JSON.parse(JSON.stringify(this.formItem));
+        });
+      },
+      immediate: true,
+      deep: true,
+    },
   },
-  mounted() {},
-  watch: {},
 };
 </script>
diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue
index 0fcf3e3..62f664a 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -71,13 +71,21 @@
       </div>
     </div>
     <!-- 新增线路 -->
+    <adddeviceDialog
+      :lineDialog="deviceDialog"
+      :lineDialogTitle="deviceDialogTitle"
+      :formItem="formdeviceInfo"
+    ></adddeviceDialog>
   </div>
 </template>
 <script>
-import { getScheduleRulelListJoggle } from "@/utils/api/index";
+import { getScheduleRulelListJoggle,deleteLineJoggle } from "@/utils/api/index";
+import adddeviceDialog from "./components/adddeviceDialog.vue";
 
 export default {
-  components: {},
+  components: {
+    adddeviceDialog
+  },
   data() {
     return {
       deviceDialogTitle: "", //弹窗标题
@@ -120,10 +128,43 @@ export default {
     },
 
     //handleResive 修改线路数据
-    handleResive(data) {},
+    handleResive(data) {
+      console.log(data);
+      this.deviceDialogTitle = "修改";
+      this.formdeviceInfo = Object.assign({}, data);
+      this.deviceDialog = true;
+    },
 
     //删除数据
-    handleDelete() {},
+    handleDelete(data) {
+      console.log(data);
+      this.deleteArr.push({
+        id: data.id,
+      });
+      console.log(this.deleteArr);
+      this.$confirm("确定要删除记录吗,同时删除关联关系?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          // 行设置向后台请求删除数据
+          deleteLineJoggle({ list: this.deleteArr }).then((res) => {
+            console.log(res);
+            this.lineList(); //刷新
+          });
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
     //点击分页
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
diff --git a/src/views/stritl/chartFiles/mapChart.vue b/src/views/stritl/chartFiles/mapChart.vue
index 878480a..32cc98c 100644
--- a/src/views/stritl/chartFiles/mapChart.vue
+++ b/src/views/stritl/chartFiles/mapChart.vue
@@ -2,7 +2,6 @@
     <div id="container"></div>
 </template>
 <script>
-import AMapLoader from '@amap/amap-jsapi-loader';
 
 export default {
     data() {

From 2ff5a0e85b18911f305828882b8dd14129f0fb39 Mon Sep 17 00:00:00 2001
From: liuyi <l_cheny@foxmail.com>
Date: Wed, 19 Apr 2023 17:08:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8B=8D=E7=85=A7=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/api/index.js                        |  24 +++
 .../components/adddeviceDialog.vue            | 165 +++++++-----------
 src/views/devicePhotoSchedule/index.vue       |  73 +++-----
 3 files changed, 112 insertions(+), 150 deletions(-)

diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index e5b150c..07d75fe 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -149,6 +149,30 @@ export function getScheduleRulelListJoggle(data) {
     data,
   });
 }
+//2.新增任务规则
+export function addScheduleRulel(data) {
+  return request({
+    url: "/test/addSchelduleRuleList",
+    method: "post",
+    data,
+  });
+}
+//3.删除任务规则
+export function deleteScheduleRulel(data) {
+  return request({
+    url: "/test/deleteSchelduleRule",
+    method: "post",
+    data,
+  });
+}
+//4.修改任务规则
+export function updateScheduleRulel(data) {
+  return request({
+    url: "/test/updateSchelduleRule",
+    method: "post",
+    data,
+  });
+}
 
 //线路信息管理接口数据
 //1.线路列表信息
diff --git a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
index f111921..7dffdc4 100644
--- a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
+++ b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
@@ -1,144 +1,111 @@
 <template>
   <el-dialog
     class="addLineDialog"
-    :title="lineDialogTitle"
-    :visible.sync="lineDialog"
-    width="420px"
+    :title="title"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="40%"
   >
     <el-form
       label-position="left"
-      ref="formLineInfo"
+      ref="formInfo"
       label-width="100px"
       :rules="rules"
-      :model="lineForm"
+      :model="formdata"
     >
       <el-form-item label="名称：" prop="name">
         <el-input
-          v-model="lineForm.name"
+          v-model="formdata.name"
           autocomplete="off"
         ></el-input>
       </el-form-item>
-      <el-form-item label="开始时间：" prop="startTime">
-        <el-input
-          v-model.number="lineForm.startTime"
-          autocomplete="off"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="结束时间：" prop="endTime">
-        <el-input
-          v-model.number="lineForm.endTime"
-          autocomplete="off"
-        ></el-input>
+      <el-form-item label="时间：" prop="time">
+        <el-time-picker
+          is-range
+          v-model="formdata.time"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          value-format="HH:mm:ss">
+        </el-time-picker>
       </el-form-item>
       <el-form-item label="间隔：" prop="span">
-        <el-input v-model="lineForm.span" autocomplete="off"></el-input>
+        <!-- <el-input v-model="formdata.span" autocomplete="off" type="number"></el-input> -->
+        <el-input-number v-model="formdata.span"  :min="1" ></el-input-number>
       </el-form-item>
       <el-form-item label="备注：" prop="remark">
-        <el-input v-model="lineForm.remark" autocomplete="off"></el-input>
+        <el-input v-model="formdata.remark" autocomplete="off"></el-input>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button @click="closeDialog(0)">取 消</el-button>
+      <el-button @click="isShow = false">取 消</el-button>
       <el-button type="primary" @click="submitForm()">确 定</el-button>
     </div>
   </el-dialog>
 </template>
 <script>
-import { addLineJoggle, updateLineJoggle } from "@/utils/api/index";
+import { addScheduleRulel, updateScheduleRulel } from "@/utils/api/index";
 export default {
   props: {
-    lineDialog: {
-      type: Boolean,
-    },
-    lineDialogTitle: {
-      type: String,
-      default: "新增",
-    },
-    formItem: {
-      type: Object,
-      default: function () {
-        return {};
-      },
-    },
+    title:String
   },
-
   data() {
     return {
-      lineForm: {},
+      isShow: false,
+      formdata: {},
       rules: {
         name: [
-          { required: true, message: "请输入公司名称", trigger: "blur" },
+          { required: true, message: "请输入名称", trigger: "blur" },
         ],
-        startTime: [
-          { required: true, message: "请选择DY等级", trigger: "blur" },
-          { type: "number", message: "DY等级数字值" },
-        ],
-        endTime: [
-          { required: true, message: "请选择DY等级", trigger: "blur" },
-          { type: "number", message: "DY等级数字值" },
+        time: [
+          { required: true, message: "请选择时间", trigger: "blur" },
         ],
         span: [
-          {
-            required: true,
-            message: "请输入线路名称",
-            trigger: "blur",
-          },
+          { required: true, message: "请输入间隔", trigger: "blur", },
         ],
         remark: [
-          {
-            required: true,
-            message: "请输入线路名称",
-            trigger: "blur",
-          },
+          { required: true, message: "请输入备注", trigger: "blur", },
         ],
-      },
-      //表单数组，对象
-      formArr: [],
+      }
     };
   },
   methods: {
+    //判断
+    getdataform(val){
+      console.log(val)
+      if (val==null) {
+        return this.formdata = {}
+      } 
+      this.formdata = val
+      this.$set(this.formdata,'time',[val.startTime, val.endTime])
+    },
     // 保存确定操作
     submitForm() {
-      this.$refs.formLineInfo.validate((valid) => {
+      this.$refs.formInfo.validate((valid) => {
         if (valid) {
-          let formObj = {
-            name: this.lineForm.name,
-            startTime: this.lineForm.startTime,
-            endTime: this.lineForm.endTime,
-            span: this.lineForm.span,
-            remark: this.lineForm.remark
-          };
-          this.formArr.push(formObj);
-          console.log(this.formArr);
-
-          // 走保存请求
-          if (this.lineDialogTitle == "新增") {
-            addLineJoggle({ list: this.formArr })
+          this.formdata.startTime=this.formdata.time[0]
+          this.formdata.endTime=this.formdata.time[1]
+          delete this.formdata.time
+          if (this.title == "新增") {
+            let formArr=[]
+            formArr.push(this.formdata)
+            addScheduleRulel({ list: formArr })
               .then((res) => {
-                console.log(res);
-                this.$emit("lineDialogClose", 1); //关闭弹窗
+                this.isShow = false
                 this.$message.success("添加成功");
+                this.$parent.deviceList()
               })
               .catch((err) => {
-                console.log(err); //代码错误、请求失败捕获
                 this.$message.error("添加失败");
               });
-          } else if (this.lineDialogTitle == "修改") {
-            let changeformObj = {
-              name: this.lineForm.name,
-              startTime: this.lineForm.startTime,
-              endTime: this.lineForm.endTime,
-              span: this.lineForm.span,
-              remark: this.lineForm.remark
-            };
-            updateLineJoggle(changeformObj)
+          } else {
+            updateScheduleRulel(this.formdata)
               .then((res) => {
-                console.log(res);
-                this.$emit("lineDialogClose", 1); //关闭弹窗
+                this.isShow = false
                 this.$message.success("修改成功");
+                this.$parent.deviceList()
               })
               .catch((err) => {
-                console.log(err); //代码错误、请求失败捕获
                 this.$message.error("修改失败");
               });
           }
@@ -148,28 +115,16 @@ export default {
         }
       });
     },
-    //取消关闭弹窗
-    closeDialog(flag) {
-      this.$refs.formLineInfo.resetFields();
-      this.$emit("lineDialogClose", flag);
+    display() {
+      this.isShow = true
     },
+    hide() {
+      this.isShow = false
+    }
+
   },
   mounted() {
-    console.log("打印传过来的对象", this.formItem);
-    console.log("打印传过来的对象", this.formItem.bsIdentifier);
-    this.lineForm = JSON.parse(JSON.stringify(this.formItem));
-  },
-  watch: {
-    formItem: {
-      handler(newVal, oldVal) {
-        // 调用函数
-        this.$nextTick(() => {
-          this.lineForm = JSON.parse(JSON.stringify(this.formItem));
-        });
-      },
-      immediate: true,
-      deep: true,
-    },
+    
   },
 };
 </script>
diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue
index 62f664a..52c3c11 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -2,7 +2,7 @@
   <div class="deviceInformation">
     <div class="deviceBox">
       <div class="deviceBtnGroup">
-        <el-button type="primary" icon="el-icon-plus" @click="handleAdddevice()"
+        <el-button type="primary" icon="el-icon-plus" @click.native.stop="handleAdddevice()"
           >新增</el-button
         >
       </div>
@@ -71,15 +71,11 @@
       </div>
     </div>
     <!-- 新增线路 -->
-    <adddeviceDialog
-      :lineDialog="deviceDialog"
-      :lineDialogTitle="deviceDialogTitle"
-      :formItem="formdeviceInfo"
-    ></adddeviceDialog>
+    <adddeviceDialog  :title="title" ref="adddeviceDialogref" ></adddeviceDialog>
   </div>
 </template>
 <script>
-import { getScheduleRulelListJoggle,deleteLineJoggle } from "@/utils/api/index";
+import { getScheduleRulelListJoggle,deleteScheduleRulel } from "@/utils/api/index";
 import adddeviceDialog from "./components/adddeviceDialog.vue";
 
 export default {
@@ -88,29 +84,29 @@ export default {
   },
   data() {
     return {
-      deviceDialogTitle: "", //弹窗标题
-      deviceDialog: false,
-      formdeviceInfo: {}, //弹窗传值
+      title: "", //弹窗标题
       deviceTableData: [],
       //multipleSelection: [], //获取当前选中
-      //删除数组
-      deleteArr: [],
       page: 1, // 当前页数
-      pageSize: 20, // 每页数量
+      pageSize: 10, // 每页数量
       total: 0, //总条数
     };
   },
+  created() {
+    this.deviceList();
+  },
   methods: {
     //获取线路列表数据
     deviceList() {
-      getScheduleRulelListJoggle()
+      getScheduleRulelListJoggle({
+        pageindex: this.page,
+        pagesize: this.pageSize
+      })
         .then((res) => {
-          console.log(res);
           this.deviceTableData = res.data.list;
+          this.total = res.data.total
         })
-        .catch((err) => {
-          console.log(err); //代码错误、请求失败捕获
-        });
+        .catch((err) => {});
     },
     //点击行选中
     handleRowClick(row, column, event) {
@@ -123,58 +119,45 @@ export default {
 
     // 新建弹窗
     handleAdddevice() {
-      this.deviceDialog = true;
-      this.deviceDialogTitle = "新增";
+      this.title = "新增";
+      this.$refs.adddeviceDialogref.display()
+      this.$refs.adddeviceDialogref.getdataform(null)
     },
 
     //handleResive 修改线路数据
     handleResive(data) {
-      console.log(data);
-      this.deviceDialogTitle = "修改";
-      this.formdeviceInfo = Object.assign({}, data);
-      this.deviceDialog = true;
+      this.title = "修改";
+      this.$refs.adddeviceDialogref.display()
+      this.$refs.adddeviceDialogref.getdataform(data)
     },
 
     //删除数据
     handleDelete(data) {
-      console.log(data);
-      this.deleteArr.push({
+      let deleteArr=[]
+      deleteArr.push({
         id: data.id,
       });
-      console.log(this.deleteArr);
       this.$confirm("确定要删除记录吗,同时删除关联关系?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          // 行设置向后台请求删除数据
-          deleteLineJoggle({ list: this.deleteArr }).then((res) => {
-            console.log(res);
-            this.lineList(); //刷新
-          });
-          this.$message({
-            type: "success",
-            message: "删除成功!",
+          deleteScheduleRulel({ list: deleteArr }).then((res) => {
+            this.deviceList(); //刷新
           });
+          this.$message({ type: "success", message: "删除成功!" });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
+          this.$message({ type: "info",  message: "已取消删除" });
         });
     },
     //点击分页
     handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
       this.page = val;
-      //this.getTableList();
+      this.deviceList();
     },
-  },
-  created() {
-    this.deviceList();
-  },
+  }
 };
 </script>
 <style lang="less">