巡检计划和班组人员接口对接

src/api/partol.js

@@ -1,85 +1,55 @@
 import request from '@/utils/request'
 
 
-// export default {
+export default {
+
+    // 分页条件查询分类列表 
+    getList(query, pageNo = 1, pageSize = 20) {
+        return request({ // Promise
+            url: '/electronic_patrol/getElectronicPatrolList',
+            method: 'post',
+            data: {
+                ...query, //查询条件
+                pageNo, //当前页
+                pageSize //每页多少条
+            }
+        })
+    },
+
+    //新增
+    add(data) {
+        return request({
+            url: '/electronic_patrol/appendElectronicPatrol',
+            method: 'post',
+            data: data
+        })
+    },
+
+    // 更新
+    update(data) {
+        return request({
+            url: '/electronic_patrol/updateElectronicPatrol',
+            method: 'post',
+            data: data
+        })
+    },
+
+    // 删除
+    deleteById(data) {
+        return request({
+            url: `/electronic_patrol/deleteElectronicPatrol`,
+            method: 'post',
+            data: data
+        })
+    },
+
+    // 设备列表
+    getDeviceList(data) {
+        return request({
+            url: '/device/getDeviceExportList',
+            method: 'post',
+        })
+    },
 
-//     // 分页条件查询分类列表 
-//     getList(query, pageNo = 1, pageSize = 20) {
-//         return request({ // Promise
-//             // url: 'clz/v1/get_content',
-//             // method: 'get',
-//             url: '/electronic_patrol/getElectronicPatrolList',
-//             method: 'post',
-//             data: {
-//                 ...query, //查询条件
-//                 pageNo, //当前页
-//                 pageSize //每页多少条
-//             }
-//         })
-//     },
 
-//     //新增
-//     add(data) {
-//         return request({
-//             url: '/electronic_patrol/appendElectronicPatrol',
-//             method: 'post',
-//             data: data
-//         })
-//     },
-
-//     // 更新
-//     update(data) {
-//         return request({
-//             url: '/electronic_patrol/updateElectronicPatrol',
-//             method: 'post',
-//             data: data
-//         })
-//     },
-
-
-// }
-
-export function getList(query, pageNo = 1, pageSize = 20) {
-    return request({
-        // url: 'clz/v1/get_content',
-        // method: 'get',
-        url: '/electronic_patrol/getElectronicPatrolList',
-        method: 'post',
-
-        data: {
-
-            ...query, //查询条件
-            pageNo, //当前页
-            pageSize //每页多少条
-        }
-    })
-}
-export function add(data) {
-    return request({
-        url: '/electronic_patrol/appendElectronicPatrol',
-        method: 'post',
-        data: data
-    })
-}
-
-
-export function update(data) {
-    return request({
-        url: '/electronic_patrol/updateElectronicPatrol',
-        method: 'post',
-        data: data
-    })
-}
-
-
-export function deleteById(id) {
-
-    return request({
-        url: `/electronic_patrol/deleteElectronicPatrol`,
-        method: 'post',
-        data: {
-            id
-        }
-
-    })
 }

src/api/partolplan.js

@@ -18,22 +18,34 @@ export default {
     },
 
     //新增
-    // add(data) {
-    //     return request({
-    //         url: '/electronic_patrol/appendElectronicPatrol',
-    //         method: 'post',
-    //         data: data
-    //     })
-    // },
+    add(data) {
+        return request({
+            url: '/plan/appendPlan',
+            method: 'post',
+            data: data
+        })
+    },
 
     // 更新
-    // update(data) {
-    //     return request({
-    //         url: '/electronic_patrol/updateElectronicPatrol',
-    //         method: 'post',
-    //         data: data
-    //     })
-    // },
+    update(data) {
+        return request({
+            url: '/route/updateRoute',
+            method: 'post',
+            data: data
+        })
+    },
+
+
+    deleteById(data) {
+
+        return request({
+            url: `/route/deleteRoute`,
+            method: 'post',
+            data: data
+
+
+        })
+    }
 
 
 }

src/api/team.js

@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+
+export default {
+
+    // 分页条件查询分类列表 
+    getList(query, pageNo = 1, pageSize = 20) {
+        return request({ // Promise
+            url: '/team/getTeamList',
+            method: 'post',
+            data: {
+                ...query, //查询条件
+                pageNo, //当前页
+                pageSize //每页多少条
+            }
+        })
+    },
+
+    //新增
+    add(data) {
+        return request({
+            url: '/team/appendTeam',
+            method: 'post',
+            data: data
+        })
+    },
+
+    // 更新
+    update(data) {
+        return request({
+            url: '/team/updateTeam',
+            method: 'post',
+            data: data
+        })
+    },
+
+    // 删除
+    deleteById(data) {
+        return request({
+            url: `/team/deleteTeam`,
+            method: 'post',
+            data: data
+        })
+    },
+
+    // 团队人员下拉
+    getPersonList(data) {
+        return request({
+            url: '/team/getPersonnelbox',
+            method: 'post',
+        })
+    },
+
+
+}

src/router/index.js

@@ -197,6 +197,13 @@ export const constantRoutes = [{
                 name: 'Menu3',
                 meta: { title: '班组人员', icon: 'team' }
             },
+            // {
+            //     path: 'team2',
+            //     component: () =>
+            //         import ('@/views/patrol/team2/index'),
+            //     name: 'Menu3',
+            //     meta: { title: '班组人员2', icon: 'team' }
+            // },
             {
                 path: 'elect-partol',
                 component: () =>

src/utils/index.js

@@ -117,50 +117,7 @@ export function param2Obj(url) {
 }
 
 
-// 缩放引入
-export function flexible(window, document) {
-    var docEl = document.documentElement;
-    var dpr = window.devicePixelRatio || 1;
-
-    // adjust body font size
-    function setBodyFontSize() {
-        if (document.body) {
-            document.body.style.fontSize = 12 * dpr + "px";
-        } else {
-            document.addEventListener("DOMContentLoaded", setBodyFontSize);
-        }
-    }
-    setBodyFontSize();
 
-    // set 1rem = viewWidth / 10
-    function setRemUnit() {
-        var rem = docEl.clientWidth / 24;
-        docEl.style.fontSize = rem + "px";
-    }
-
-    setRemUnit();
-
-    // reset rem unit on page resize
-    window.addEventListener("resize", setRemUnit);
-    window.addEventListener("pageshow", function(e) {
-        if (e.persisted) {
-            setRemUnit();
-        }
-    });
-
-    // detect 0.5px supports
-    if (dpr >= 2) {
-        var fakeBody = document.createElement("body");
-        var testElement = document.createElement("div");
-        testElement.style.border = ".5px solid transparent";
-        fakeBody.appendChild(testElement);
-        docEl.appendChild(fakeBody);
-        if (testElement.offsetHeight === 1) {
-            docEl.classList.add("hairlines");
-        }
-        docEl.removeChild(fakeBody);
-    }
-}
 
 
 /**
@@ -205,8 +162,9 @@ export function debounce(func, wait, immediate) {
 }
 
 
-//时间格式化2021-01-21T05:53:00.000+0000
+//时间格式化 2021-01-21T05:53:00.000+0000
 export function renderTime(date) {
+
     var dateee = new Date(date).toJSON();
     return new Date(+new Date(dateee) + 8 * 3600 * 1000)
         .toISOString()

src/views/patrol/elect-partol/deviceList.vue

@@ -0,0 +1,28 @@
+<template>
+<!-- <div>{{deviceList}}</div> -->
+  <el-select
+    v-model="query.deviceName"
+    placeholder=""
+    style="width: 160px"
+    clearable
+  >
+    <el-option
+      v-for="item in deviceList"
+      :key="item.deviceCode"
+      :label="item.deviceName"
+      :value="item.deviceCode"
+    >
+    </el-option>
+  </el-select>
+</template>
+<script>
+export default {
+  name: "deviceList",
+  props: ["deviceList",'query'],
+
+  data() {
+    return {};
+  },
+  methods: {},
+};
+</script>

src/views/patrol/elect-partol/edit.vue

@@ -48,17 +48,6 @@
               prop="startTime"
             >
 
-             <!-- <el-time-picker
-                is-range
-                v-model="formData.connectTime"
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                placeholder="选择时间范围"
-              >
-              </el-time-picker> -->
-
-              
               <el-time-select
                 placeholder="开始时间"
                 v-model="formData.startTime"
@@ -70,23 +59,19 @@
                 }"
               >
               </el-time-select>
-
-             
             </el-form-item>
             <el-form-item
               label="巡更结束时间:"
               v-model="formData.endTime"
               :label-width="formLabelWidth"
               prop="endTime"
+              key="endTime"
             >
               <el-time-select
                 placeholder="结束时间"
                 v-model="formData.endTime"
                 style="width: 100%"
                 :picker-options="{
-                  start: '08:30',
-                  step: '00:15',
-                  end: '18:30',
                   minTime: formData.startTime,
                 }"
               >
@@ -101,7 +86,7 @@
               :label-width="formLabelWidth"
             >
               <el-checkbox-group
-                v-model="formData2.patrolPlanCycle"
+                v-model="formData.patrolPlanCycle"
                 style="width: 100%"
               >
                 <el-checkbox
@@ -163,10 +148,10 @@
   </el-dialog>
 </template>
 <script>
-import { add } from "@/api/partol";
+import api from "@/api/partol";
 
-//import api from "@/api/partol";
 
+//巡检周期数据
 const cycleOptions = [
   "星期一",
   "星期二",
@@ -177,6 +162,7 @@ const cycleOptions = [
   "星期日",
 ];
 
+//设备下拉数据
 const deviceData = [
   {
     deviceCode: "4689975698772669995465611",
@@ -192,6 +178,7 @@ const deviceData = [
   },
 ];
 
+
 export default {
   name: "edit",
   props: {
@@ -214,30 +201,29 @@ export default {
   },
   data() {
     return {
-      formData2: {
-        // patrolPlanCycle: ["星期五"],
-
-           patrolPlanCycle:this.formData.patrolPlanCycle ? this.formData.patrolPlanCycle : []
-      },
 
       deviceData,
+      multipleSelection: [],
+      formLabelWidth: "120px",
+      cycles: cycleOptions,
+
       //校验
       rules: {
-        deviceName: [
+        deviceCode: [
           { required: true, message: "请选择设备名称", trigger: "change" },
         ],
         patrolPlanName: [
           { required: true, message: "请输入巡更计划名称", trigger: "blur" },
         ],
-        // patrolPlanCycle: [
-        //   { required: true, message: "请选择巡更周期", trigger: "change" },
-        // ],
-        // startTime: [
-        //   { required: true, message: "请选择开始时间", trigger: "change" },
-        // ],
-        // endTime: [
-        //   { required: true, message: "请输入结束时间", trigger: "change" },
-        // ],
+        patrolPlanCycle: [
+          { required: true, message: "请选择巡更周期", trigger: "change" },
+        ],
+        startTime: [
+          { required: true, message: "请选择开始时间", trigger: "change" },
+        ],
+        endTime: [
+          { required: true, message: "请输入结束时间", trigger: "change" },
+        ],
         startDate: [
           { required: true, message: "请选择开始日期", trigger: "change" },
         ],
@@ -246,11 +232,6 @@ export default {
         ],
       },
 
-      multipleSelection: [],
-
-      formLabelWidth: "120px",
-
-      cycles: cycleOptions,
 
       // 时间插件
       pickerOptions1: {
@@ -278,40 +259,9 @@ export default {
         },
       },
 
-      pickerOptions3: {
-        disabledDate: (time) => {
-          if (this.formData.endDate) {
-            return (
-              time.getTime() < Date.now() - 8.64e7 ||
-              time.getTime() > new Date(this.formData.endDate).getTime()
-            );
-          } else {
-            return time.getTime() < Date.now() - 8.64e7;
-          }
-        },
-      },
-      pickerOptions4: {
-        disabledDate: (time) => {
-          if (this.formData.startDate) {
-            return (
-              time.getTime() < Date.now() - 8.64e7 ||
-              time.getTime() < new Date(this.formData.startDate).getTime()
-            );
-          } else {
-            return time.getTime() < Date.now() - 8.64e7;
-          }
-        },
-      },
     };
   },
   methods: {
-    renderTime(date) {
-      var dateee = new Date(date).toJSON();
-      return new Date(+new Date(dateee) + 8 * 3600 * 1000)
-        .toISOString()
-        .replace(/T/g, " ")
-        .replace(/\.[\d]{3}Z/, "");
-    },
 
     //关闭窗口
     handleClose() {
@@ -323,49 +273,51 @@ export default {
 
     //提交表单数据
     submitForm(formName) {
-      this.formData.patrolPlanCycle = this.formData2.patrolPlanCycle;
-      //   let startTime = this.renderTime(this.formData.connectTime[0]);
-      //   let endTime = this.renderTime(this.formData.connectTime[1]);
-
-      //   this.formData.startTime = startTime.split(" ")[1];
-      //   this.formData.endTime = endTime.split(" ")[1];
-      //   delete this.formData.connectTime;
 
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          //检验通过，提交表单数据
-
-          console.log(this.formData);
+          
           deviceData.forEach((item, index) => {
             if (item.deviceCode == this.formData.deviceCode) {
               this.formData.deviceName = item.deviceName;
             }
           });
-
           this.formData.patrolPlanCycle = JSON.stringify(
             this.formData.patrolPlanCycle
           );
 
-          add(this.formData).then((response) => {
-            if (response.success) {
-              this.$message({
-                message: "保存成功",
-                type: "success",
-              });
-              this.handleClose();
-            } else {
-              this.$message({
-                message: response.Msg,
-                type: "error",
-              });
-            }
-          });
+          this.submitData()
         } else {
           console.log("error submit!!");
           return false;
         }
       });
     },
+
+    async submitData() {
+      let response = null;
+      if (this.formData.id) {
+        // 编辑
+        response = await api.update(this.formData);
+      } else {
+        // 新增
+        response = await api.add(this.formData);
+      }
+
+      if (response.success) {
+        this.$message({
+          message: "保存成功",
+          type: "success",
+        });
+        // 关闭窗口
+        this.handleClose();
+      } else {
+        this.$message({
+          message: "保存失败",
+          type: "error",
+        });
+      }
+    },
   },
 };
 </script>

src/views/patrol/elect-partol/index.vue

@@ -11,21 +11,10 @@
           ></el-input>
         </div>
         <div class="filter-item">
-          执行设备:
-          <el-select
-            v-model="query.deviceName"
-            placeholder=""
-            style="width: 150px"
-            clearable
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
+          设备名称:
+
+          <device-list :deviceList="deviceList" :query=this.query></device-list>
+
         </div>
 
         <el-button
@@ -90,7 +79,9 @@
 
       <el-table-column label="添加时间" width="200">
         <template slot-scope="{ row }">
-          <span>{{ renderTime(row.creationTime) }}</span>
+         <span>  {{ renderTime(row.creationTime) }}</span>
+         <!-- {{ row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }} -->
+
         </template>
       </el-table-column>
 
@@ -145,133 +136,92 @@
 
 
 <script>
-import { renderTime } from "@/utils";
+import { renderTime,parseTime } from '@/utils'
 
-//aa 1：引入api文件
-import { getList, deleteById } from "@/api/partol";
 
-// import api from "@/api/partol";
+//引入api文件
+import api from "@/api/partol";
 
+//引入局部组件
 import edit from "./edit";
+import deviceList from "./deviceList";
+
+
+
 
 export default {
+  //组件注册
   components: {
     edit,
+    deviceList
   },
   name: "elect-partol",
+
   data() {
     return {
       page: {
         //分页对象
         pageNo: 1,
-        pageSize: 1,
+        pageSize: 4,
         total: 0,
       },
-      // query: {"demo":1}, //查询条件
-      query: {},
+      query: {}, //查询条件
       list: [], //列表数据
 
-      //视频弹框
-      dialogVideoDetailVisible: false,
-
-      dialogFormVisible: false,
-
-      options: [
-        {
-          value: "1",
-          label: "执行设备1",
-        },
-        {
-          value: "2",
-          label: "执行设备2",
-        },
-        {
-          value: "3",
-          label: "执行设备3",
-        },
-      ],
-      value: "",
+      deviceList:[], //设备列表
 
       edit: {
         title: "",
         visible: false,
-        formData: {},
+        formData: {
+          patrolPlanCycle: [],
+        },
       },
+
+      //视频弹框
+      dialogVideoDetailVisible: false,
+
+      multipleSelection: [],
+
+      
     };
   },
 
   created() {
-    //aa 2:钩子里调用查询组件
+    //aa 钩子里调用查询组件
     this.fetchData();
+    this.fetchDeviceData()
   },
 
   methods: {
-    //aa 3请求接口
+    //列表查询
 
     fetchData() {
-      getList(this.query, this.page.pageNo, this.page.pageSize).then(
-        (response) => {
-          console.log(response);
-
+      api
+        .getList(this.query, this.page.pageNo, this.page.pageSize)
+        .then((response) => {
+          console.log("response", response);
           // 列表数据
           this.list = response.pageList;
-          this.page.total = response.totalCount;
-        }
-      );
-    },
-
-
-
-
-    handleDownload() {
-      this.downloadLoading = true;
-      import("@/vendor/Export2Excel").then((excel) => {
-        const tHeader = [
-          "巡更计划名称",
-          "设备名称",
-          "执行开始日期",
-          "执行结束日期",
-          "巡更开始时间",
-          "巡更结束时间",
-          "巡更周期",
-          "添加时间"
-          
-        ];
-        const filterVal = [
-          "deviceName",
-          "patrolPlanName",
-          "startDate",
-          "endDate",
-          "startTime",
-          "endTime",
-          "patrolPlanCycle",
-          "creationTime"
-          
-          
-        ];
-        const data = this.formatJson(filterVal);
-        excel.export_json_to_excel({
-          header: tHeader,
-          data,
-          filename: "table-list",
+          this.page.total = response.totalPages;
         });
-        this.downloadLoading = false;
-      });
     },
-    formatJson(filterVal) {
-      return this.list.map((v) =>
-        filterVal.map((j) => {
-          if (j === "timestamp") {
-            return parseTime(v[j]);
-          } else {
-            return v[j];
-          }
-        })
+    
+  
+    //设备下拉列表查询
+    fetchDeviceData() {
+      api.getDeviceList().then(
+        (response) => {
+          console.log('response2');
+          console.log(response);
+          this.deviceList = response.pageList;
+          // this.page.total = response.totalPages;
+        }
       );
     },
+    
 
-
-    //当页码改变后触发到此方法  val是当前点击到的那个页码
+    //分页  （当页码改变后触发到此方法  val是当前点击到的那个页码）
     handleCurrentChange(val) {
       this.page.pageNo = val;
       this.fetchData();
@@ -279,53 +229,37 @@ export default {
 
     //条件查询
     queryData() {
-      //将页码 变为1，第一页
-      this.page.pageNo = 1;
+      this.page.pageNo = 1;  //将页码 变为1，第一页
       this.fetchData();
     },
 
-    //时间格式化2021-01-21T05:53:00.000+0000
-    renderTime(date) {
-      var dateee = new Date(date).toJSON();
-      return new Date(+new Date(dateee) + 8 * 3600 * 1000)
-        .toISOString()
-        .replace(/T/g, " ")
-        .replace(/\.[\d]{3}Z/, "");
+    //打开新增窗口
+    openAdd() {
+      this.edit.visible = true;
+      this.edit.title = "新增";
     },
 
-  
-
-
+    //关闭窗口 （子组件会触发此事件方法来关闭窗口）
+    remoteClose() {
+      console.log("============");
+      console.log(this.edit.formData);
+      this.edit.formData = {};
+      this.edit.visible = false;
+      this.fetchData();
+    },
 
 
+    //修改
     handleEdit(index, row) {
       this.edit.visible = true;
       this.edit.title = "修改";
-
-      // console.log("demo======");
-      // console.log(row);
-      // this.formData = row
+      row.patrolPlanCycle = row.patrolPlanCycle
+        ? row.patrolPlanCycle.split(",")
+        : [];
       this.edit.formData = row;
-
-      //
-      let startTimeArr = row.startTime.split(":");
-      let endTimeArr = row.endTime.split(":");
-      //  alert(startTimeArr)
-
-      // this.edit.formData.connectTime = [
-      //   new Date(
-      //     2016,
-      //     9,
-      //     10,
-      //     startTimeArr[0],
-      //     startTimeArr[1],
-      //     startTimeArr[2]
-      //   ),
-      //   new Date(2016, 9, 10, endTimeArr[0], endTimeArr[1], endTimeArr[2]),
-      // ];
-
-      // alert(index, row);
     },
+
+    //删除
     handleDelete(id) {
       this.$confirm("确定删除该数据吗?", "删除", {
         confirmButtonText: "确定",
@@ -333,28 +267,28 @@ export default {
         type: "warning",
       })
         .then(() => {
-          //发送删除请求
-          deleteById(this.id).then((response) => {
-            //处理相应结果提示
+
+          // 发送删除请求
+          api.deleteById({ queryJson: id }).then((response) => {
+            // 处理响应结果提示
             this.$message({
               type: response.success ? "success" : "error",
               message: response.Msg,
             });
           });
-
-          //刷新列表数据
+          // 刷新列表数据
           this.fetchData();
 
-          // this.list.splice(index, 1);
         })
         .catch(() => {
           // 不用理会
         });
     },
 
+    //全部删除
     batchDelete() {
       let multData = this.multipleSelection;
-      let tableData = this.tableData;
+      let tableData = this.list;
       let multDataLen = multData.length;
       let tableDataLen = tableData.length;
 
@@ -362,7 +296,7 @@ export default {
         for (let y = 0; y < tableDataLen; y++) {
           if (JSON.stringify(tableData[y]) == JSON.stringify(multData[i])) {
             //判断是否相等，相等就删除
-            this.tableData.splice(y, 1);
+            this.list.splice(y, 1);
             console.log("aa");
           }
         }
@@ -372,17 +306,60 @@ export default {
       this.multipleSelection = val;
     },
 
-    //子组件会触发此事件方法来关闭窗口
-    remoteClose() {
-      this.edit.formData = {};
-      this.edit.visible = false;
-      this.fetchData();
+    //导出功能
+    handleDownload() {
+      this.downloadLoading = true;
+      import("@/vendor/Export2Excel").then((excel) => {
+        const tHeader = [
+          "巡更计划名称",
+          "设备名称",
+          "执行开始日期",
+          "执行结束日期",
+          "巡更开始时间",
+          "巡更结束时间",
+          "巡更周期",
+          "添加时间",
+        ];
+        const filterVal = [
+          "deviceName",
+          "patrolPlanName",
+          "startDate",
+          "endDate",
+          "startTime",
+          "endTime",
+          "patrolPlanCycle",
+          "creationTime",
+        ];
+        const data = this.formatJson(filterVal);
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: "table-list",
+        });
+        this.downloadLoading = false;
+      });
     },
-    //打开新增窗口
-    openAdd() {
-      this.edit.visible = true;
-      this.edit.title = "新增";
+    formatJson(filterVal) {
+      return this.list.map((v) =>
+        filterVal.map((j) => {
+          if (j === "timestamp") {
+            return parseTime(v[j]);
+          } else {
+            return v[j];
+          }
+        })
+      );
     },
+
+    //时间格式化2021-01-21T05:53:00.000+0000
+    // renderTime(date) {
+    //   var dateee = new Date(date).toJSON();
+    //   return new Date(+new Date(dateee) + 8 * 3600 * 1000)
+    //     .toISOString()
+    //     .replace(/T/g, " ")
+    //     .replace(/\.[\d]{3}Z/, "");
+    // },
+
   },
 };
 </script>

src/views/patrol/partol-plan/edit.vue

@@ -1,155 +1,344 @@
 <template>
+  <el-dialog
+    :title="title"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    width="60%"
+  >
+    <el-form
+      :rules="rules"
+      ref="formData"
+      :model="formData"
+      label-position="right"
+      status-icon
+    >
+      <el-row :gutter="10">
+        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12"
+          ><div class="grid-content bg-purple">
+            <el-form-item
+              label="计划名称:"
+              prop="planName"
+              :label-width="formLabelWidth"
+            >
+              <el-input
+                v-model="formData.planName"
+                autocomplete="off"
+              ></el-input>
+            </el-form-item>
 
- <el-dialog title="新增" :visible.sync="dialogFormVisible" width="60%">
-      <el-form :model="form">
-        <el-row :gutter="10">
-          <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12"
-            ><div class="grid-content bg-purple">
-              <el-form-item label="任务名称:" :label-width="formLabelWidth">
-                <el-input v-model="form.name" autocomplete="off"></el-input>
-              </el-form-item>
-
-              <el-form-item label="单位/项目:" :label-width="formLabelWidth">
-                <el-select
-                  v-model="form.region"
-                  placeholder=""
-                  style="width: 100%"
-                >
-                  <el-option label="项目一" value="1"></el-option>
-                  <el-option label="项目二" value="2"></el-option>
-                </el-select>
-              </el-form-item>
-
-              <el-form-item label="执行团队:" :label-width="formLabelWidth">
-                <el-select
-                  v-model="form.region2"
-                  placeholder=""
-                  style="width: 100%"
-                >
-                  <el-option label="团队一" value="3"></el-option>
-                  <el-option label="团队二" value="4"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="巡检开始时间:" :label-width="formLabelWidth">
-                <el-date-picker
-                  style="width: 100%"
-                  v-model="formDaliog.startTime2"
-                  type="datetime"
-                  placeholder="选择日期时间"
-                  align="right"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  :picker-options="pickerOptions3"
-                ></el-date-picker>
-              </el-form-item>
-              <el-form-item label="巡检结束时间:" :label-width="formLabelWidth">
-                <el-date-picker
-                  style="width: 100%"
-                  v-model="formDaliog.endTime2"
-                  type="datetime"
-                  placeholder="选择日期时间"
-                  align="right"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  :picker-options="pickerOptions4"
-                >
-                </el-date-picker>
-              </el-form-item></div
-          ></el-col>
-          <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12"
-            ><div class="grid-content bg-purple">
-              <el-form-item label="周期:" :label-width="formLabelWidth">
+            <el-form-item
+              label="计划路线:"
+              prop="planRoute"
+              :label-width="formLabelWidth"
+            >
+              <el-select
+                v-model="formData.planRoute"
+                placeholder=""
+                style="width: 100%"
+              >
+                <el-option label="路线一" value="1"></el-option>
+                <el-option label="路线二" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item
+              label="执行团队:"
+              prop="planTeam"
+              :label-width="formLabelWidth"
+            >
+              <el-select
+                v-model="formData.planTeam"
+                placeholder=""
+                style="width: 100%"
+              >
+                <el-option label="团队一" value="3"></el-option>
+                <el-option label="团队二" value="4"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item
+              label="巡检开始时间:"
+              :label-width="formLabelWidth"
+              prop="planStartTime"
+            >
+              <el-time-select
+                placeholder="开始时间"
+                v-model="formData.planStartTime"
+                style="width: 100%"
+                :picker-options="{
+                  start: '08:30',
+                  step: '00:15',
+                  end: '18:30',
+                }"
+              >
+              </el-time-select>
+            </el-form-item>
+            <el-form-item
+              label="巡检结束时间:"
+              v-model="formData.planEndTime"
+              :label-width="formLabelWidth"
+              prop="planEndTime"
+              key="planEndTime"
+            >
+              <el-time-select
+                placeholder="结束时间"
+                v-model="formData.planEndTime"
+                style="width: 100%"
+                :picker-options="{
+                  minTime: formData.startTime,
+                }"
+              >
+              </el-time-select>
+            </el-form-item></div
+        ></el-col>
+        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12"
+          ><div class="grid-content bg-purple">
+            <el-form-item
+              label="巡更周期"
+              prop="planCycle"
+              :label-width="formLabelWidth"
+            >
+              <el-checkbox-group
+                v-model="formData.planCycle"
+                style="width: 100%"
+              >
                 <el-checkbox
-                  :indeterminate="isIndeterminate"
-                  v-model="checkAll"
-                  @change="handleCheckAllChange"
-                  >全选</el-checkbox
+                  name="planCycle"
+                  v-for="item in cycles"
+                  :label="item"
+                  :key="item"
+                  >{{ item }}</el-checkbox
                 >
-                <div style="margin: 10px 0"></div>
-                <el-checkbox-group
-                  v-model="checkedCities"
-                  @change="handleCheckedCitiesChange"
-                >
-                  <el-checkbox
-                    v-for="city in cities"
-                    :label="city"
-                    :key="city"
-                    >{{ city }}</el-checkbox
-                  >
-                </el-checkbox-group>
-              </el-form-item>
-
-              <el-form-item
-                label="执行开始日期:"
-                :label-width="formLabelWidth"
-                style="margin-top: 0px"
+              </el-checkbox-group>
+            </el-form-item>
+
+            <el-form-item
+              label="执行开始日期:"
+              prop="planStartDate"
+              :label-width="formLabelWidth"
+              style="margin-top: 0px"
+            >
+              <el-date-picker
+                style="width: 100%"
+                v-model="formData.planStartDate"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                :picker-options="pickerOptions1"
               >
-                <el-date-picker
-                  style="width: 100%"
-                  v-model="formDaliog.startTime"
-                  type="datetime"
-                  placeholder="选择日期时间"
-                  align="right"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  :picker-options="pickerOptions1"
-                >
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item label="执行结束日期:" :label-width="formLabelWidth">
-                <el-date-picker
-                  style="width: 100%"
-                  v-model="formDaliog.endTime"
-                  type="datetime"
-                  placeholder="选择日期时间"
-                  align="right"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  :picker-options="pickerOptions2"
-                >
-                </el-date-picker>
-              </el-form-item></div
-          ></el-col>
-        </el-row>
-
-        <el-table
-          :data="tableData2"
-          stripe
-          border
-          :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-          style="width: 100%"
-          id="out-table"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="40"> </el-table-column>
-
-          <el-table-column prop="order" label="序号" width="50">
-          </el-table-column>
-          <el-table-column prop="cameraName" label="点位名称">
-          </el-table-column>
-          <el-table-column prop="company" label="点位地址"> </el-table-column>
-          <el-table-column label="点位详情">
-            <template slot-scope="scope">
-              <img :src="scope.row.imageUrl" style="width: 25px" />
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button
-          @click="dialogFormVisible = false"
-          style="background: #f6f6f6"
-          >关 闭</el-button
-        >
-        <el-button type="primary" @click="dialogFormVisible = false"
-          >保 存</el-button
-        >
-      </div>
-    </el-dialog>
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item
+              label="执行结束日期:"
+              prop="planEndDate"
+              :label-width="formLabelWidth"
+            >
+              <el-date-picker
+                style="width: 100%"
+                v-model="formData.planEndDate"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                :picker-options="pickerOptions2"
+              >
+              </el-date-picker>
+            </el-form-item></div
+        ></el-col>
+      </el-row>
+
+      <el-table
+        :data="tableData2"
+        stripe
+        border
+        :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
+        style="width: 100%"
+        id="out-table"
+      >
+        <el-table-column type="selection" width="40"> </el-table-column>
 
+        <el-table-column prop="order" label="序号" width="50">
+        </el-table-column>
+        <el-table-column prop="cameraName" label="点位名称"> </el-table-column>
+        <el-table-column prop="company" label="点位地址"> </el-table-column>
+        <el-table-column label="点位详情">
+          <template slot-scope="scope">
+            <img :src="scope.row.imageUrl" style="width: 25px" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button style="background: #f6f6f6">关 闭</el-button>
+      <el-button type="primary" @click="submitForm('formData')"
+        >保 存</el-button
+      >
+    </div>
+  </el-dialog>
 </template>
+
 <script>
+import api from "@/api/partolplan";
+
+//巡检周期数据
+const cycleOptions = [
+  "星期一",
+  "星期二",
+  "星期三",
+  "星期四",
+  "星期五",
+  "星期六",
+  "星期日",
+];
+
+export default {
+  name: "edit",
+  props: {
+    title: {
+      //弹框的标题
+      type: String,
+      default: "",
+    },
+    visible: {
+      //弹框窗口，true弹出
+      type: Boolean,
+      default: false,
+    },
+    remoteClose: Function, //用于关闭窗口
+    formData: {
+      //提交表单数据
+      type: Object,
+      default: {},
+    },
+  },
+  data() {
+    return {
+    
+      formLabelWidth: "120px",
+      cycles: cycleOptions,
+
+      tableData2: [
+        {
+          order: "1",
+          cameraName: "维保测试点位",
+          company: "上海青浦区徐泾镇徐乐路208号",
+          imageUrl: require("@/assets/img.png"),
+        },
+        {
+          order: "2",
+          cameraName: "维保测试点位",
+          company: "测试地址",
+          imageUrl: require("@/assets/img.png"),
+        },
+      ],
+
+      //校验
+      rules: {
+        planName: [
+          { required: true, message: "请输入巡检计划名称", trigger: "change" },
+        ],
+        planRoute: [
+          { required: true, message: "请输入巡检计划路线", trigger: "blur" },
+        ],
+        planTeam: [
+          { required: true, message: "请输入执行团队", trigger: "blur" },
+        ],
+        planCycle: [
+          { required: true, message: "请选择巡更周期", trigger: "change" },
+        ],
+        planStartTime: [
+          { required: true, message: "请选择开始时间", trigger: "change" },
+        ],
+        planEndTime: [
+          { required: true, message: "请输入结束时间", trigger: "change" },
+        ],
+        planStartDate: [
+          { required: true, message: "请选择开始日期", trigger: "change" },
+        ],
+        planEndDate: [
+          { required: true, message: "请输入结束日期", trigger: "change" },
+        ],
+      },
+
+      // 时间插件
+      pickerOptions1: {
+        disabledDate: (time) => {
+          if (this.formData.endTime) {
+            return (
+              time.getTime() < Date.now() - 8.64e7 ||
+              time.getTime() > new Date(this.formData.endTime).getTime()
+            );
+          } else {
+            return time.getTime() < Date.now() - 8.64e7;
+          }
+        },
+      },
+      pickerOptions2: {
+        disabledDate: (time) => {
+          if (this.formData.startTime) {
+            return (
+              time.getTime() < Date.now() - 8.64e7 ||
+              time.getTime() < new Date(this.formData.startTime).getTime()
+            );
+          } else {
+            return time.getTime() < Date.now() - 8.64e7;
+          }
+        },
+      },
+    };
+  },
+  methods: {
+    
+
+    //关闭窗口
+    handleClose() {
+      //将表单清空
+      this.$refs["formData"].resetFields();
+      //注意不可以通过this.visiable=false来关闭，因为他是父组件的属性
+      this.remoteClose();
+    },
+
+    //提交表单数据
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+         
+          this.formData.planCycle = JSON.stringify(this.formData.planCycle);
 
+          this.submitData();
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
 
+    async submitData() {
+      let response = null;
+      if (this.formData.id) {
+        // 编辑
+        response = await api.update(this.formData);
+      } else {
+        // 新增
+        response = await api.add(this.formData);
+      }
 
-</script>
+      if (response.success) {
+        this.$message({
+          message: "保存成功",
+          type: "success",
+        });
+        // 关闭窗口
+        this.handleClose();
+      } else {
+        this.$message({
+          message: "保存失败",
+          type: "error",
+        });
+      }
+    },
+  },
+};
+</script>

src/views/patrol/partol-plan/index.vue

@@ -10,7 +10,7 @@
             style="width: 150px"
           ></el-input>
         </div>
-       <div class="filter-item">
+        <div class="filter-item">
           任务团队:
           <el-input
             v-model.trim="query.planTeam"
@@ -19,16 +19,17 @@
           ></el-input>
         </div>
 
-        <el-button type="primary" icon="el-icon-search" class="search-button" @click="queryData"
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="search-button"
+          @click="queryData"
           >搜索</el-button
         >
       </div>
 
       <div class="handle-button-right">
-        <el-button
-          icon="el-icon-plus"
-          type="success"
-          @click="dialogFormVisible = true"
+        <el-button icon="el-icon-plus" type="success" @click="openAdd"
           >新增</el-button
         >
         <el-button icon="el-icon-delete" type="danger" @click="batchDelete"
@@ -49,31 +50,33 @@
       :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
       style="width: 100%"
       id="out-table"
-      @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="40"> </el-table-column>
 
-      <el-table-column prop="planName" label="计划名称" width="130"> </el-table-column>
-      <el-table-column prop="planRoute" label="计划路线" width="130"> </el-table-column>
+      <el-table-column prop="planName" label="计划名称" width="130">
+      </el-table-column>
+      <el-table-column prop="planRoute" label="计划路线" width="100">
+      </el-table-column>
 
       <el-table-column prop="planTeam" label="计划团队 "> </el-table-column>
-      <el-table-column prop="planCycle" label="计划周期" width="100">
+      <el-table-column prop="planCycle" label="计划周期" width="150">
       </el-table-column>
 
-      <el-table-column prop="planStartDate" label="计划开始日期 " width="130"> </el-table-column>
+      <el-table-column prop="planStartDate" label="计划开始日期 " width="130">
+      </el-table-column>
       <el-table-column prop="planEndDate" label="计划结束日期" width="130">
       </el-table-column>
-      <el-table-column prop="planStartTime" label="计划开始时间 " width="130"> </el-table-column>
-
-      <el-table-column prop="planEndTime" label="计划结束时间" width="130">
+      <el-table-column prop="planStartTime" label="计划开始时间 " width="100">
       </el-table-column>
 
-      
-      
-      
+      <el-table-column prop="planEndTime" label="计划结束时间" width="100">
+      </el-table-column>
 
-      
-      <el-table-column prop="state" label="状态 "> </el-table-column>
+      <el-table-column  label="状态 "> 
+        <template slot-scope="scope">
+        {{ scope.row.state == 1 ? '显示' : '不显示' }}
+      </template>
+      </el-table-column>
       <el-table-column prop="user" label="创建人 "> </el-table-column>
       <el-table-column label="创建时间" width="200">
         <template slot-scope="{ row }">
@@ -109,18 +112,12 @@
     >
     </el-pagination>
 
-
-    <!-- <edit
+    <edit
       :title="edit.title"
       :visible="edit.visible"
       :formData="edit.formData"
       :remoteClose="remoteClose"
-    /> -->
-
-
-
-
-   
+    />
   </div>
 </template>
 
@@ -129,10 +126,13 @@
 import api from "@/api/partolplan";
 import edit from "./edit";
 
-
 const cityOptions = ["周一", "周二", "周三", "周四", "周五", "周六", "周日"];
 
 export default {
+  //组件注册
+  components: {
+    edit,
+  },
   name: "partol-plan",
   data() {
     return {
@@ -140,184 +140,20 @@ export default {
       page: {
         //分页对象
         pageNo: 1,
-        pageSize: 20,
+        pageSize: 3,
         total: 0,
       },
-      // query: {"demo":1}, //查询条件
-      query: {},
-
-      tableData: [
-        {
-          planName: "admin巡检计划1",
-          period: "周一、周二、周三、周四、周五、周六、周日",
-          execuDate: "2020-08-01 2020-08-05",
-          patrolTime: "9：00-10：00",
-          team: "admin巡检团队b",
-          responser: "吉超博",
-        },
-        {
-          planName: "测试数据",
-          period: "周三、周四、周五",
-          execuDate: "2020-08-01 2020-08-05",
-          patrolTime: "9：00-10：00",
-          team: "测试团队",
-          responser: "吉超博",
-        },
-        {
-          planName: "测试数据测试数据",
-          period: "周一、周三、周六、周日",
-          execuDate: "2020-08-01 2020-08-05",
-          patrolTime: "9：00-10：00",
-          team: "测试团队",
-          responser: "吉超博",
-        },
-      ],
-
-      tableData2: [
-        {
-          order: "1",
-          cameraName: "维保测试点位",
-          company: "上海青浦区徐泾镇徐乐路208号",
-          imageUrl: require("@/assets/img.png"),
-        },
-        {
-          order: "2",
-          cameraName: "维保测试点位",
-          company: "测试地址",
-          imageUrl: require("@/assets/img.png"),
-        },
-      ],
-      multipleSelection: [],
-
-      options: [
-        {
-          value: "1",
-          label: "执行设备1",
-        },
-        {
-          value: "2",
-          label: "执行设备2",
-        },
-        {
-          value: "3",
-          label: "执行设备3",
-        },
-      ],
-      value: "",
+      query: {},// query: {"demo":1}, //查询条件
 
-      options2: [
-        {
-          value: "1",
-          label: "角色1",
-        },
-        {
-          value: "2",
-          label: "角色2",
-        },
-        {
-          value: "3",
-          label: "角色3",
-        },
-      ],
-      value2: "",
 
-      options3: [
-        {
-          value: "1",
-          label: "单位名称1",
-        },
-        {
-          value: "2",
-          label: "单位名称2",
-        },
-        {
-          value: "3",
-          label: "单位名称3",
-        },
-      ],
-      value3: "",
-
-      input: "",
-
-      dialogFormVisible: false,
-      form: {
-        name: "",
-        region: "",
-        region2: "",
-        date1: "",
-        date2: "",
-        delivery: false,
-        type: [],
-        resource: "",
-        desc: "",
-      },
-      formLabelWidth: "120px",
-
-      //视频弹框
-      dialogVideoDetailVisible: false,
-
-      // 全选
-      checkAll: false,
-      checkedCities: ["周一", "周五"],
-      cities: cityOptions,
-      isIndeterminate: true,
-
-      //日期时间选择器
-      formDaliog: {
-        startTime: "",
-        endTime: "",
-        startTime2: "",
-        endTime2: "",
-      },
-      pickerOptions1: {
-        disabledDate: (time) => {
-          if (this.formDaliog.endTime) {
-            return (
-              time.getTime() < Date.now() - 8.64e7 ||
-              time.getTime() > new Date(this.formDaliog.endTime).getTime()
-            );
-          } else {
-            return time.getTime() < Date.now() - 8.64e7;
-          }
-        },
-      },
-      pickerOptions2: {
-        disabledDate: (time) => {
-          if (this.formDaliog.startTime) {
-            return (
-              time.getTime() < Date.now() - 8.64e7 ||
-              time.getTime() < new Date(this.formDaliog.startTime).getTime()
-            );
-          } else {
-            return time.getTime() < Date.now() - 8.64e7;
-          }
+      edit: {
+        title: "",
+        visible: false,
+        formData: {
+          planCycle: [],
         },
       },
 
-      pickerOptions3: {
-        disabledDate: (time) => {
-          if (this.formDaliog.endTime) {
-            return (
-              time.getTime() < Date.now() - 8.64e7 ||
-              time.getTime() > new Date(this.formDaliog.endTime).getTime()
-            );
-          } else {
-            return time.getTime() < Date.now() - 8.64e7;
-          }
-        },
-      },
-      pickerOptions4: {
-        disabledDate: (time) => {
-          if (this.formDaliog.startTime) {
-            return (
-              time.getTime() < Date.now() - 8.64e7 ||
-              time.getTime() < new Date(this.formDaliog.startTime).getTime()
-            );
-          } else {
-            return time.getTime() < Date.now() - 8.64e7;
-          }
-        },
-      },
     };
   },
 
@@ -326,70 +162,82 @@ export default {
   },
 
   methods: {
+
+    //列表渲染
     fetchData() {
       api
-        .getList(this.query, this.page.current, this.page.size)
+        .getList(this.query, this.page.pageNo, this.page.pageSize)
         .then((response) => {
           console.log("response", response);
           // 列表数据
           this.list = response.pageList;
-          this.page.total = response.totalCount;
+          this.page.total = response.totalPages;
         });
     },
 
-    
-
-
+    //打开新增窗口
+    openAdd() {
+      this.edit.visible = true;
+      this.edit.title = "新增";
+    },
 
-    //时间格式化2021-01-21T05:53:00.000+0000
-    renderTime(date) {
-      var dateee = new Date(date).toJSON();
-      return new Date(+new Date(dateee) + 8 * 3600 * 1000)
-        .toISOString()
-        .replace(/T/g, " ")
-        .replace(/\.[\d]{3}Z/, "");
+    //关闭窗口 （子组件会触发此事件方法来关闭窗口）
+    remoteClose() {
+      console.log("============");
+      console.log(this.edit.formData);
+      this.edit.formData = {};
+      this.edit.visible = false;
+      this.fetchData();
     },
 
-    //当页码改变后触发到此方法  val是当前点击到的那个页码
+    
+
+    //分页（当页码改变后触发到此方法  val是当前点击到的那个页码）
     handleCurrentChange(val) {
       this.page.pageNo = val;
       this.fetchData();
     },
 
-
-    //条件查询
+    //筛选
     queryData() {
-      //将页码 变为1，第一页
-      this.page.pageNo = 1;
+      this.page.pageNo = 1;      //将页码 变为1，第一页
       this.fetchData();
     },
 
-
-
+    //修改
     handleEdit(index, row) {
-      alert(index, row);
+      this.edit.visible = true;
+      this.edit.title = "修改";
+      row.planCycle = row.planCycle ? row.planCycle.split(",") : [];
+      this.edit.formData = row;
+      // alert(index, row);
     },
-    handleDelete(index, row) {
-      this.$confirm("确定删除该数据吗?", "删除", {
+
+    //删除
+    handleDelete(id) {
+      this.$confirm("确认删除这条记录吗?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
+          // 发送删除请求
+          api.deleteById({ queryJson: id }).then((response) => {
+            // 处理响应结果提示
+            this.$message({
+              type: response.success ? "success" : "error",
+              message: response.Msg,
+            });
           });
-          this.tableData.splice(index, 1);
+          // 刷新列表数据
+          this.fetchData();
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
+          // 取消删除，不用理会
         });
     },
 
+    //批量删除
     batchDelete() {
       let multData = this.multipleSelection;
       let tableData = this.tableData;
@@ -406,21 +254,18 @@ export default {
         }
       }
     },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
 
-    // 全选
-    handleCheckAllChange(val) {
-      this.checkedCities = val ? cityOptions : [];
-      this.isIndeterminate = false;
-    },
-    handleCheckedCitiesChange(value) {
-      let checkedCount = value.length;
-      this.checkAll = checkedCount === this.cities.length;
-      this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.cities.length;
+
+    //时间格式化2021-01-21T05:53:00.000+0000
+    renderTime(date) {
+      var dateee = new Date(date).toJSON();
+      return new Date(+new Date(dateee) + 8 * 3600 * 1000)
+        .toISOString()
+        .replace(/T/g, " ")
+        .replace(/\.[\d]{3}Z/, "");
     },
+
+   
   },
 };
 </script>

src/views/patrol/team/deviceList.vue

@@ -0,0 +1,28 @@
+<template>
+<!-- <div>{{deviceList}}</div> -->
+  <el-select
+    v-model="query.deviceName"
+    placeholder=""
+    style="width: 160px"
+    clearable
+  >
+    <el-option
+      v-for="item in deviceList"
+      :key="item.deviceCode"
+      :label="item.deviceName"
+      :value="item.deviceCode"
+    >
+    </el-option>
+  </el-select>
+</template>
+<script>
+export default {
+  name: "deviceList",
+  props: ["deviceList",'query'],
+
+  data() {
+    return {};
+  },
+  methods: {},
+};
+</script>

src/views/patrol/team/edit.vue

@@ -0,0 +1,269 @@
+<template>
+  <el-dialog :title="title" :visible.sync="visible" :before-close="handleClose">
+    <el-form
+      :rules="rules"
+      ref="formData"
+      :model="formData"
+      label-position="right"
+      status-icon
+    >
+      <el-form-item
+        label="团队名称:"
+        :label-width="formLabelWidth"
+        prop="teamName"
+      >
+        <el-input v-model="formData.teamName"></el-input>
+      </el-form-item>
+
+      <el-form-item
+        label="责任人:"
+        :label-width="formLabelWidth"
+        prop="name"
+      >
+        <el-input v-model="formData.name"></el-input>
+      </el-form-item>
+
+      <el-form-item
+        label="联系方式:"
+        :label-width="formLabelWidth"
+        prop="phone"
+      >
+        <el-input v-model="formData.phone"></el-input>
+      </el-form-item>
+
+      <el-form-item
+        label="团队人员:"
+        :label-width="formLabelWidth"
+        prop="queryJson"
+      >
+        <el-select
+          v-model="formData.queryJson"
+          style="width: 100%"
+          placeholder=""
+        >
+          <el-option
+            v-for="item in deviceData"
+            :key="item.code"
+            :label="item.deviceName"
+            :value="item.deviceCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+     
+      <div class="table-tit">组织人员</div>
+      <el-table
+        :data="tableData2"
+        stripe
+        border
+        :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
+        style="width: 100%"
+        id="out-table"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="40"> </el-table-column>
+
+        <el-table-column prop="name" label="姓名"> </el-table-column>
+        <el-table-column prop="contact" label="联系方式"> </el-table-column>
+      </el-table>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleClose" style="background: #f6f6f6"
+        >关 闭</el-button
+      >
+      <el-button type="primary" @click="submitForm('formData')"
+        >保 存</el-button
+      >
+    </div>
+  </el-dialog>
+</template>
+<script>
+import api from "@/api/team";
+
+
+//设备下拉数据
+const deviceData = [
+  {
+    deviceCode: "4689975698772669995465611",
+    deviceName: "设备1",
+  },
+  {
+    deviceCode: "122",
+    deviceName: "设备2",
+  },
+  {
+    deviceCode: "123",
+    deviceName: "设备3",
+  },
+];
+
+export default {
+  name: "edit",
+  props: {
+    title: {
+      //弹框的标题
+      type: String,
+      default: "",
+    },
+    visible: {
+      //弹框窗口，true弹出
+      type: Boolean,
+      default: false,
+    },
+    remoteClose: Function, //用于关闭窗口
+    formData: {
+      //提交表单数据
+      type: Object,
+      default: {},
+    },
+  },
+  data() {
+    return {
+
+      tableData2: [
+        {
+          name: "admin",
+          contact: "13245678902",
+        },
+         {
+          name: "张三三",
+          contact: "13245678902",
+        },
+         {
+          name: "李思思",
+          contact: "13245678902",
+        },
+         {
+          name: "王呜呜",
+          contact: "13245678902",
+        },
+         {
+          name: "admin",
+          contact: "13245678902",
+        },
+         
+      ],
+
+
+      deviceData,
+      multipleSelection: [],
+      formLabelWidth: "120px",
+      
+
+      //校验
+      rules: {
+        teamName: [
+          { required: true, message: "请输入团队名称", trigger: "blur" },
+        ],
+        name: [
+          { required: true, message: "请输入责任人", trigger: "blur" },
+        ],
+        phone: [
+          { required: true, message: "请输入联系方式", trigger: "blur" },
+        ],
+        queryJson: [
+          { required: true, message: "请选择团队人员", trigger: "change" },
+        ],
+      },
+
+      // 时间插件
+      pickerOptions1: {
+        disabledDate: (time) => {
+          if (this.formData.endDate) {
+            return (
+              time.getTime() < Date.now() - 8.64e7 ||
+              time.getTime() > new Date(this.formData.endDate).getTime()
+            );
+          } else {
+            return time.getTime() < Date.now() - 8.64e7;
+          }
+        },
+      },
+      pickerOptions2: {
+        disabledDate: (time) => {
+          if (this.formData.startDate) {
+            return (
+              time.getTime() < Date.now() - 8.64e7 ||
+              time.getTime() < new Date(this.formData.startDate).getTime()
+            );
+          } else {
+            return time.getTime() < Date.now() - 8.64e7;
+          }
+        },
+      },
+    };
+  },
+  methods: {
+
+
+     handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+    
+    //关闭窗口
+    handleClose() {
+      //将表单清空
+      this.$refs["formData"].resetFields();
+      //注意不可以通过this.visiable=false来关闭，因为他是父组件的属性
+      this.remoteClose();
+    },
+
+    //提交表单数据
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          deviceData.forEach((item, index) => {
+            if (item.deviceCode == this.formData.deviceCode) {
+              this.formData.deviceName = item.deviceName;
+            }
+          });
+          // this.formData.patrolPlanCycle = JSON.stringify(
+          //   this.formData.patrolPlanCycle
+          // );
+
+          this.submitData();
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+
+    async submitData() {
+      let response = null;
+      if (this.formData.id) {
+        // 编辑
+        response = await api.update(this.formData);
+      } else {
+        // 新增
+        response = await api.add(this.formData);
+      }
+
+      if (response.success) {
+        this.$message({
+          message: "保存成功",
+          type: "success",
+        });
+        // 关闭窗口
+        this.handleClose();
+      } else {
+        this.$message({
+          message: "保存失败",
+          type: "error",
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.table-tit{
+  background: rgb(235, 241, 255);
+    border: 1px solid #d9d9d9;
+  border-bottom:0;
+    font-weight: bold;
+    padding: 8px 10px;
+}
+</style>

src/views/patrol/team/index.vue

@@ -1,44 +1,48 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <div class="filter-left">
+      <div class="filter-left" :model="query">
         <div class="filter-item">
           团队名称:
           <el-input
-            v-model="input"
+            v-model.trim="query.teamName	"
             placeholder=""
             style="width: 150px"
           ></el-input>
         </div>
+
         <div class="filter-item">
-          责任人:
-          <el-select v-model="value" placeholder="" style="width: 150px">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
+          人员名称:
+          <el-input
+            v-model.trim="query.name	"
+            placeholder=""
+            style="width: 150px"
+          ></el-input>
         </div>
+        <!-- <div class="filter-item">
+          人员名称:
+
+          <device-list :deviceList="deviceList" :query=this.query></device-list>
 
-        <el-button type="primary" icon="el-icon-search" class="search-button"
+        </div> -->
+
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          class="search-button"
+          @click="queryData"
           >搜索</el-button
         >
       </div>
 
       <div class="handle-button-right">
-        <el-button
-          icon="el-icon-plus"
-          type="success"
-          @click="dialogFormVisible = true"
+        <el-button icon="el-icon-plus" type="success" @click="openAdd"
           >新增</el-button
         >
         <el-button icon="el-icon-delete" type="danger" @click="batchDelete"
           >删除</el-button
         >
-        <el-button type="warning">
+        <el-button type="warning" @click="handleDownload">
           <svg-icon icon-class="export" />
           导出
         </el-button>
@@ -46,8 +50,9 @@
     </div>
 
     <el-divider></el-divider>
+
     <el-table
-      :data="tableData"
+      :data="list"
       stripe
       border
       :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
@@ -57,18 +62,36 @@
     >
       <el-table-column type="selection" width="40"> </el-table-column>
 
-      <el-table-column prop="teamName" label="团队名称"> </el-table-column>
-      <el-table-column prop="ownerCompany" label="所属单位" width="200">
+      <el-table-column prop="teamName" label="团队名称" width="100">
+      </el-table-column>
+      <el-table-column prop="name" label="团队人员" width="100">
+      </el-table-column>
+      <el-table-column prop="teamLabel" label="团队标签" width="80">
       </el-table-column>
-      <el-table-column prop="persolal" label="责任人"> </el-table-column>
 
-      <el-table-column prop="contact" label="联系方式"> </el-table-column>
-      <el-table-column prop="createMan" label="创建人"> </el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="创建时间"
-        width="200"
-      ></el-table-column>
+      <el-table-column label="标签" width="120">
+         <template slot-scope="scope">
+        {{ scope.row.label == 1 ? '团队责任人' : '团队普通成员' }}
+      </template>
+      </el-table-column>
+
+      <el-table-column prop="phone" label="联系方式" width="150">
+      </el-table-column>
+
+      <el-table-column  label="状态" width="100">
+        <template slot-scope="scope">
+        {{ scope.row.state == 1 ? '显示' : '不显示' }}
+      </template>
+      </el-table-column>
+
+      <el-table-column prop="founder" label="创建人" width="120">
+      </el-table-column>
+
+      <el-table-column label="创建时间" width="200">
+        <template slot-scope="{ row }">
+          <span>{{ renderTime(row.creationTime) }}</span>
+        </template>
+      </el-table-column>
 
       <el-table-column label="操作" width="150" fixed="right">
         <template slot-scope="scope">
@@ -76,253 +99,199 @@
             icon="el-icon-edit"
             style="color: #406ce5"
             @click="handleEdit(scope.$index, scope.row)"
-            >编辑</el-button
+            >修改</el-button
           >
           <el-button
             icon="el-icon-delete"
             style="color: #f27979"
-            @click="handleDelete(scope.$index, scope.row)"
+            @click="handleDelete(scope.row.id)"
             >删除</el-button
           >
         </template>
       </el-table-column>
     </el-table>
 
-    <el-pagination background layout="prev, pager, next" :total="1000">
+    <el-pagination
+      background
+      @current-change="handleCurrentChange"
+      :current-page="page.pageNo"
+      :page-size="1"
+      layout="prev, pager, next"
+      :total="page.total"
+    >
     </el-pagination>
 
-    <el-dialog title="新增" :visible.sync="dialogFormVisible">
-      <el-form :model="form">
-        <el-form-item label="团队名称:" :label-width="formLabelWidth">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
-        </el-form-item>
-
-        <el-form-item label="责任人:" :label-width="formLabelWidth">
-          <el-select v-model="form.region" placeholder="" style="width: 100%">
-            <el-option label="责任人一" value="1"></el-option>
-            <el-option label="责任人二" value="2"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="所属单位:" :label-width="formLabelWidth">
-          <el-select v-model="form.region2" placeholder="" style="width: 100%">
-            <el-option label="所属单位一" value="3"></el-option>
-            <el-option label="所属单位二" value="4"></el-option>
-          </el-select>
-        </el-form-item>
-        <div class="table-tit">组织人员</div>
-        <el-table
-          :data="tableData2"
-          stripe
-          border
-          :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-          style="width: 100%"
-          id="out-table"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column type="selection" width="40"> </el-table-column>
-
-          <el-table-column prop="name" label="姓名"> </el-table-column>
-          <el-table-column prop="contact" label="联系方式" >
-          </el-table-column>
+    <edit
+      :title="edit.title"
+      :visible="edit.visible"
+      :formData="edit.formData"
+      :remoteClose="remoteClose"
+    />
 
-          
-        </el-table>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button
-          @click="dialogFormVisible = false"
-          style="background: #f6f6f6"
-          >关 闭</el-button
-        >
-        <el-button type="primary" @click="dialogFormVisible = false"
-          >保 存</el-button
-        >
+    <!-- 视频详情弹框 start -->
+    <el-dialog
+      title="视频详情"
+      :visible.sync="dialogVideoDetailVisible"
+      class="routeDialog"
+    >
+      <div style="text-align: center">
+        <img src="@/assets/video.png" alt="" width="100%" />
       </div>
     </el-dialog>
+    <!-- 视频详情弹框 end -->
   </div>
 </template>
 
 
 <script>
-// 引入导出Excel表格依赖
-import FileSaver from "file-saver";
-import XLSX from "xlsx";
+
+//引入api文件
+import api from "@/api/team";
+
+//引入局部组件
+import edit from "./edit";
+import deviceList from "./deviceList";
 
 export default {
-  name: "javascriptthree",
+  //组件注册
+  components: {
+    edit,
+    deviceList
+  },
+  name: "elect-partol",
+
   data() {
     return {
-      tableData: [
-        {
-          teamName: "测试团队1",
-          ownerCompany: "徐乐路208号虹泾总部园",
-          persolal: "admin",
-          contact: "13256789034",
-          createMan: "admin",
-          createTime: "2020-09-15 12:20:12",
-        },
-        {
-          teamName: "测试团队2",
-          ownerCompany: "徐乐路208号虹泾总部园",
-          persolal: "admin",
-          contact: "13256789034",
-          createMan: "admin",
-          createTime: "2020-09-15 12:20:12",
-        },
-        {
-          teamName: "测试团队3",
-          ownerCompany: "徐乐路208号虹泾总部园",
-          persolal: "admin",
-          contact: "13256789034",
-          createMan: "admin",
-          createTime: "2020-09-15 12:20:12",
-        },
-      ],
+      page: {
+        //分页对象
+        pageNo: 1,
+        pageSize: 2,
+        total: 0,
+      },
+      query: {}, //查询条件
+      list: [], //列表数据
 
-      tableData2: [
-        {
-          name: "admin",
-          contact: "13245678902",
-        },
-         {
-          name: "张三三",
-          contact: "13245678902",
-        },
-         {
-          name: "李思思",
-          contact: "13245678902",
-        },
-         {
-          name: "王呜呜",
-          contact: "13245678902",
-        },
-         {
-          name: "admin",
-          contact: "13245678902",
-        },
-         
-      ],
-      multipleSelection: [],
+      deviceList:[], //设备列表
 
-      options: [
-        {
-          value: "1",
-          label: "责任人1",
-        },
-        {
-          value: "2",
-          label: "责任人2",
-        },
-        {
-          value: "3",
-          label: "责任人3",
+      edit: {
+        title: "",
+        visible: false,
+        formData: {
+          // patrolPlanCycle: [],
         },
-      ],
-      value: "",
+      },
 
-      options2: [
-        {
-          value: "1",
-          label: "角色1",
-        },
-        {
-          value: "2",
-          label: "角色2",
-        },
-        {
-          value: "3",
-          label: "角色3",
-        },
-      ],
-      value2: "",
+      //视频弹框
+      dialogVideoDetailVisible: false,
 
-      options3: [
-        {
-          value: "1",
-          label: "单位名称1",
-        },
-        {
-          value: "2",
-          label: "单位名称2",
-        },
-        {
-          value: "3",
-          label: "单位名称3",
-        },
-      ],
-      value3: "",
-
-      input: "",
-
-      dialogFormVisible: false,
-      form: {
-        name: "",
-        region: "",
-        region2: "",
-        date1: "",
-        date2: "",
-        delivery: false,
-        type: [],
-        resource: "",
-        desc: "",
-      },
-      formLabelWidth: "100px",
+      multipleSelection: [],
+
+      
     };
   },
+
+  created() {
+    //aa 钩子里调用查询组件
+    this.fetchData();
+    this.fetchPersonData()
+  },
+
   methods: {
-    //定义导出Excel表格事件
-    exportExcel() {
-      /* 从表生成工作簿对象 */
-      var wb = XLSX.utils.table_to_book(document.querySelector("#out-table"));
-      /* 获取二进制字符串作为输出 */
-      var wbout = XLSX.write(wb, {
-        bookType: "xlsx",
-        bookSST: true,
-        type: "array",
-      });
-      try {
-        FileSaver.saveAs(
-          //Blob 对象表示一个不可变、原始数据的类文件对象。
-          //Blob 表示的不一定是JavaScript原生格式的数据。
-          //File 接口基于Blob，继承了 blob 的功能并将其扩展使其支持用户系统上的文件。
-          //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
-          new Blob([wbout], { type: "application/octet-stream" }),
-          //设置导出文件名称
-          "sheetjs.xlsx"
-        );
-      } catch (e) {
-        if (typeof console !== "undefined") console.log(e, wbout);
-      }
-      return wbout;
+    //列表查询
+
+    fetchData() {
+      api
+        .getList(this.query, this.page.pageNo, this.page.pageSize)
+        .then((response) => {
+          console.log("response", response);
+          // 列表数据
+          this.list = response.pageList;
+          this.page.total = response.totalPages;
+        });
+    },
+    
+  
+    //设备下拉列表查询
+    fetchPersonData() {
+      api.getPersonList().then(
+        (response) => {
+          console.log('response2');
+          console.log(response);
+          this.deviceList = response.pageList;
+          // this.page.total = response.totalPages;
+        }
+      );
+    },
+    
+
+    //分页  （当页码改变后触发到此方法  val是当前点击到的那个页码）
+    handleCurrentChange(val) {
+      this.page.pageNo = val;
+      this.fetchData();
+    },
+
+    //条件查询
+    queryData() {
+      this.page.pageNo = 1;  //将页码 变为1，第一页
+      this.fetchData();
     },
+
+    //打开新增窗口
+    openAdd() {
+      this.edit.visible = true;
+      this.edit.title = "新增";
+    },
+
+    //关闭窗口 （子组件会触发此事件方法来关闭窗口）
+    remoteClose() {
+      console.log("============");
+      console.log(this.edit.formData);
+      this.edit.formData = {};
+      this.edit.visible = false;
+      this.fetchData();
+    },
+
+
+    //修改
     handleEdit(index, row) {
-      alert(index, row);
+      this.edit.visible = true;
+      this.edit.title = "修改";
+      // row.patrolPlanCycle = row.patrolPlanCycle
+      //   ? row.patrolPlanCycle.split(",")
+      //   : [];
+      this.edit.formData = row;
     },
-    handleDelete(index, row) {
+
+    //删除
+    handleDelete(id) {
       this.$confirm("确定删除该数据吗?", "删除", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
+
+          // 发送删除请求
+          api.deleteById({ queryJson: id }).then((response) => {
+            // 处理响应结果提示
+            this.$message({
+              type: response.success ? "success" : "error",
+              message: response.Msg,
+            });
           });
-          this.tableData.splice(index, 1);
+          // 刷新列表数据
+          this.fetchData();
+
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
+          // 不用理会
         });
     },
 
+    //全部删除
     batchDelete() {
       let multData = this.multipleSelection;
-      let tableData = this.tableData;
+      let tableData = this.list;
       let multDataLen = multData.length;
       let tableDataLen = tableData.length;
 
@@ -330,7 +299,7 @@ export default {
         for (let y = 0; y < tableDataLen; y++) {
           if (JSON.stringify(tableData[y]) == JSON.stringify(multData[i])) {
             //判断是否相等，相等就删除
-            this.tableData.splice(y, 1);
+            this.list.splice(y, 1);
             console.log("aa");
           }
         }
@@ -339,15 +308,79 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
+
+    //导出功能
+    handleDownload() {
+      this.downloadLoading = true;
+      import("@/vendor/Export2Excel").then((excel) => {
+        const tHeader = [
+          "巡更计划名称",
+          "设备名称",
+          "执行开始日期",
+          "执行结束日期",
+          "巡更开始时间",
+          "巡更结束时间",
+          "巡更周期",
+          "添加时间",
+        ];
+        const filterVal = [
+          "deviceName",
+          "patrolPlanName",
+          "startDate",
+          "endDate",
+          "startTime",
+          "endTime",
+          "patrolPlanCycle",
+          "creationTime",
+        ];
+        const data = this.formatJson(filterVal);
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: "table-list",
+        });
+        this.downloadLoading = false;
+      });
+    },
+    formatJson(filterVal) {
+      return this.list.map((v) =>
+        filterVal.map((j) => {
+          if (j === "timestamp") {
+            return parseTime(v[j]);
+          } else {
+            return v[j];
+          }
+        })
+      );
+    },
+
+    //时间格式化2021-01-21T05:53:00.000+0000
+    renderTime(date) {
+      var dateee = new Date(date).toJSON();
+      return new Date(+new Date(dateee) + 8 * 3600 * 1000)
+        .toISOString()
+        .replace(/T/g, " ")
+        .replace(/\.[\d]{3}Z/, "");
+    },
+
   },
 };
 </script>
 <style scoped>
-.table-tit{
+.table-tit {
   background: rgb(235, 241, 255);
-    border: 1px solid #d9d9d9;
-  border-bottom:0;
-    font-weight: bold;
-    padding: 8px 10px;
+  border: 1px solid #d9d9d9;
+  border-bottom: 0;
+  font-weight: bold;
+  padding: 8px 10px;
+}
+.el-checkbox {
+  margin-right: 15px;
+  line-height: 0;
+}
+.el-dialog {
+  min-width: 736px !important;
 }
+</style>
+<style >
 </style>

src/views/patrol/team2/index.vue

@@ -0,0 +1,353 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <div class="filter-left">
+        <div class="filter-item">
+          团队名称:
+          <el-input
+            v-model="input"
+            placeholder=""
+            style="width: 150px"
+          ></el-input>
+        </div>
+        <div class="filter-item">
+          责任人:
+          <el-select v-model="value" placeholder="" style="width: 150px">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+
+        <el-button type="primary" icon="el-icon-search" class="search-button"
+          >搜索</el-button
+        >
+      </div>
+
+      <div class="handle-button-right">
+        <el-button
+          icon="el-icon-plus"
+          type="success"
+          @click="dialogFormVisible = true"
+          >新增</el-button
+        >
+        <el-button icon="el-icon-delete" type="danger" @click="batchDelete"
+          >删除</el-button
+        >
+        <el-button type="warning">
+          <svg-icon icon-class="export" />
+          导出
+        </el-button>
+      </div>
+    </div>
+
+    <el-divider></el-divider>
+    <el-table
+      :data="tableData"
+      stripe
+      border
+      :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
+      style="width: 100%"
+      id="out-table"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="40"> </el-table-column>
+
+      <el-table-column prop="teamName" label="团队名称"> </el-table-column>
+      <el-table-column prop="ownerCompany" label="所属单位" width="200">
+      </el-table-column>
+      <el-table-column prop="persolal" label="责任人"> </el-table-column>
+
+      <el-table-column prop="contact" label="联系方式"> </el-table-column>
+      <el-table-column prop="createMan" label="创建人"> </el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="200"
+      ></el-table-column>
+
+      <el-table-column label="操作" width="150" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            icon="el-icon-edit"
+            style="color: #406ce5"
+            @click="handleEdit(scope.$index, scope.row)"
+            >编辑</el-button
+          >
+          <el-button
+            icon="el-icon-delete"
+            style="color: #f27979"
+            @click="handleDelete(scope.$index, scope.row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-pagination background layout="prev, pager, next" :total="1000">
+    </el-pagination>
+
+    <el-dialog title="新增" :visible.sync="dialogFormVisible">
+      <el-form :model="form">
+        <el-form-item label="团队名称:" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item label="责任人:" :label-width="formLabelWidth">
+          <el-select v-model="form.region" placeholder="" style="width: 100%">
+            <el-option label="责任人一" value="1"></el-option>
+            <el-option label="责任人二" value="2"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="所属单位:" :label-width="formLabelWidth">
+          <el-select v-model="form.region2" placeholder="" style="width: 100%">
+            <el-option label="所属单位一" value="3"></el-option>
+            <el-option label="所属单位二" value="4"></el-option>
+          </el-select>
+        </el-form-item>
+        <div class="table-tit">组织人员</div>
+        <el-table
+          :data="tableData2"
+          stripe
+          border
+          :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
+          style="width: 100%"
+          id="out-table"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column type="selection" width="40"> </el-table-column>
+
+          <el-table-column prop="name" label="姓名"> </el-table-column>
+          <el-table-column prop="contact" label="联系方式" >
+          </el-table-column>
+
+          
+        </el-table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          @click="dialogFormVisible = false"
+          style="background: #f6f6f6"
+          >关 闭</el-button
+        >
+        <el-button type="primary" @click="dialogFormVisible = false"
+          >保 存</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+
+<script>
+// 引入导出Excel表格依赖
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
+
+export default {
+  name: "javascriptthree",
+  data() {
+    return {
+      tableData: [
+        {
+          teamName: "测试团队1",
+          ownerCompany: "徐乐路208号虹泾总部园",
+          persolal: "admin",
+          contact: "13256789034",
+          createMan: "admin",
+          createTime: "2020-09-15 12:20:12",
+        },
+        {
+          teamName: "测试团队2",
+          ownerCompany: "徐乐路208号虹泾总部园",
+          persolal: "admin",
+          contact: "13256789034",
+          createMan: "admin",
+          createTime: "2020-09-15 12:20:12",
+        },
+        {
+          teamName: "测试团队3",
+          ownerCompany: "徐乐路208号虹泾总部园",
+          persolal: "admin",
+          contact: "13256789034",
+          createMan: "admin",
+          createTime: "2020-09-15 12:20:12",
+        },
+      ],
+
+      tableData2: [
+        {
+          name: "admin",
+          contact: "13245678902",
+        },
+         {
+          name: "张三三",
+          contact: "13245678902",
+        },
+         {
+          name: "李思思",
+          contact: "13245678902",
+        },
+         {
+          name: "王呜呜",
+          contact: "13245678902",
+        },
+         {
+          name: "admin",
+          contact: "13245678902",
+        },
+         
+      ],
+      multipleSelection: [],
+
+      options: [
+        {
+          value: "1",
+          label: "责任人1",
+        },
+        {
+          value: "2",
+          label: "责任人2",
+        },
+        {
+          value: "3",
+          label: "责任人3",
+        },
+      ],
+      value: "",
+
+      options2: [
+        {
+          value: "1",
+          label: "角色1",
+        },
+        {
+          value: "2",
+          label: "角色2",
+        },
+        {
+          value: "3",
+          label: "角色3",
+        },
+      ],
+      value2: "",
+
+      options3: [
+        {
+          value: "1",
+          label: "单位名称1",
+        },
+        {
+          value: "2",
+          label: "单位名称2",
+        },
+        {
+          value: "3",
+          label: "单位名称3",
+        },
+      ],
+      value3: "",
+
+      input: "",
+
+      dialogFormVisible: false,
+      form: {
+        name: "",
+        region: "",
+        region2: "",
+        date1: "",
+        date2: "",
+        delivery: false,
+        type: [],
+        resource: "",
+        desc: "",
+      },
+      formLabelWidth: "100px",
+    };
+  },
+  methods: {
+    //定义导出Excel表格事件
+    exportExcel() {
+      /* 从表生成工作簿对象 */
+      var wb = XLSX.utils.table_to_book(document.querySelector("#out-table"));
+      /* 获取二进制字符串作为输出 */
+      var wbout = XLSX.write(wb, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+      try {
+        FileSaver.saveAs(
+          //Blob 对象表示一个不可变、原始数据的类文件对象。
+          //Blob 表示的不一定是JavaScript原生格式的数据。
+          //File 接口基于Blob，继承了 blob 的功能并将其扩展使其支持用户系统上的文件。
+          //返回一个新创建的 Blob 对象，其内容由参数中给定的数组串联组成。
+          new Blob([wbout], { type: "application/octet-stream" }),
+          //设置导出文件名称
+          "sheetjs.xlsx"
+        );
+      } catch (e) {
+        if (typeof console !== "undefined") console.log(e, wbout);
+      }
+      return wbout;
+    },
+    handleEdit(index, row) {
+      alert(index, row);
+    },
+    handleDelete(index, row) {
+      this.$confirm("确定删除该数据吗?", "删除", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.tableData.splice(index, 1);
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+
+    batchDelete() {
+      let multData = this.multipleSelection;
+      let tableData = this.tableData;
+      let multDataLen = multData.length;
+      let tableDataLen = tableData.length;
+
+      for (let i = 0; i < multDataLen; i++) {
+        for (let y = 0; y < tableDataLen; y++) {
+          if (JSON.stringify(tableData[y]) == JSON.stringify(multData[i])) {
+            //判断是否相等，相等就删除
+            this.tableData.splice(y, 1);
+            console.log("aa");
+          }
+        }
+      }
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+  },
+};
+</script>
+<style scoped>
+.table-tit{
+  background: rgb(235, 241, 255);
+    border: 1px solid #d9d9d9;
+  border-bottom:0;
+    font-weight: bold;
+    padding: 8px 10px;
+}
+</style>