巡检点对接接口 404和首页导航组件封装 title配置修改等

src/api/patrolPoint.js

@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+
+export default {
+
+    // 分页条件查询分类列表 
+    getList(query, pageNo = 1, pageSize = 20) {
+        return request({ // Promise
+            url: '/point/getPointList',
+            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/main.js

@@ -16,6 +16,8 @@ import router from './router'
 // 引入字体样式
 import '@/assets/common/fonts/font.css';
 import '@/assets/common/js/flexible.js';
+import getPageTitle from '@/utils/get-page-title'
+
 
 
 
@@ -23,6 +25,13 @@ import '@/icons' // icon
 import '@/permission' // permission control
 
 
+/* 路由发生变化修改页面title */
+router.beforeEach((to, from, next) => {
+    if (to.meta.title) {
+        document.title = getPageTitle(to.meta.title)
+    }
+    next()
+})
 
 /**
  * If you don't want to use mock-server

src/permission.js

@@ -11,51 +11,51 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration
 const whiteList = ['/login'] // no redirect whitelist
 
 // router.beforeEach(async(to, from, next) => {
-//   // start progress bar
-//   NProgress.start()
+//     // start progress bar
+//     NProgress.start()
 
-//   // set page title
-//   document.title = getPageTitle(to.meta.title)
+//     // set page title
+//     document.title = getPageTitle(to.meta.title)
 
-//   // determine whether the user has logged in
-//   const hasToken = getToken()
+//     // determine whether the user has logged in
+//     const hasToken = getToken()
 
-//   if (hasToken) {
-//     if (to.path === '/login') {
-//       // if is logged in, redirect to the home page
-//       next({ path: '/' })
-//       NProgress.done()
-//     } else {
-//       const hasGetUserInfo = store.getters.name
-//       if (hasGetUserInfo) {
-//         next()
-//       } else {
-//         try {
-//           // get user info
-//           await store.dispatch('user/getInfo')
+//     if (hasToken) {
+//         if (to.path === '/login') {
+//             // if is logged in, redirect to the home page
+//             next({ path: '/' })
+//             NProgress.done()
+//         } else {
+//             const hasGetUserInfo = store.getters.name
+//             if (hasGetUserInfo) {
+//                 next()
+//             } else {
+//                 try {
+//                     // get user info
+//                     await store.dispatch('user/getInfo')
 
-//           next()
-//         } catch (error) {
-//           // remove token and go to login page to re-login
-//           await store.dispatch('user/resetToken')
-//           Message.error(error || 'Has Error')
-//           next(`/login?redirect=${to.path}`)
-//           NProgress.done()
+//                     next()
+//                 } catch (error) {
+//                     // remove token and go to login page to re-login
+//                     await store.dispatch('user/resetToken')
+//                     Message.error(error || 'Has Error')
+//                     next(`/login?redirect=${to.path}`)
+//                     NProgress.done()
+//                 }
+//             }
 //         }
-//       }
-//     }
-//   } else {
-//     /* has no token*/
-
-//     if (whiteList.indexOf(to.path) !== -1) {
-//       // in the free login whitelist, go directly
-//       next()
 //     } else {
-//       // other pages that do not have permission to access are redirected to the login page.
-//       next(`/login?redirect=${to.path}`)
-//       NProgress.done()
+//         /* has no token*/
+
+//         if (whiteList.indexOf(to.path) !== -1) {
+//             // in the free login whitelist, go directly
+//             next()
+//         } else {
+//             // other pages that do not have permission to access are redirected to the login page.
+//             next(`/login?redirect=${to.path}`)
+//             NProgress.done()
+//         }
 //     }
-//   }
 // })
 
 router.afterEach(() => {

src/router/index.js

@@ -184,24 +184,26 @@ export const constantRoutes = [{
 
             },
             {
-                path: 'patrol-route',
+                path: 'patrol-point2',
                 component: () =>
-                    import ('@/views/patrol/patrol-route/index'),
-                name: 'Menu2',
-                meta: { title: '巡检路线', icon: 'patrol-route' }
+                    import ('@/views/patrol/patrol-point2/index'), // Parent router-view
+                name: 'Menu1',
+                meta: { title: '巡检点2', icon: 'patrol-point' },
+
             },
             {
-                path: 'patrol-route2',
+                path: 'patrol-route',
                 component: () =>
-                    import ('@/views/patrol/patrol-route2/index'),
+                    import ('@/views/patrol/patrol-route/index'),
                 name: 'Menu2',
-                meta: { title: '巡检路线2', icon: 'patrol-route' }
+                meta: { title: '巡检路线', icon: 'patrol-route' }
             },
+
             {
                 path: 'team',
                 component: () =>
                     import ('@/views/patrol/team/index'),
-                name: 'Menu3',
+                name: '班组人员',
                 meta: { title: '班组人员', icon: 'team' }
             },
             // {

src/views/index/components/alarming.vue

@@ -20,22 +20,22 @@
             <td>事件11111</td>
           </tr>
           <tr>
-            <td>1</td>
+            <td>2</td>
             <td class="online">2020-09-22 15:00:00</td>
             <td>事件11111</td>
           </tr>
           <tr>
-            <td>1</td>
+            <td>3</td>
             <td class="online">2020-09-22 15:00:00</td>
             <td>事件11111</td>
           </tr>
           <tr>
-            <td>1</td>
+            <td>4</td>
             <td class="online">2020-09-22 15:00:00</td>
             <td>事件11111</td>
           </tr>
           <tr>
-            <td>1</td>
+            <td>5</td>
             <td class="online">2020-09-22 15:00:00</td>
             <td>事件11111</td>
           </tr>

src/views/index/components/nav1.vue → src/views/index/components/navHeader.vue

@@ -1,5 +1,31 @@
 <template>
-  <div class="home-nav">
+  <div class="nav-header">
+    安防综合管理平台
+
+    <div class="home-nav">
+      <el-menu
+        :default-active="activeMenu"
+        :collapse="isCollapse"
+        :text-color="variables.menuText"
+        :unique-opened="false"
+        :active-text-color="variables.menuActiveText"
+        mode="horizontal"
+      >
+        <sidebar-item
+          v-for="route in routes"
+          :key="route.path"
+          :item="route"
+          :base-path="route.path"
+        />
+      </el-menu>
+    </div>
+
+    <div class="time-menu">
+      <time-menu></time-menu>
+    </div>
+  </div>
+
+  <!-- <div class="home-nav">
     <el-menu
       :default-active="activeMenu"
       :collapse="isCollapse"
@@ -15,19 +41,21 @@
         :base-path="route.path"
       />
     </el-menu>
-  </div>
+  </div> -->
 </template>
 
 <script>
 import SidebarItem from "./SidebarItem2";
+import TimeMenu from "@/components/TimeMenu";
 
 import { mapGetters } from "vuex";
 import variables from "@/styles/variables.scss";
 
 export default {
-  name: "nav1",
+  name: "navHeader",
   components: {
     SidebarItem,
+    TimeMenu
   },
 
   data() {
@@ -112,6 +140,68 @@ export default {
     display: inline-block;
   }
 }
+
+
+.nav-header {
+  color: #fff;
+  text-align: center;
+  font-size: 4rem;
+  line-height: 8rem;
+  background: url(../../../assets/nav-header-bg.png);
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+
+
+   min-width: 1024px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  
+}
+
+
+// 时间菜单插件
+.nav-header {
+  .time-menu .right-time.date {
+    font-size: 1.6rem;
+    line-height: 4.5rem;
+  }
+  .right-sec .right-menu {
+    line-height: 4.5rem;
+  }
+  .right-sec
+    .right-menu
+    .avatar-container
+    .avatar-wrapper
+    .el-icon-caret-bottom {
+    top: 1.6rem;
+  }
+  .svg-icon{
+    display:none!important;
+  }
+}
+
+// 时间菜单插件
+.nav-header {
+  .time-menu .right-time.date {
+    font-size: 1.6rem;
+    line-height: 4.5rem;
+  }
+  .right-sec .right-menu {
+    line-height: 4.5rem;
+  }
+  .right-sec
+    .right-menu
+    .avatar-container
+    .avatar-wrapper
+    .el-icon-caret-bottom {
+    top: 1.6rem;
+  }
+  .svg-icon{
+    display:none!important;
+  }
+}
 </style>
 
 

src/views/index/index.vue

@@ -1,15 +1,8 @@
 <template>
   <div class="main-container-box">
-    <div class="nav-header">
-      安防综合管理平台
-
-      <nav1/>
+ 
+    <nav-header></nav-header>
 
-      <!-- <sidebar class="sidebar-container" /> -->
-      <div class="time-menu">
-        <time-menu></time-menu>
-      </div>
-    </div>
     <div class="panel-box">
       <div class="column1">
         <sbjk></sbjk>
@@ -25,22 +18,19 @@
 </template>
 
 <script>
-import TimeMenu from "@/components/TimeMenu";
+
 
 import sbjk from "./components/sbjk";
 import monitor from "./components/monitor";
 import alarming from "./components/alarming";
 import handleNumber from "./components/handleNumber";
 import alarmStatic from "./components/alarmStatic";
-import nav1 from "./components/nav1";
 
-import SidebarItem from "@/layout/components/Sidebar/SidebarItem";
+import TimeMenu from "@/components/TimeMenu";
+import navHeader from "./components/navHeader";
 
-import { mapGetters } from "vuex";
-import variables from "@/styles/variables.scss";
 
 export default {
-  // components: { sbjk, monitor, alarming, handleNumber, alarmStatic, TimeMenu},
   components: {
     sbjk,
     monitor,
@@ -48,7 +38,7 @@ export default {
     handleNumber,
     alarmStatic,
     TimeMenu,
-    nav1,
+    navHeader,
   },
 
  
@@ -110,26 +100,7 @@ p {
   color: #ffec16;
 }
 
-// 时间菜单插件
-.nav-header {
-  .time-menu .right-time.date {
-    font-size: 1.6rem;
-    line-height: 4.5rem;
-  }
-  .right-sec .right-menu {
-    line-height: 4.5rem;
-  }
-  .right-sec
-    .right-menu
-    .avatar-container
-    .avatar-wrapper
-    .el-icon-caret-bottom {
-    top: 1.6rem;
-  }
-  .svg-icon{
-    display:none!important;
-  }
-}
+
 
 /* 首页公共css */
 .main-container-box {
@@ -141,21 +112,21 @@ p {
   overflow: hidden;
   color: #fff;
 }
-.nav-header {
-  color: #fff;
-  text-align: center;
-  font-size: 4rem;
-  line-height: 8rem;
-  background: url(../../assets/nav-header-bg.png);
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-}
+
+
+
+
+
+
+
 .panel-box {
   min-width: 1024px;
   max-width: 1920px;
   min-height: 650px;
   position: relative;
   height: calc(100vh - 8rem);
+
+    margin-top: 8rem;
   display: flex;
   > div {
     position: absolute;

src/views/login/index.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="login-container">
-    <div class="nav-header">安防综合管理平台</div>
+    <nav-header></nav-header>
+
+
     <el-form class="login-form" auto-complete="on" label-position="left">
       <div class="title-container">
         <h3 class="title">用户登录</h3>
@@ -25,7 +27,7 @@
         <el-input ref="password" placeholder="请输入密码" name="password" />
       </el-form-item>
 
-      <el-form-item
+      <!-- <el-form-item
         prop="verificationCode"
         style="width: 66%; position: relative"
       >
@@ -38,7 +40,7 @@
           placeholder="请输入验证码"
           name="verificationCode"
         />
-      </el-form-item>
+      </el-form-item> -->
 
       <el-button
         class="login-button"
@@ -50,10 +52,19 @@
 </template>
 
 <script>
-import { validUsername } from "@/utils/validate";
+// import { validUsername } from "@/utils/validate";
+
+import TimeMenu from "@/components/TimeMenu";
+import navHeader from "../index/components/navHeader";
 
 export default {
   //   name: 'Login',
+
+  components: {
+  
+    TimeMenu,
+    navHeader,
+  },
   data() {
     return {};
   },
@@ -65,8 +76,7 @@ export default {
 </script>
 
 <style lang="scss">
-/* 修复input 背景不协调 和光标变色 */
-/* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
+
 
 $bg: #283443;
 $light_gray: #fff;
@@ -78,8 +88,26 @@ $cursor: #fff;
   }
 }
 
+
+/* 约束屏幕尺寸 */
+@media screen and (max-width: 1024px) {
+  html {
+    font-size: 5px !important;
+  }
+}
+@media screen and (min-width: 1920px) {
+  html {
+    font-size: 10px !important;
+  }
+}
+
+
+
+
+
 /* reset element-ui css */
 .login-container {
+  z-index:1000000000;
   .el-input {
     display: inline-block;
     height: 47px;
@@ -231,17 +259,25 @@ $light_gray: #eee;
   width: 100%;
   color: #fff;
   text-align: center;
-  font-size: 40px;
-  line-height: 80px;
+  font-size: 4rem;
+  line-height: 8rem;
   background: url(../../assets/nav-header-bg.png);
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
 
-@media (max-width: 1440px) {
-  .nav-header {
-    font-size: 30px;
-    line-height: 60px;
-  }
+
+
+.main-container-box {
+  min-width: 1024px;
+
+  background: url(../../assets/bg.png);
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  overflow: hidden;
+  color: #fff;
 }
+
+
+
 </style>

src/views/patrol/patrol-point/edit.vue

@@ -0,0 +1,319 @@
+<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="routeName"
+      >
+        <el-input v-model="formData.routeName"></el-input>
+      </el-form-item>
+
+      <el-form-item
+        label="设备类型:"
+        prop="patrolPlanCycle"
+        :label-width="formLabelWidth"
+      >
+        <el-checkbox-group
+          v-model="formData.patrolPlanCycle"
+          style="width: 100%"
+        >
+          <el-checkbox
+            name="patrolPlanCycle"
+            v-for="item in cycles"
+            :label="item"
+            :key="item"
+            >{{ item }}</el-checkbox
+          >
+        </el-checkbox-group>
+      </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> -->
+
+      <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="设备地址" width="250">
+        </el-table-column>
+        <el-table-column label="设备详情">
+          <template slot-scope="{ row }">
+            <div class="check">查看</div>
+          </template>
+        </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 cycleOptions = [
+  "水系统",
+  "火系统",
+  "电气火灾",
+  "气体火灾",
+  "RTU",
+  "视频监控",
+  "其他",
+];
+
+//设备下拉数据
+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楼",
+          pointDetail: "查看",
+        },
+      ],
+
+      cycles: cycleOptions,
+
+      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" }],
+        patrolPlanCycle: [
+          { 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;
+    },
+
+    //上传图片
+    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-point/index.vue

@@ -1,11 +1,11 @@
 <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.pointName"
             placeholder=""
             style="width: 150px"
           ></el-input>
@@ -13,28 +13,29 @@
         <div class="filter-item">
           点位地址:
           <el-input
-            v-model="input"
+            v-model.trim="query.pointAddress"
             placeholder=""
             style="width: 150px"
           ></el-input>
         </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>
@@ -42,45 +43,70 @@
     </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="companyCode" label="单位编号"> </el-table-column> -->
 
-      <el-table-column prop="pointName" label="点位名称"> </el-table-column>
+      <el-table-column prop="dwtype" label="点位设备类型" width="140">
+      </el-table-column>
 
-      <el-table-column prop="pointLabel" label="点位标签">
+      <el-table-column prop="pointName" label="点位名称" width="100">
+      </el-table-column>
+      <el-table-column prop="pointadder" label="点位地址" width="160">
+      </el-table-column>
+
+      <el-table-column label="点位详情">
         <template slot-scope="{ row }">
-          <div class="check" @click="dialogPointLabelVisible = true">
-            {{ row.pointLabel }}
+          <div class="check" @click="dialogPointDetailVisible = true">
+            <!-- {{ row.pointDetails }} -->
+            查看
           </div>
         </template>
       </el-table-column>
 
-      <el-table-column prop="pointAddress" label="点位地址" width="230">
+      <el-table-column label="点位标签">
+        <template slot-scope="{ row }">
+          <div class="check" @click="dialogPointLabelVisible = true">
+            <!-- {{ row.pointLabel }} -->
+            查看
+          </div>
+        </template>
       </el-table-column>
 
-      <el-table-column prop="pointAbject" label="点位对象">
+      <el-table-column label="点位表？">
         <template slot-scope="{ row }">
           <div class="check" @click="dialogPointObjectVisible = true">
-            {{ row.pointObject }}
+            <!-- {{ row.pointLabel }} -->
+            查看
           </div>
         </template>
       </el-table-column>
 
-      <el-table-column prop="newTime" label="最新改动时间" width="230">
+      <el-table-column prop="qrurl" label="二维码储存路径" width="160">
+      </el-table-column>
+
+      <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="pointDetail" 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="dialogPointDetailVisible = true">
-            {{ row.pointDetail }}
-          </div>
+          <span>{{ renderTime(row.creationTime) }}</span>
         </template>
       </el-table-column>
 
@@ -90,23 +116,47 @@
             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>
 
+    <!-- 点位详情弹框 start -->
+    <el-dialog
+      title="点位详情"
+      :visible.sync="dialogPointDetailVisible"
+      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="dialogPointLabelVisible">
+    <el-dialog
+      title="点位标签"
+      :visible.sync="dialogPointLabelVisible"
+      class="routeDialog"
+    >
       <div style="width: 60%; margin: 0 auto">
         <div style="margin: 30px auto 50px; text-align: center">
           <img src="@/assets/code.png" alt="" width="50%" />
@@ -132,15 +182,14 @@
     </el-dialog>
     <!-- 点位标签弹框 end -->
 
-    <!-- 点位对象弹框 start -->
+    <!-- 点位表弹框 start -->
     <el-dialog
-      title="点位对象"
+      title="点位表"
       :visible.sync="dialogPointObjectVisible"
-  
       class="pointObjectDialog"
     >
       <div style="height: 400px">
-        <el-form :model="form">
+        <el-form >
           <el-table
             :data="tableDataPointObject"
             stripe
@@ -156,338 +205,211 @@
             </el-table-column>
             <el-table-column prop="pointAddress" label="点位地址" width="240">
             </el-table-column>
-            <el-table-column label="设备详情" width="80">
+            <!--  
               <template slot-scope="{ row }">
                 <div class="check" @click="dialogPointObjectVisible = true">
                   {{ row.detail }}
                 </div>
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
         </el-form>
       </div>
     </el-dialog>
-    <!-- 点位对象弹框 end -->
-
-    <!-- 点位详情弹框 start -->
-    <el-dialog
-      title="点位详情"
-      :visible.sync="dialogPointDetailVisible"
-      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-input v-model="form.name" autocomplete="off"></el-input>
-        </el-form-item>
-
-        <el-form-item label="设备类型:" :label-width="formLabelWidth">
-          <el-checkbox-group v-model="form.type">
-            <el-checkbox label="水系统" name="type"></el-checkbox>
-            <el-checkbox label="火系统" name="type"></el-checkbox>
-            <el-checkbox label="电气火灾" name="type"></el-checkbox>
-            <el-checkbox label="气体火灾" name="type"></el-checkbox>
-            <el-checkbox label="RTU" name="type"></el-checkbox>
-            <el-checkbox label="视频监控" name="type"></el-checkbox>
-            <el-checkbox label="其他" name="type"></el-checkbox>
-          </el-checkbox-group>
-        </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>
-
-        <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="设备地址" width="250">
-          </el-table-column>
-          <el-table-column label="设备详情">
-            <template slot-scope="{ row }">
-              <div class="check">
-                {{ row.pointDetail }}
-              </div>
-            </template>
-          </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 -->
+    <!-- 点位表弹框 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/patrolPoint";
+
+//引入局部组件
+import edit from "./edit";
+// import deviceList from "./deviceList";
 
 export default {
-  name: "javascriptthree",
+  //组件注册
+  components: {
+    edit,
+    // deviceList,
+  },
+  name: "elect-partol",
+
   data() {
     return {
-      tableData: [
-        {
-          pointName: "虹泾巡检路线1",
-          pointLabel: "查看",
-          pointAddress: "徐乐路208号虹泾总部园",
-          pointObject: "查看",
-          newTime: "2020-09-15 12:20:12",
-          pointDetail: "查看",
-        },
-        {
-          pointName: "虹泾巡检路线2",
-          pointLabel: "查看",
-          pointAddress: "徐乐路208号虹泾总部园",
-          pointObject: "查看",
-          newTime: "2020-09-15 12:20:12",
-          pointDetail: "查看",
-        },
-        {
-          pointName: "虹泾巡检路线3",
-          pointLabel: "查看",
-          pointAddress: "徐乐路208号虹泾总部园",
-          pointObject: "查看",
-          newTime: "2020-09-15 12:20:12",
-          pointDetail: "查看",
-        },
-      ],
-
-      addTableData: [
-        {
-          order: "1",
-          pointName: "点位121212121",
-          pointAddress: "青浦区徐泾镇徐乐路208号1楼",
-          pointDetail: "查看",
-        },
-      ],
-      multipleSelection: [],
-
-      options: [
-        {
-          value: "1",
-          label: "责任人1",
-        },
-        {
-          value: "2",
-          label: "责任人2",
-        },
-        {
-          value: "3",
-          label: "责任人3",
-        },
-      ],
-      value: "",
+      page: {
+        //分页对象
+        pageNo: 1,
+        pageSize: 1,
+        total: 0,
+      },
+      query: {}, //查询条件
+      list: [], //列表数据
 
-      options2: [
-        {
-          value: "1",
-          label: "路线1",
-        },
-        {
-          value: "2",
-          label: "路线2",
-        },
-        {
-          value: "3",
-          label: "路线3",
-        },
-      ],
-      value2: "",
+      // deviceList: [], //设备列表
 
-      options3: [
-        {
-          value: "1",
-          label: "单位名称1",
-        },
-        {
-          value: "2",
-          label: "单位名称2",
-        },
-        {
-          value: "3",
-          label: "单位名称3",
+      edit: {
+        title: "",
+        visible: false,
+        formData: {
+          patrolPlanCycle: [],
         },
-      ],
-      value3: "",
-
-      input: "",
-
-      dialogAddVisible: false,
-      form: {
-        name: "",
-        region: "",
-        region2: "",
-        date1: "",
-        date2: "",
-        delivery: false,
-        type: [],
-        resource: "",
-        desc: "",
       },
-      formLabelWidth: "120px",
 
-      //点位标签
+      //点位详情弹框
+      dialogPointDetailVisible: false,
+      //点位标签弹框
       dialogPointLabelVisible: false,
-
-      // 点位对象
+      //点位表
       dialogPointObjectVisible: false,
-
       tableDataPointObject: [
         {
           order: "1",
           pointName: "867725032779518",
           pointAddress: "青浦区徐泾镇徐乐路208号虹泾1楼",
-          detail: "查看",
+          // detail: "查看",
         },
         {
           order: "2",
           pointName: "867725032779518",
           pointAddress: "青浦区徐泾镇徐乐路208号虹泾2楼",
-          detail: "查看",
+          // detail: "查看",
         },
         {
           order: "3",
           pointName: "867725032779518",
           pointAddress: "青浦区徐泾镇徐乐路208号虹泾3楼",
-          detail: "查看",
+          // detail: "查看",
         },
       ],
 
-      //点位详情
-      dialogPointDetailVisible: false,
-
-      type: [],
-
-      // 上传图片
-      fileList: [
-        {
-          name: "food.jpeg",
-          url:
-            "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
-        },
-        {
-          name: "food2.jpeg",
-          url:
-            "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
-        },
-      ],
+      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 = "-1";
       }
-      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;
 
@@ -495,7 +417,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");
           }
         }
@@ -505,22 +427,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/, "");
     },
   },
 };
@@ -534,17 +492,12 @@ export default {
   padding: 8px 10px;
 }
 .el-checkbox {
-  width: 80px;
-  margin-right: 10px;
+  margin-right: 15px;
+  line-height: 0;
 }
-.el-checkbox-group {
-  width: 290px;
+.el-dialog {
+  min-width: 736px !important;
 }
 </style>
 <style >
-.el-upload-list--picture-card .el-upload-list__item,
-.el-upload--picture-card {
-  width: 100px;
-  height: 100px;
-}
 </style>

src/views/patrol/patrol-point2/index.vue

@@ -0,0 +1,550 @@
+<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-input
+            v-model="input"
+            placeholder=""
+            style="width: 150px"
+          ></el-input>
+        </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="pointName" label="点位名称"> </el-table-column>
+
+      <el-table-column prop="pointLabel" label="点位标签">
+        <template slot-scope="{ row }">
+          <div class="check" @click="dialogPointLabelVisible = true">
+            {{ row.pointLabel }}
+          </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="pointAddress" label="点位地址" width="230">
+      </el-table-column>
+
+      <el-table-column prop="pointAbject" label="点位对象">
+        <template slot-scope="{ row }">
+          <div class="check" @click="dialogPointObjectVisible = true">
+            {{ row.pointObject }}
+          </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="newTime" label="最新改动时间" width="230">
+      </el-table-column>
+      <el-table-column prop="pointDetail" label="点位详情">
+        <template slot-scope="{ row }">
+          <div class="check" @click="dialogPointDetailVisible = true">
+            {{ row.pointDetail }}
+          </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="dialogPointLabelVisible">
+      <div style="width: 60%; margin: 0 auto">
+        <div style="margin: 30px auto 50px; text-align: center">
+          <img src="@/assets/code.png" alt="" width="50%" />
+        </div>
+
+        <p>点位名称：虹泾总部园巡检点位1</p>
+        <p>点位地址：徐乐路208号虹泾总部园永天科技1楼</p>
+        <p>点位编号：323232344y676768tererererereuyuy</p>
+      </div>
+      <br />
+      <br />
+      <br />
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          @click="dialogPointLabelVisible = false"
+          style="background: #f6f6f6"
+          >取 消</el-button
+        >
+        <el-button type="primary" @click="dialogPointLabelVisible = false"
+          >下 载</el-button
+        >
+      </div>
+    </el-dialog>
+    <!-- 点位标签弹框 end -->
+
+    <!-- 点位对象弹框 start -->
+    <el-dialog
+      title="点位对象"
+      :visible.sync="dialogPointObjectVisible"
+  
+      class="pointObjectDialog"
+    >
+      <div style="height: 400px">
+        <el-form :model="form">
+          <el-table
+            :data="tableDataPointObject"
+            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="点位地址" width="240">
+            </el-table-column>
+            <el-table-column label="设备详情" width="80">
+              <template slot-scope="{ row }">
+                <div class="check" @click="dialogPointObjectVisible = true">
+                  {{ row.detail }}
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+    </el-dialog>
+    <!-- 点位对象弹框 end -->
+
+    <!-- 点位详情弹框 start -->
+    <el-dialog
+      title="点位详情"
+      :visible.sync="dialogPointDetailVisible"
+      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-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item label="设备类型:" :label-width="formLabelWidth">
+          <el-checkbox-group v-model="form.type">
+            <el-checkbox label="水系统" name="type"></el-checkbox>
+            <el-checkbox label="火系统" name="type"></el-checkbox>
+            <el-checkbox label="电气火灾" name="type"></el-checkbox>
+            <el-checkbox label="气体火灾" name="type"></el-checkbox>
+            <el-checkbox label="RTU" name="type"></el-checkbox>
+            <el-checkbox label="视频监控" name="type"></el-checkbox>
+            <el-checkbox label="其他" name="type"></el-checkbox>
+          </el-checkbox-group>
+        </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>
+
+        <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="设备地址" width="250">
+          </el-table-column>
+          <el-table-column label="设备详情">
+            <template slot-scope="{ row }">
+              <div class="check">
+                {{ row.pointDetail }}
+              </div>
+            </template>
+          </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: [
+        {
+          pointName: "虹泾巡检路线1",
+          pointLabel: "查看",
+          pointAddress: "徐乐路208号虹泾总部园",
+          pointObject: "查看",
+          newTime: "2020-09-15 12:20:12",
+          pointDetail: "查看",
+        },
+        {
+          pointName: "虹泾巡检路线2",
+          pointLabel: "查看",
+          pointAddress: "徐乐路208号虹泾总部园",
+          pointObject: "查看",
+          newTime: "2020-09-15 12:20:12",
+          pointDetail: "查看",
+        },
+        {
+          pointName: "虹泾巡检路线3",
+          pointLabel: "查看",
+          pointAddress: "徐乐路208号虹泾总部园",
+          pointObject: "查看",
+          newTime: "2020-09-15 12:20:12",
+          pointDetail: "查看",
+        },
+      ],
+
+      addTableData: [
+        {
+          order: "1",
+          pointName: "点位121212121",
+          pointAddress: "青浦区徐泾镇徐乐路208号1楼",
+          pointDetail: "查看",
+        },
+      ],
+      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",
+
+      //点位标签
+      dialogPointLabelVisible: false,
+
+      // 点位对象
+      dialogPointObjectVisible: false,
+
+      tableDataPointObject: [
+        {
+          order: "1",
+          pointName: "867725032779518",
+          pointAddress: "青浦区徐泾镇徐乐路208号虹泾1楼",
+          detail: "查看",
+        },
+        {
+          order: "2",
+          pointName: "867725032779518",
+          pointAddress: "青浦区徐泾镇徐乐路208号虹泾2楼",
+          detail: "查看",
+        },
+        {
+          order: "3",
+          pointName: "867725032779518",
+          pointAddress: "青浦区徐泾镇徐乐路208号虹泾3楼",
+          detail: "查看",
+        },
+      ],
+
+      //点位详情
+      dialogPointDetailVisible: false,
+
+      type: [],
+
+      // 上传图片
+      fileList: [
+        {
+          name: "food.jpeg",
+          url:
+            "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+        },
+        {
+          name: "food2.jpeg",
+          url:
+            "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
+        },
+      ],
+    };
+  },
+  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;
+}
+.el-checkbox {
+  width: 80px;
+  margin-right: 10px;
+}
+.el-checkbox-group {
+  width: 290px;
+}
+</style>
+<style >
+.el-upload-list--picture-card .el-upload-list__item,
+.el-upload--picture-card {
+  width: 100px;
+  height: 100px;
+}
+</style>

vue.config.js

@@ -43,8 +43,8 @@ module.exports = {
         //解决跨越问题
         // proxy: {
         //     [process.env.VUE_APP_BASE_API]: {
-        //         target: 'http://172.16.120.25:8080',
-        //         //target: "https://devapimeeting.talkmed.com",
+        //         // target: 'http://172.16.120.25:8080',
+        //         target: "http://47.111.81.118:8081",
         //         changeOrigin: true,
         //         pathRewrite: {
         //             ['^' + process.env.VUE_APP_BASE_API]: ''