巡检路线，增删改查对接数据，调整时间组件不回显和公共方法引用无效bug

src/api/patrolRoute.js

@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+
+export default {
+
+    // 分页条件查询分类列表 
+    getList(query, pageNo = 1, pageSize = 20) {
+        return request({ // Promise
+            url: '/route/getRouteList',
+            method: 'post',
+            data: {
+                ...query, //查询条件
+                pageNo, //当前页
+                pageSize //每页多少条
+            }
+        })
+    },
+
+    //新增
+    add(data) {
+        return request({
+            url: '/route/appendRoute',
+            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
+        })
+    },
+
+    // 团队人员下拉
+    getPersonList(data) {
+        return request({
+            url: '/team/getPersonnelbox',
+            method: 'post',
+        })
+    },
+
+
+}

src/router/index.js

@@ -190,6 +190,13 @@ export const constantRoutes = [{
                 name: 'Menu2',
                 meta: { title: '巡检路线', icon: 'patrol-route' }
             },
+            {
+                path: 'patrol-route2',
+                component: () =>
+                    import ('@/views/patrol/patrol-route2/index'),
+                name: 'Menu2',
+                meta: { title: '巡检路线2', icon: 'patrol-route' }
+            },
             {
                 path: 'team',
                 component: () =>

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

@@ -4,6 +4,7 @@
     :visible.sync="visible"
     :before-close="handleClose"
     width="60%"
+     v-if="visible"
   >
     <el-form
       :rules="rules"
@@ -26,7 +27,7 @@
                 placeholder=""
               >
                 <el-option
-                  v-for="item in deviceData"
+                  v-for="item in deviceList"
                   :key="item.code"
                   :label="item.deviceName"
                   :value="item.deviceCode"
@@ -47,7 +48,6 @@
               :label-width="formLabelWidth"
               prop="startTime"
             >
-
               <el-time-select
                 placeholder="开始时间"
                 v-model="formData.startTime"
@@ -150,7 +150,6 @@
 <script>
 import api from "@/api/partol";
 
-
 //巡检周期数据
 const cycleOptions = [
   "星期一",
@@ -162,23 +161,6 @@ const cycleOptions = [
   "星期日",
 ];
 
-//设备下拉数据
-const deviceData = [
-  {
-    deviceCode: "4689975698772669995465611",
-    deviceName: "设备1",
-  },
-  {
-    deviceCode: "122",
-    deviceName: "设备2",
-  },
-  {
-    deviceCode: "123",
-    deviceName: "设备3",
-  },
-];
-
-
 export default {
   name: "edit",
   props: {
@@ -198,11 +180,31 @@ export default {
       type: Object,
       default: {},
     },
+
+    deviceList: {
+      //设备下拉
+      type: Array,
+      default: [],
+    },
   },
   data() {
     return {
+      //设备下拉数据
+      deviceData: [
+        {
+          deviceCode: "4689975698772669995465611",
+          deviceName: "设备1",
+        },
+        {
+          deviceCode: "122",
+          deviceName: "设备2",
+        },
+        {
+          deviceCode: "123",
+          deviceName: "设备3",
+        },
+      ],
 
-      deviceData,
       multipleSelection: [],
       formLabelWidth: "120px",
       cycles: cycleOptions,
@@ -232,7 +234,6 @@ export default {
         ],
       },
 
-
       // 时间插件
       pickerOptions1: {
         disabledDate: (time) => {
@@ -258,11 +259,9 @@ export default {
           }
         },
       },
-
     };
   },
   methods: {
-
     //关闭窗口
     handleClose() {
       //将表单清空
@@ -273,11 +272,9 @@ export default {
 
     //提交表单数据
     submitForm(formName) {
-
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          
-          deviceData.forEach((item, index) => {
+          this.deviceList.forEach((item, index) => {
             if (item.deviceCode == this.formData.deviceCode) {
               this.formData.deviceName = item.deviceName;
             }
@@ -286,7 +283,7 @@ export default {
             this.formData.patrolPlanCycle
           );
 
-          this.submitData()
+          this.submitData();
         } else {
           console.log("error submit!!");
           return false;

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

@@ -13,8 +13,24 @@
         <div class="filter-item">
           设备名称:
 
-          <device-list :deviceList="deviceList" :query=this.query></device-list>
-
+          <el-select
+                 v-model="query.deviceName"
+               style="width: 160px"
+                placeholder=""
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :key="item.code"
+                  :label="item.deviceName"
+                  :value="item.deviceCode"
+                ></el-option>
+              </el-select>
+
+
+          <!-- <device-list
+            :deviceList="deviceList"
+            :query="this.query"
+          ></device-list> -->
         </div>
 
         <el-button
@@ -79,9 +95,8 @@
 
       <el-table-column label="添加时间" width="200">
         <template slot-scope="{ row }">
-         <span>  {{ renderTime(row.creationTime) }}</span>
-         <!-- {{ row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }} -->
-
+          <span> {{ renderTime(row.creationTime) }}</span>
+          <!-- {{ row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }} -->
         </template>
       </el-table-column>
 
@@ -118,6 +133,8 @@
       :visible="edit.visible"
       :formData="edit.formData"
       :remoteClose="remoteClose"
+      :deviceList="deviceList"
+
     />
 
     <!-- 视频详情弹框 start -->
@@ -136,24 +153,20 @@
 
 
 <script>
-import { renderTime,parseTime } from '@/utils'
-
+import { renderTime } from "@/utils";
 
 //引入api文件
 import api from "@/api/partol";
 
 //引入局部组件
-import edit from "./edit";
+ import edit from "./edit";
 import deviceList from "./deviceList";
 
-
-
-
 export default {
   //组件注册
   components: {
-    edit,
-    deviceList
+     edit,
+    deviceList,
   },
   name: "elect-partol",
 
@@ -168,7 +181,7 @@ export default {
       query: {}, //查询条件
       list: [], //列表数据
 
-      deviceList:[], //设备列表
+      deviceList: [], //设备列表
 
       edit: {
         title: "",
@@ -182,20 +195,21 @@ export default {
       dialogVideoDetailVisible: false,
 
       multipleSelection: [],
-
-      
     };
   },
 
   created() {
     //aa 钩子里调用查询组件
     this.fetchData();
-    this.fetchDeviceData()
+    this.fetchDeviceData();
   },
 
   methods: {
-    //列表查询
 
+    renderTime,
+
+
+    //列表查询
     fetchData() {
       api
         .getList(this.query, this.page.pageNo, this.page.pageSize)
@@ -206,20 +220,16 @@ export default {
           this.page.total = response.totalPages;
         });
     },
-    
-  
+
     //设备下拉列表查询
     fetchDeviceData() {
-      api.getDeviceList().then(
-        (response) => {
-          console.log('response2');
-          console.log(response);
-          this.deviceList = response.pageList;
-          // this.page.total = response.totalPages;
-        }
-      );
+      api.getDeviceList().then((response) => {
+        console.log("response2");
+        console.log(response);
+        this.deviceList = response.pageList;
+        // this.page.total = response.totalPages;
+      });
     },
-    
 
     //分页  （当页码改变后触发到此方法  val是当前点击到的那个页码）
     handleCurrentChange(val) {
@@ -229,7 +239,7 @@ export default {
 
     //条件查询
     queryData() {
-      this.page.pageNo = 1;  //将页码 变为1，第一页
+      this.page.pageNo = 1; //将页码 变为1，第一页
       this.fetchData();
     },
 
@@ -248,7 +258,6 @@ export default {
       this.fetchData();
     },
 
-
     //修改
     handleEdit(index, row) {
       this.edit.visible = true;
@@ -267,7 +276,6 @@ export default {
         type: "warning",
       })
         .then(() => {
-
           // 发送删除请求
           api.deleteById({ queryJson: id }).then((response) => {
             // 处理响应结果提示
@@ -278,7 +286,6 @@ export default {
           });
           // 刷新列表数据
           this.fetchData();
-
         })
         .catch(() => {
           // 不用理会
@@ -350,16 +357,6 @@ export default {
         })
       );
     },
-
-    //时间格式化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/index.vue

@@ -69,7 +69,7 @@
       <el-table-column prop="planStartTime" label="计划开始时间 " width="100">
       </el-table-column>
 
-      <el-table-column prop="planEndTime" label="计划结束时间" width="100">
+      <el-table-column prop="planEndTime" label="计划结束时间" width="130">
       </el-table-column>
 
       <el-table-column  label="状态 "> 

src/views/patrol/patrol-route/deviceList.vue

@@ -0,0 +1,27 @@
+<template>
+  <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/patrol-route/edit.vue

@@ -0,0 +1,282 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    class="routeDialogVisible"
+  >
+    <el-form
+      :rules="rules"
+      ref="formData"
+      :model="formData"
+      label-position="right"
+      status-icon
+    >
+      <el-form-item
+        label="路线名称:"
+        :label-width="formLabelWidth"
+        prop="routeName"
+      >
+        <el-input v-model="formData.routeName"></el-input>
+      </el-form-item>
+
+
+
+
+      <el-form-item
+        label="上传图片:"
+        :label-width="formLabelWidth"
+        prop="routeUrl"      >
+        <el-upload
+          class="upload-demo"
+          action="https://jsonplaceholder.typicode.com/posts/"
+          :on-preview="handlePreview"
+          :on-remove="handleRemove"
+          :before-remove="beforeRemove"
+          multiple
+          :limit="3"
+          :on-exceed="handleExceed"
+          :file-list="fileList"
+          :src="formData.routeUrl"
+        >
+          <el-button size="small">点击上传</el-button>
+          <div slot="tip" class="el-upload__tip">
+            只能上传jpg/png文件，且不超过500kb
+          </div>
+        </el-upload>
+      </el-form-item>
+
+      <el-form-item label="备注:" :label-width="formLabelWidth" prop="remarks">
+        <el-input v-model="formData.remarks" autocomplete="off"></el-input>
+      </el-form-item>
+
+      <el-form-item label="点位id:" :label-width="formLabelWidth">
+        <el-input v-model="formData.queryJson" autocomplete="off"></el-input>
+      </el-form-item>
+
+      <div class="table-tit">选择巡检点</div>
+
+      <div class="filter-container">
+        <div class="filter-left">
+          <div class="filter-item">
+            点位名称:
+            <el-input placeholder="" style="width: 150px"></el-input>
+          </div>
+          <div class="filter-item">
+            点位地址:
+            <el-input placeholder="" style="width: 150px"></el-input>
+          </div>
+        </div>
+      </div>
+
+      <el-table
+        :data="addTableData"
+        stripe
+        border
+        :header-cell-style="{ background: '#eee', 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="pointName" label="点位名称"> </el-table-column>
+        <el-table-column prop="pointAddress" 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/patrolRoute";
+
+//设备下拉数据
+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 {
+      addTableData: [
+        {
+          order: "1",
+          pointName: "点位121212121",
+          pointAddress: "青浦区徐泾镇徐乐路208号1楼",
+        },
+      ],
+
+      // 上传图片
+      fileList: [],
+
+      deviceData,
+      multipleSelection: [],
+      formLabelWidth: "120px",
+
+      //校验
+      rules: {
+        routeName: [
+          { required: true, message: "请输入路线名称", trigger: "blur" },
+        ],
+        routeUrl: [
+          {required: true, message: '请上传图片', trigger: 'blur'}
+        ],
+
+        remarks: [{ required: true, message: "请输入备注", trigger: "blur" }],
+      },
+
+      // 时间插件
+      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;
+    },
+
+    //上传图片
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    handlePreview(file) {
+      console.log(file);
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+
+    //关闭窗口
+    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: response.Msg,
+          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/patrol-route/index.vue

@@ -1,44 +1,33 @@
 <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.routeName"
             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
+          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="dialogAddVisible = 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,99 +35,89 @@
     </div>
 
     <el-divider></el-divider>
+
     <el-table
-      :data="tableData"
+      :data="list"
       stripe
       border
       :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
       style="width: 100%"
       id="out-table"
       @selection-change="handleSelectionChange"
+      @sort-change="changeSort"
     >
       <el-table-column type="selection" width="40"> </el-table-column>
 
-      <el-table-column prop="routeName" label="路线名称"> </el-table-column>
-      <el-table-column prop="ownerBuilding" label="所属项目/建筑" width="230">
-      </el-table-column>
-      <el-table-column prop="point" label="对应点位">
+      <el-table-column prop="routeName" label="线路名称"> </el-table-column>
+
+      <el-table-column label="路线详情">
         <template slot-scope="{ row }">
-          <div class="check" @click="dialogPointVisible = true">
-            {{ row.point }}
+          <div class="check" @click="dialogRouteDetailVisible = true">
+            {{ row.routeUrl }}
           </div>
         </template>
       </el-table-column>
 
-      <el-table-column prop="newTime" label="最新改动时间" width="230">
+      <el-table-column prop="remarks" label="备注"> </el-table-column>
+
+      <el-table-column label="状态">
+        <template slot-scope="scope">
+          {{ scope.row.state == 1 ? "显示" : "不显示" }}
+        </template>
       </el-table-column>
-      <el-table-column prop="routeDetail" label="路线详情">
+
+      <el-table-column prop="user" label="添加人"> </el-table-column>
+
+      <el-table-column label="添加时间" width="200" sortable="custom">
         <template slot-scope="{ row }">
-          <div class="check" @click="dialogRouteDetailVisible = true">
-            {{ row.point }}
-          </div>
+          <span>{{ renderTime(row.creationTime) }}</span>
         </template>
       </el-table-column>
 
+      <el-table-column label="对应点位">
+        <template>
+          <div class="check" @click="dialogPointVisible = true">查看</div>
+        </template>
+      </el-table-column>
+
+      <!-- <el-table-column label="标签" width="120">
+        <template slot-scope="scope">
+          {{ scope.row.label == 1 ? "团队责任人" : "团队普通成员" }}
+        </template>
+      </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
           >
           <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>
-
-    <!-- 点位弹框 start -->
-    <el-dialog
-      title="对应点位"
-      :visible.sync="dialogPointVisible"
+    <el-pagination
+      background
+      @current-change="handleCurrentChange"
+      :current-page="page.pageNo"
+      :page-size="1"
+      layout="prev, pager, next"
+      :total="page.total"
     >
-      <el-form :model="form">
-        <el-table
-          :data="tableDataPoint"
-          stripe
-          border
-          :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
-          style="width: 100%"
-          id="out-table"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column prop="order" label="序号" width="50">
-          </el-table-column>
-          <el-table-column prop="pointName" label="点位名称"> </el-table-column>
-          <el-table-column prop="pointAddress" label="点位地址">
-          </el-table-column>
-        </el-table>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button
-          @click="dialogPointVisible = false"
-          style="background: #f6f6f6"
-          >关 闭</el-button
-        >
-        <el-button type="primary" @click="dialogPointVisible = false"
-          >保 存</el-button
-        >
-      </div>
-    </el-dialog>
-    <!-- 点位弹框 end -->
+    </el-pagination>
 
     <!-- 路线详情弹框 start -->
     <el-dialog
       title="路线详情"
       :visible.sync="dialogRouteDetailVisible"
-  
       class="routeDialog"
     >
       <div style="text-align: center">
@@ -148,74 +127,18 @@
     </el-dialog>
     <!-- 路线详情弹框 end -->
 
-    <!-- 新增弹框 start -->
-    <el-dialog title="新增" :visible.sync="dialogAddVisible"  class="routeDialogVisible">
+    <!-- 点位弹框 start -->
+    <el-dialog title="对应点位" :visible.sync="dialogPointVisible">
       <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-upload
-            class="upload-demo"
-            action="https://jsonplaceholder.typicode.com/posts/"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
-            :before-remove="beforeRemove"
-            multiple
-            :limit="3"
-            :on-exceed="handleExceed"
-            :file-list="fileList"
-          >
-            <el-button size="small">点击上传</el-button>
-            <div slot="tip" class="el-upload__tip">
-              只能上传jpg/png文件，且不超过500kb
-            </div>
-          </el-upload>
-        </el-form-item>
-
-        <el-form-item label="备注:" :label-width="formLabelWidth">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
-        </el-form-item>
-        <div class="table-tit">选择巡检点</div>
-
-        <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-input
-                v-model="input"
-                placeholder=""
-                style="width: 150px"
-              ></el-input>
-            </div>
-          </div>
-        </div>
-
         <el-table
-          :data="addTableData"
+          :data="tableDataPoint"
           stripe
           border
-          :header-cell-style="{ background: '#eee', color: '#606266' }"
+          :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="pointName" label="点位名称"> </el-table-column>
@@ -224,112 +147,68 @@
         </el-table>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogAddVisible = false" style="background: #f6f6f6"
-          >取 消</el-button
+        <el-button
+          @click="dialogPointVisible = false"
+          style="background: #f6f6f6"
+          >关 闭</el-button
         >
-        <el-button type="primary" @click="dialogAddVisible = false"
+        <el-button type="primary" @click="dialogPointVisible = false"
           >保 存</el-button
         >
       </div>
     </el-dialog>
-    <!-- 新增弹框 end -->
+    <!-- 点位弹框 end -->
+
+    <edit
+      :title="edit.title"
+      :visible="edit.visible"
+      :formData="edit.formData"
+      :remoteClose="remoteClose"
+    />
   </div>
 </template>
 
 
 <script>
-// 引入导出Excel表格依赖
-import FileSaver from "file-saver";
-import XLSX from "xlsx";
+//引入api文件
+import api from "@/api/patrolRoute";
+
+//引入局部组件
+import edit from "./edit";
+import deviceList from "./deviceList";
 
 export default {
-  name: "javascriptthree",
+  //组件注册
+  components: {
+    edit,
+    deviceList,
+  },
+  name: "elect-partol",
+
   data() {
     return {
-      tableData: [
-        {
-          routeName: "虹泾巡检路线1",
-          ownerBuilding: "徐乐路208号虹泾总部园",
-          point: "查看",
-          newTime: "2020-09-15 12:20:12",
-          routeDetail: "查看",
-        },
-        {
-          routeName: "虹泾巡检路线2",
-          ownerBuilding: "徐乐路208号虹泾总部园",
-          point: "查看",
-          newTime: "2020-09-15 12:20:12",
-          routeDetail: "查看",
-        },
-        {
-          routeName: "虹泾巡检路线3",
-          ownerBuilding: "徐乐路208号虹泾总部园",
-          point: "查看",
-          newTime: "2020-09-15 12:20:12",
-          routeDetail: "查看",
-        },
-      ],
-
-      addTableData: [
-        {
-          order: "1",
-          pointName: "点位121212121",
-          pointAddress: "青浦区徐泾镇徐乐路208号1楼",
-        },
-      ],
-      multipleSelection: [],
-
-      options: [
-        {
-          value: "1",
-          label: "责任人1",
-        },
-        {
-          value: "2",
-          label: "责任人2",
-        },
-        {
-          value: "3",
-          label: "责任人3",
-        },
-      ],
-      value: "",
+      page: {
+        //分页对象
+        pageNo: 1,
+        pageSize: 2,
+        total: 0,
+      },
+      query: {}, //查询条件
+      list: [], //列表数据
+  
 
-      options2: [
-        {
-          value: "1",
-          label: "路线1",
-        },
-        {
-          value: "2",
-          label: "路线2",
-        },
-        {
-          value: "3",
-          label: "路线3",
-        },
-      ],
-      value2: "",
+      deviceList: [], //设备列表
 
-      options3: [
-        {
-          value: "1",
-          label: "单位名称1",
+      edit: {
+        title: "",
+        visible: false,
+        formData: {
+          // patrolPlanCycle: [],
         },
-        {
-          value: "2",
-          label: "单位名称2",
-        },
-        {
-          value: "3",
-          label: "单位名称3",
-        },
-      ],
-      value3: "",
-
-      input: "",
+      },
 
-      dialogAddVisible: false,
+      //对应点位弹框
+      dialogPointVisible: false,
       form: {
         name: "",
         region: "",
@@ -341,9 +220,6 @@ export default {
         resource: "",
         desc: "",
       },
-      formLabelWidth: "120px",
-
-      dialogPointVisible: false,
       tableDataPoint: [
         {
           order: "1",
@@ -362,67 +238,131 @@ export default {
         },
       ],
 
+      //路线详情弹框
       dialogRouteDetailVisible: false,
 
-       // 上传图片
-      fileList: [
-        
-      ],
+      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);
+    // // 从后台获取数据,重新排序
+    // changeSort(val) {
+    //   // this.fetchData()
+    //   console.log(val); // column: {…} order: "ascending" prop: "date"
+    //   // 根据当前排序重新获取后台数据,一般后台会需要一个排序的参数
+    // },
+
+
+    changeSort(val) {
+      const { prop, order } = val
+    
+        if (order === 'ascending') {
+        this.query.sort = 'desc'
+      } else {
+        this.query.sort =  'asc'
       }
-      return wbout;
+      this.fetchData()
+      
     },
+  
+
+
+    //列表查询
+
+    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;
+          // this.sort=response.sort
+        });
+    },
+
+    //设备下拉列表查询
+    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;
 
@@ -430,7 +370,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");
           }
         }
@@ -440,22 +380,58 @@ export default {
       this.multipleSelection = val;
     },
 
-    //上传图片
-    handleRemove(file, fileList) {
-      console.log(file, fileList);
-    },
-    handlePreview(file) {
-      console.log(file);
+    //导出功能
+    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;
+      });
     },
-    handleExceed(files, fileList) {
-      this.$message.warning(
-        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
-          files.length + fileList.length
-        } 个文件`
+    formatJson(filterVal) {
+      return this.list.map((v) =>
+        filterVal.map((j) => {
+          if (j === "timestamp") {
+            return parseTime(v[j]);
+          } else {
+            return v[j];
+          }
+        })
       );
     },
-    beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${file.name}？`);
+
+    //时间格式化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/, "");
     },
   },
 };
@@ -468,6 +444,13 @@ export default {
   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/patrol-route2/index.vue

@@ -0,0 +1,471 @@
+<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="dialogAddVisible = 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="routeName" label="路线名称"> </el-table-column>
+      <el-table-column prop="ownerBuilding" label="所属项目/建筑" width="230">
+      </el-table-column>
+      <el-table-column prop="point" label="对应点位">
+        <template slot-scope="{ row }">
+          <div class="check" @click="dialogPointVisible = true">
+            {{ row.point }}
+          </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="newTime" label="最新改动时间" width="230" sortable>
+      </el-table-column>
+      <el-table-column prop="routeDetail" label="路线详情">
+        <template slot-scope="{ row }">
+          <div class="check" @click="dialogRouteDetailVisible = true">
+            {{ row.point }}
+          </div>
+        </template>
+      </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>
+
+    <!-- 点位弹框 start -->
+    <el-dialog
+      title="对应点位"
+      :visible.sync="dialogPointVisible"
+    >
+      <el-form :model="form">
+        <el-table
+          :data="tableDataPoint"
+          stripe
+          border
+          :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
+          style="width: 100%"
+          id="out-table"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column prop="order" label="序号" width="50">
+          </el-table-column>
+          <el-table-column prop="pointName" label="点位名称"> </el-table-column>
+          <el-table-column prop="pointAddress" label="点位地址">
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          @click="dialogPointVisible = false"
+          style="background: #f6f6f6"
+          >关 闭</el-button
+        >
+        <el-button type="primary" @click="dialogPointVisible = false"
+          >保 存</el-button
+        >
+      </div>
+    </el-dialog>
+    <!-- 点位弹框 end -->
+
+    <!-- 路线详情弹框 start -->
+    <el-dialog
+      title="路线详情"
+      :visible.sync="dialogRouteDetailVisible"
+  
+      class="routeDialog"
+    >
+      <div style="text-align: center">
+        <img src="@/assets/route.png" alt="" width="100%" />
+        <p style="margin: 20px auto">虹泾总部园巡检路线1</p>
+      </div>
+    </el-dialog>
+    <!-- 路线详情弹框 end -->
+
+    <!-- 新增弹框 start -->
+    <el-dialog title="新增" :visible.sync="dialogAddVisible"  class="routeDialogVisible">
+      <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-upload
+            class="upload-demo"
+            action="https://jsonplaceholder.typicode.com/posts/"
+            :on-preview="handlePreview"
+            :on-remove="handleRemove"
+            :before-remove="beforeRemove"
+            multiple
+            :limit="3"
+            :on-exceed="handleExceed"
+            :file-list="fileList"
+          >
+            <el-button size="small">点击上传</el-button>
+            <div slot="tip" class="el-upload__tip">
+              只能上传jpg/png文件，且不超过500kb
+            </div>
+          </el-upload>
+        </el-form-item>
+
+        <el-form-item label="备注:" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <div class="table-tit">选择巡检点</div>
+
+        <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-input
+                v-model="input"
+                placeholder=""
+                style="width: 150px"
+              ></el-input>
+            </div>
+          </div>
+        </div>
+
+        <el-table
+          :data="addTableData"
+          stripe
+          border
+          :header-cell-style="{ background: '#eee', 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="pointName" label="点位名称"> </el-table-column>
+          <el-table-column prop="pointAddress" label="点位地址">
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogAddVisible = false" style="background: #f6f6f6"
+          >取 消</el-button
+        >
+        <el-button type="primary" @click="dialogAddVisible = false"
+          >保 存</el-button
+        >
+      </div>
+    </el-dialog>
+    <!-- 新增弹框 end -->
+  </div>
+</template>
+
+
+<script>
+// 引入导出Excel表格依赖
+import FileSaver from "file-saver";
+import XLSX from "xlsx";
+
+export default {
+  name: "javascriptthree",
+  data() {
+    return {
+      tableData: [
+        {
+          routeName: "虹泾巡检路线1",
+          ownerBuilding: "徐乐路208号虹泾总部园",
+          point: "查看",
+          newTime: "2020-09-15 12:20:17",
+          routeDetail: "查看",
+        },
+        {
+          routeName: "虹泾巡检路线2",
+          ownerBuilding: "徐乐路208号虹泾总部园",
+          point: "查看",
+          newTime: "2020-09-15 12:20:12",
+          routeDetail: "查看",
+        },
+        {
+          routeName: "虹泾巡检路线3",
+          ownerBuilding: "徐乐路208号虹泾总部园",
+          point: "查看",
+          newTime: "2020-09-15 12:20:12",
+          routeDetail: "查看",
+        },
+      ],
+
+      addTableData: [
+        {
+          order: "1",
+          pointName: "点位121212121",
+          pointAddress: "青浦区徐泾镇徐乐路208号1楼",
+        },
+      ],
+      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: "",
+
+      dialogAddVisible: false,
+      form: {
+        name: "",
+        region: "",
+        region2: "",
+        date1: "",
+        date2: "",
+        delivery: false,
+        type: [],
+        resource: "",
+        desc: "",
+      },
+      formLabelWidth: "120px",
+
+      dialogPointVisible: false,
+      tableDataPoint: [
+        {
+          order: "1",
+          pointName: "867725032779518",
+          pointAddress: "青浦区徐泾镇徐乐路208号虹泾1楼",
+        },
+        {
+          order: "2",
+          pointName: "867725032779518",
+          pointAddress: "青浦区徐泾镇徐乐路208号虹泾2楼",
+        },
+        {
+          order: "3",
+          pointName: "867725032779518",
+          pointAddress: "青浦区徐泾镇徐乐路208号虹泾3楼",
+        },
+      ],
+
+      dialogRouteDetailVisible: false,
+
+       // 上传图片
+      fileList: [
+        
+      ],
+    };
+  },
+  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;
+    },
+
+    //上传图片
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    handlePreview(file) {
+      console.log(file);
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+  },
+};
+</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/team2/index.vue

@@ -1,353 +0,0 @@
-<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>