调整

src/views/keepWatch/index.vue

@@ -81,9 +81,10 @@
                         </el-form-item>
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
-                            <el-button type="primary" icon="el-icon-search" size="mini" :disabled="buttonDisabled" @click="getTrail">轨迹</el-button>
+<!--                            <el-button type="primary" icon="el-icon-search" size="mini" :disabled="buttonDisabled" @click="getTrail">轨迹</el-button>-->
                             <el-button type="primary" icon="el-icon-refresh" size="mini">重置</el-button>
                             <el-button type="primary" icon="el-icon-refresh" size="mini" @click="exportQuery">导出</el-button>
+                            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="exportMissQuery">漏打报表</el-button>
                         </el-form-item>
                         </el-form>
                  </div>
@@ -252,7 +253,7 @@ export default {
         // this.getvideo()
         this.getTableHeight();
     },
-    
+
     mounted(){
       this.getTree();
       this.listLocation();
@@ -263,113 +264,120 @@ export default {
     beforeDestroy(){
     },
     methods:{
-        exportQuery(){
-                this.download('/qdtl/log/export', {
-                  ...this.queryForm
-                }, `巡检监测_${new Date().getTime()}.xlsx`)
-        },
-        getTableHeight(){
-                 var h = document.body.clientHeight;
-                 this.tableHeight = h*0.6
-                //  console.log(1111111111);
-                 console.log(this.tableHeight);
-        },
-        getTrail(){
-             var trail = {};
-             trail.areaId = this.queryForm.areaId
-             trail.patrolmanCard = this.queryForm.patrolmanCard
-             trail.deviceCode = this.queryForm.deviceCode
-             trail.checkpointCard = this.queryForm.checkpointCard
-             trail.endTime = this.queryForm.endTime
-             trail.beginTime = this.queryForm.beginTime
-             getTrail(trail).then(response=>{
-                   console.log(response);
-                   this.trailData = response.data
-                   this.pointArry.data = this.trailData;
-                   this.pointArry.type = 8
-                   this.open = true
-             })
-        },
-        getList(){
-            console.log(this.queryForm);
-            getLog(this.queryForm).then(response =>{
-                 console.log(response);
-                 this.logList = response.rows
-                 this.total = response.total
-            })
-        },
-         openMap(){
-             console.log(11111111)
-            this.pointArry.data = this.trailData;
-            this.pointArry.type = 8
-            console.log(this.pointArry);
-            },
-        getTree(){
-              var treeDate = {
-                    label:'所有',
-                    value:1
-              }
-              treeDate.children = this.dict.type.tl_xun_area
-              this.areaData.push(treeDate);
-        },
-        listLocation(){
-              listLocation().then(response =>{
-                    this.locationList = response.rows
-              })
-        },
-        listDevice(){
-              listDevice().then(response =>{
-                   this.deviceList = response.rows
-              })
-        },
-        getPatrolman(){
-              getPatrolman().then(response =>{
-                   this.patorlmanList = response.rows
-              })
-        },
-        tableRowClassName({ row, rowIndex }) {
-                if ((rowIndex + 1) % 2 === 0) {
-                    return "warning-row";
-                } else {
-                    return "success-row";
-                }
-        },  
-        filterNode(value, data) {
-                    if (!value) return true;
-                    return data.label.indexOf(value) !== -1;
-        },
-        treeChange(data, node){
-            let tree = this.$refs.tree;
-            let array = tree.getCheckedNodes().concat(tree.getHalfCheckedNodes())
-            var areaArray = []
-            for(var index in array){
-                    if(array[index].value != 1){
-                        areaArray.push(array[index].value);       
-                    }        
-            }
-            this.queryForm.areaId = areaArray.join(',')
-            this.getList();
-            // console.log(this.queryForm.areaId)
-        },
-        buttonChange(){
-            console.log(this.queryForm.dateArry != null);
-            console.log(this.queryForm.patrolmanCard != null);
-            console.log(this.queryForm.patrolmanCard != '');
-            if(this.queryForm.dateArry != null){
-                var start = this.queryForm.dateArry[0];
-                var end = this.queryForm.dateArry[1];
-                this.queryForm.beginTime = start;
-                this.queryForm.endTime = end;
-                var startDay = new Date(start).setHours(0,0,0,0);;
-                var endDay = new Date(end).setHours(0,0,0,0);;
-                if(startDay == endDay && this.queryForm.patrolmanCard != null && this.queryForm.patrolmanCard != ''){
-                        this.buttonDisabled = false
-                }else{
-                        this.buttonDisabled = true
-                }
-            }
-            console.log(this.buttonDisabled)
+      exportQuery() {
+        this.download('/qdtl/log/export', {
+          ...this.queryForm
+        }, `巡检监测_${new Date().getTime()}.xlsx`)
+      },
+      exportMissQuery() {
+        this.download('/qdtl/log/missExport', {
+          ...this.queryForm
+        }, `漏打巡检点报表_${new Date().getTime()}.xlsx`)
+      },
+      getTableHeight() {
+        var h = document.body.clientHeight;
+        this.tableHeight = h * 0.6
+        //  console.log(1111111111);
+        console.log(this.tableHeight);
+      },
+      getTrail() {
+        var trail = {};
+        trail.areaId = this.queryForm.areaId
+        trail.patrolmanCard = this.queryForm.patrolmanCard
+        trail.deviceCode = this.queryForm.deviceCode
+        trail.checkpointCard = this.queryForm.checkpointCard
+        trail.endTime = this.queryForm.endTime
+        trail.beginTime = this.queryForm.beginTime
+        getTrail(trail).then(response => {
+          console.log(response);
+          this.trailData = response.data
+          this.pointArry.data = this.trailData;
+          this.pointArry.type = 8
+          this.open = true
+        })
+      },
+      getList() {
+        console.log(this.queryForm);
+        getLog(this.queryForm).then(response => {
+          console.log(response);
+          this.logList = response.rows
+          this.total = response.total
+        })
+      },
+      openMap() {
+        console.log(11111111)
+        this.pointArry.data = this.trailData;
+        this.pointArry.type = 8
+        console.log(this.pointArry);
+      },
+      getTree() {
+        var treeDate = {
+          label: '所有',
+          value: 1
+        }
+        treeDate.children = this.dict.type.tl_xun_area
+        this.areaData.push(treeDate);
+      },
+      listLocation() {
+        listLocation().then(response => {
+          this.locationList = response.rows
+        })
+      },
+      listDevice() {
+        listDevice().then(response => {
+          this.deviceList = response.rows
+        })
+      },
+      getPatrolman() {
+        getPatrolman().then(response => {
+          this.patorlmanList = response.rows
+        })
+      },
+      tableRowClassName({row, rowIndex}) {
+        if ((rowIndex + 1) % 2 === 0) {
+          return "warning-row";
+        } else {
+          return "success-row";
         }
+      },
+      filterNode(value, data) {
+        if (!value) return true;
+        return data.label.indexOf(value) !== -1;
+      },
+      treeChange(data, node) {
+        let tree = this.$refs.tree;
+        let array = tree.getCheckedNodes().concat(tree.getHalfCheckedNodes())
+        var areaArray = []
+        for (var index in array) {
+          if (array[index].value != 1) {
+            areaArray.push(array[index].value);
+          }
+        }
+        this.queryForm.areaId = areaArray.join(',')
+        this.getList();
+        // console.log(this.queryForm.areaId)
+      },
+      buttonChange() {
+        console.log(this.queryForm.dateArry != null);
+        console.log(this.queryForm.patrolmanCard != null);
+        console.log(this.queryForm.patrolmanCard != '');
+        if (this.queryForm.dateArry != null) {
+          var start = this.queryForm.dateArry[0];
+          var end = this.queryForm.dateArry[1];
+          this.queryForm.beginTime = start;
+          this.queryForm.endTime = end;
+          var startDay = new Date(start).setHours(0, 0, 0, 0);
+          ;
+          var endDay = new Date(end).setHours(0, 0, 0, 0);
+          ;
+          if (startDay == endDay && this.queryForm.patrolmanCard != null && this.queryForm.patrolmanCard != '') {
+            this.buttonDisabled = false
+          } else {
+            this.buttonDisabled = true
+          }
+        }
+        console.log(this.buttonDisabled)
+      }
     }
 };
 </script>

src/views/login.vue

@@ -1,219 +1,219 @@
-<template>
-  <div class="login">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">启东市铁路沿线综合治理信息化管理平台</h3>
-      <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="code" v-if="captchaOnOff">
-        <el-input
-          v-model="loginForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
-      </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleLogin"
-        >
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
-        </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div>
-      </el-form-item>
-    </el-form>
-    <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getCodeImg } from "@/api/login";
-import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
-
-export default {
-  name: "Login",
-  data() {
-    return {
-      codeUrl: "",
-      loginForm: {
-        username: "admin",
-        password: "admin123",
-        rememberMe: false,
-        code: "",
-        uuid: ""
-      },
-      loginRules: {
-        username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
-        ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
-      },
-      loading: false,
-      // 验证码开关
-      captchaOnOff: true,
-      // 注册开关
-      register: false,
-      redirect: undefined
-    };
-  },
-  watch: {
-    $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect;
-      },
-      immediate: true
-    }
-  },
-  created() {
-    this.getCode();
-    this.getCookie();
-  },
-  methods: {
-    getCode() {
-      getCodeImg().then(res => {
-        this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
-        if (this.captchaOnOff) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
-          this.loginForm.uuid = res.uuid;
-        }
-      });
-    },
-    getCookie() {
-      const username = Cookies.get("username");
-      const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
-      this.loginForm = {
-        username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
-      };
-    },
-    handleLogin() {
-      this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true;
-          if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
-          } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
-            Cookies.remove('rememberMe');
-          }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push("/big").catch(()=>{});
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaOnOff) {
-              this.getCode();
-            }
-          });
-        }
-      });
-    }
-  }
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-.login {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
-  background-size: cover;
-}
-.title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
-}
-
-.login-form {
-  border-radius: 6px;
-  background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
-  .el-input {
-    height: 38px;
-    input {
-      height: 38px;
-    }
-  }
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 2px;
-  }
-}
-.login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
-}
-.login-code {
-  width: 33%;
-  height: 38px;
-  float: right;
-  img {
-    cursor: pointer;
-    vertical-align: middle;
-  }
-}
-.el-login-footer {
-  height: 40px;
-  line-height: 40px;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  text-align: center;
-  color: #fff;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
-}
-.login-code-img {
-  height: 38px;
-}
-</style>
+<template>
+  <div class="login">
+    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+      <h3 class="title">启东市铁路沿线综合治理信息化管理平台</h3>
+      <el-form-item prop="username">
+        <el-input
+          v-model="loginForm.username"
+          type="text"
+          auto-complete="off"
+          placeholder="账号"
+        >
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="password">
+        <el-input
+          v-model="loginForm.password"
+          type="password"
+          auto-complete="off"
+          placeholder="密码"
+          @keyup.enter.native="handleLogin"
+        >
+          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="code" v-if="captchaOnOff">
+        <el-input
+          v-model="loginForm.code"
+          auto-complete="off"
+          placeholder="验证码"
+          style="width: 63%"
+          @keyup.enter.native="handleLogin"
+        >
+          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+        </el-input>
+        <div class="login-code">
+          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+        </div>
+      </el-form-item>
+      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+      <el-form-item style="width:100%;">
+        <el-button
+          :loading="loading"
+          size="medium"
+          type="primary"
+          style="width:100%;"
+          @click.native.prevent="handleLogin"
+        >
+          <span v-if="!loading">登 录</span>
+          <span v-else>登 录 中...</span>
+        </el-button>
+        <div style="float: right;" v-if="register">
+          <router-link class="link-type" :to="'/register'">立即注册</router-link>
+        </div>
+      </el-form-item>
+    </el-form>
+    <!--  底部  -->
+    <div class="el-login-footer">
+      <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getCodeImg } from "@/api/login";
+import Cookies from "js-cookie";
+import { encrypt, decrypt } from '@/utils/jsencrypt'
+
+export default {
+  name: "Login",
+  data() {
+    return {
+      codeUrl: "",
+      loginForm: {
+        username: "",
+        password: "",
+        rememberMe: false,
+        code: "",
+        uuid: ""
+      },
+      loginRules: {
+        username: [
+          { required: true, trigger: "blur", message: "请输入您的账号" }
+        ],
+        password: [
+          { required: true, trigger: "blur", message: "请输入您的密码" }
+        ],
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+      },
+      loading: false,
+      // 验证码开关
+      captchaOnOff: true,
+      // 注册开关
+      register: false,
+      redirect: undefined
+    };
+  },
+  watch: {
+    $route: {
+      handler: function(route) {
+        this.redirect = route.query && route.query.redirect;
+      },
+      immediate: true
+    }
+  },
+  created() {
+    this.getCode();
+    this.getCookie();
+  },
+  methods: {
+    getCode() {
+      getCodeImg().then(res => {
+        this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
+        if (this.captchaOnOff) {
+          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.loginForm.uuid = res.uuid;
+        }
+      });
+    },
+    getCookie() {
+      const username = Cookies.get("username");
+      const password = Cookies.get("password");
+      const rememberMe = Cookies.get('rememberMe')
+      this.loginForm = {
+        username: username === undefined ? this.loginForm.username : username,
+        password: password === undefined ? this.loginForm.password : decrypt(password),
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+      };
+    },
+    handleLogin() {
+      this.$refs.loginForm.validate(valid => {
+        if (valid) {
+          this.loading = true;
+          if (this.loginForm.rememberMe) {
+            Cookies.set("username", this.loginForm.username, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
+            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
+          } else {
+            Cookies.remove("username");
+            Cookies.remove("password");
+            Cookies.remove('rememberMe');
+          }
+          this.$store.dispatch("Login", this.loginForm).then(() => {
+            this.$router.push("/big").catch(()=>{});
+          }).catch(() => {
+            this.loading = false;
+            if (this.captchaOnOff) {
+              this.getCode();
+            }
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.login {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  background-image: url("../assets/images/login-background.jpg");
+  background-size: cover;
+}
+.title {
+  margin: 0px auto 30px auto;
+  text-align: center;
+  color: #707070;
+}
+
+.login-form {
+  border-radius: 6px;
+  background: #ffffff;
+  width: 400px;
+  padding: 25px 25px 5px 25px;
+  .el-input {
+    height: 38px;
+    input {
+      height: 38px;
+    }
+  }
+  .input-icon {
+    height: 39px;
+    width: 14px;
+    margin-left: 2px;
+  }
+}
+.login-tip {
+  font-size: 13px;
+  text-align: center;
+  color: #bfbfbf;
+}
+.login-code {
+  width: 33%;
+  height: 38px;
+  float: right;
+  img {
+    cursor: pointer;
+    vertical-align: middle;
+  }
+}
+.el-login-footer {
+  height: 40px;
+  line-height: 40px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-family: Arial;
+  font-size: 12px;
+  letter-spacing: 1px;
+}
+.login-code-img {
+  height: 38px;
+}
+</style>

src/views/qdtl/location/index.vue

@@ -30,7 +30,7 @@
       class="my_table"
       :row-class-name="tableRowClassName"
       :header-cell-style="{background:'#24A3B3 50%',color: '#C5D0D4'}">
-      <el-table-column type="selection" width="55" align="center" />
+
       <el-table-column label="编号" align="center" prop="locationCode" />
       <el-table-column label="名称" align="center" prop="locationName" />
 <!--      <el-table-column label="描述" align="center" prop="detail" />-->