3/4

src/components/Del/index.vue

+<template>
+
+  <el-button  :type="multipleSelection.data.length ? 'primary' : 'info'"
+          :disabled="!multipleSelection.data.length" @click="del()">删 除</el-button>
+
+
+</template>
+<script>
+import {mapGetters,mapActions} from 'vuex';
+import {  warningAlert } from "../../utils/alert";
+
+export default {
+props: {
+  
+    multipleSelection2: {
+      type: Array,
+      default: () => {}
+    }
+  },
+components: {},
+data() {
+return {
+  multipleSelection:formInit(),
+};
+},
+  watch: {
+    multipleSelection2: {
+       immediate: true,
+      handler(newV) {
+        this.multipleSelection = !!newV
+        this.multipleSelection = formInit(this.multipleSelection2)
+   console.log( this.multipleSelection.data.length);
+      },
+    },
+   
+  },
+computed: {
+...mapGetters({}),
+},
+methods: {
+...mapActions({}),
+del(){
+ this.$confirm('继续操作将永久删除, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+      this.$emit("del")
+        }).catch(() => {
+         warningAlert("取消删除")         
+        });
+},
+},
+mounted() {},
+};
+function formInit(data = []) {
+  return {
+  
+   data
+  }
+}
+</script>
+<style scoped>
+</style>
\ No newline at end of file

src/store/modules/FSU.js

@@ -8,6 +8,9 @@ const mutations = {
     changeList(state, arr) {
         state.list = arr
     },
+    changePagesize(state,total){
+        state.pageSize=total
+   }
 }
 const actions = {
     asyncList(context) {
@@ -15,7 +18,11 @@ const actions = {
             current: context.state.pageNum,
             size: context.state.pageSize,
           }).then(res => {
-        
+            let total=res.total
+            if (res.total>state.pageSize) {
+             context.commit("changePagesize", total)
+             context.dispatch("asyncList")
+            }
         let arr = res.records?res.records:[]
      
             context.commit("changeList", arr)

src/store/modules/leaky.js

 import { leakyCablelist } from "../../views/setting/api"
 const state = {
     list: [],
-    pageNum:1,
-    pageSize:10,
+    pageNum: 1,
+    pageSize: 10,
 }
 const mutations = {
     changeList(state, arr) {
         state.list = arr
     },
+    changePagesize(state, total) {
+        state.pageSize = total
+    }
 }
 const actions = {
     asyncList(context) {
-        leakyCablelist( {
+        leakyCablelist({
             current: context.state.pageNum,
             size: context.state.pageSize,
-          }).then(res => {
-        
-        let arr = res.records?res.records:[]
-     
+        }).then(res => {
+            let total = res.total
+            if (res.total > state.pageSize) {
+                context.commit("changePagesize", total)
+                context.dispatch("asyncList")
+            }
+            let arr = res.records ? res.records : []
+
             context.commit("changeList", arr)
         })
     }

src/store/modules/monitor.js

@@ -8,6 +8,9 @@ const mutations = {
     changeList(state, arr) {
         state.list = arr
     },
+    changePagesize(state,total){
+        state.pageSize=total
+   }
 }
 const actions = {
     asyncList(context) {
@@ -15,7 +18,11 @@ const actions = {
             current: context.state.pageNum,
             size: context.state.pageSize,
           }).then(res => {
-        
+            let total=res.total
+            if (res.total>state.pageSize) {
+             context.commit("changePagesize", total)
+             context.dispatch("asyncList")
+            }
         let arr = res.records?res.records:[]
      
             context.commit("changeList", arr)

src/store/modules/railWay.js

@@ -7,7 +7,10 @@ const state = {
 const mutations = {
     changeList(state, arr) {
         state.list = arr
-    }
+    },
+    changePagesize(state,total){
+        state.pageSize=total
+   }
 }
 const actions = {
     asyncList(context) {
@@ -15,7 +18,11 @@ const actions = {
             current: context.state.pageNum,
             size: context.state.pageSize,
           }).then(res => {
-        
+            let total=res.total
+            if (res.total>state.pageSize) {
+             context.commit("changePagesize", total)
+             context.dispatch("asyncList")
+            }
         let arr = res.records?res.records:[]
  
             context.commit("changeList", arr)

src/store/modules/station.js

@@ -7,7 +7,11 @@ const state = {
 const mutations = {
     changeList(state, arr) {
         state.list = arr
+       
     },
+    changePagesize(state,total){
+         state.pageSize=total
+    }
 }
 const actions = {
     asyncList(context) {
@@ -15,7 +19,11 @@ const actions = {
             current: context.state.pageNum,
             size: context.state.pageSize,
           }).then(res => {
-        
+        let total=res.total
+       if (res.total>state.pageSize) {
+        context.commit("changePagesize", total)
+        context.dispatch("asyncList")
+       }
         let arr = res.records?res.records:[]
      
             context.commit("changeList", arr)

src/utils/global_main_loader.js

 import Pagination from '@/components/Pagination/index.vue'
+import delids from '@/components/Del/index.vue'
 // import VueSocketIO from 'vue-socket.io'
 
 export default function performLoader(Vue) {
   // self component
   function plugins(Vue) {
     Vue.component('Pagination', Pagination)
+    Vue.component('delids', delids)
   }
   Vue.use(plugins)
 

src/views/login/index.vue

@@ -120,7 +120,7 @@ export default {
     var that = this;
     document.onkeydown = function (e) {
       var key = window.event.keyCode;
-      if (key == 13 || key == 100) {
+      if (key == 13) {
         that.handleLogin();
       }
     };

src/views/setting/add/comp/FSU.vue

@@ -56,7 +56,7 @@
             v-for="item in backupModeSelect"
             :key="item.id"
             :label="item.dictValue"
-            :value="item.dictValue"
+            :value="item.id"
           ></el-option
         ></el-select>
       </el-form-item>
@@ -66,7 +66,7 @@
             v-for="item in connectModeSelect"
             :key="item.id"
             :label="item.dictValue"
-            :value="item.dictValue"
+            :value="item.id"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -76,7 +76,7 @@
             v-for="item in equipTypeSelect"
             :key="item.id"
             :label="item.dictValue"
-            :value="item.dictValue"
+            :value="item.id"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -89,7 +89,7 @@
             v-for="item in equipSubTypeSelect"
             :key="item.id"
             :label="item.dictValue"
-            :value="item.dictValue"
+            :value="item.id"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -214,11 +214,12 @@ export default {
       asyncstationList: "station/asyncList",
     }),
     changerailWay() {
+      console.log(this.FSUForm.wayId);
     
       this.stationSelect2 = this.stationlist.filter(
-        (item) => item.wayId === this.FSUForm.wayId
+        (item) => item.parentId === this.FSUForm.wayId
       );
-    
+    console.log(this.stationlist);
     },
     readNodes(aaa = [], arrarea = []) {
       for (let item of aaa) {
@@ -237,8 +238,8 @@ export default {
         if (valid) {
           this.FSUForm.parentId = this.FSUForm.siteId;
           this.FSUForm.fsuPort = Number(this.FSUForm.fsuPort);
-       
-          fsusave(this.FSUform).then((res) => {
+      console.log(this.FSUForm);
+          fsusave(this.FSUForm).then((res) => {
             if (res.code == 200) {
               successAlert("添加成功");
           

src/views/setting/add/comp/monitorEquip.vue

@@ -75,7 +75,7 @@
             v-for="item in equipTypeSelect"
             :key="item.id"
             :label="item.dictValue"
-            :value="item.dictValue"
+            :value="item.id"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -85,7 +85,7 @@
             v-for="item in equipModeSelect"
             :key="item.id"
             :label="item.dictValue"
-            :value="item.dictValue"
+            :value="item.id"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -103,17 +103,26 @@
         />
       </el-form-item>
       <el-form-item label="安装日期：" prop="installDate">
-        <el-input
-          v-model="monitorForm.installDate"
-          placeholder="请输入安装日期"
-        />
+       
+         <el-date-picker
+      v-model="monitorForm.installDate"
+      type="datetime"
+      placeholder="请选择安装日期"
+      format="yyyy-MM-dd HH:mm:ss"
+      style="width:400px"
+      value-format="yyyy-MM-dd HH:mm:ss">
+    </el-date-picker>
       </el-form-item>
 
       <el-form-item label="	维护日期：" prop="repairDate">
-        <el-input
-          v-model="monitorForm.repairDate"
-          placeholder="请输入维护日期"
-        />
+        <el-date-picker
+      v-model="monitorForm.repairDate"
+      type="datetime"
+      placeholder="请选择维护日期"
+      format="yyyy-MM-dd HH:mm:ss"
+      style="width:400px"
+      value-format="yyyy-MM-dd HH:mm:ss">
+    </el-date-picker>
       </el-form-item>
     </el-form>
     <div class="btn">
@@ -160,10 +169,10 @@ export default {
         equipName: "",
         equipSerialNumber: "",
         equipType: "",
-        installDate: "2022-02-24 12:24:84",
+        installDate: "",
         kmSign: "",
 
-        repairDate: "2022-02-24 12:24:84",
+        repairDate: "",
       },
       rules: {
         parentId: [
@@ -220,6 +229,7 @@ export default {
       asyncfsuList: "FSU/asyncList",
     }),
     changerailWay() {
+      
       this.stationSelect2 = this.stationlist.filter(
         (item) => item.parentId === this.monitorForm.wayId
       );
@@ -230,12 +240,14 @@ export default {
       );
     },
     reset() {
+      
       this.$refs.monitorForm.resetFields();
     },
     submit() {
       this.$refs.monitorForm.validate((valid) => {
         if (valid) {
           this.monitorForm.parentId = this.monitorForm.fsuId;
+          console.log(this.monitorForm);
           monitorEquipsave(this.monitorForm).then((res) => {
             if (res.code == 200) {
               successAlert("添加成功");
@@ -256,13 +268,15 @@ export default {
           equipName: "",
           equipSerialNumber: "",
           equipType: "",
-          installDate: "2022-02-22 12:24:84",
+          installDate: "",
           kmSign: "",
 
-          repairDate: "2022-02-24 12:24:84",
+          repairDate: "",
         };
       });
     },
+  
+     
   },
   created() {
     selectMonitorItem().then((res) => {

src/views/setting/statistics/comp/fsuTable.vue

@@ -4,12 +4,8 @@
       <div style="color: #666666"></div>
 
       <div class="operate-btn">
-        <el-button
-          :type="multipleSelection.length ? 'primary' : 'info'"
-          :disabled="!multipleSelection.length"
-          @click="delData"
-          >删除</el-button
-        >
+      <delids :multipleSelection2="multipleSelection"  @del="del()"
+          >删除</delids> 
         <el-button type="primary" @click="refresh">刷新</el-button>
         <el-button type="primary" @click="block = !block">查询</el-button>
         <el-button type="primary" @click="exportData">导出</el-button>
@@ -94,7 +90,7 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column prop="equipName" label="设备名称" align="center" />
-      <el-table-column prop="wayId" label="所在铁路线" align="center" />
+      <el-table-column prop="railWayName" label="所在铁路线" align="center" />
       <el-table-column
         prop="siteId"
         label="所在站点"
@@ -236,6 +232,9 @@ export default {
     }),
   },
   methods: {
+    onkeydown_at_phone(event) {
+    console.log(event.keyCode);
+  },
     ...mapActions({
       asyncrailWayList: "railWay/asyncList",
       asyncstationList: "station/asyncList",
@@ -252,7 +251,7 @@ export default {
     changeType(item) {
       this.activeName = item.key;
     },
-    delData() {
+    del() {
       let ids = this.ids;
       fsubatchDelete({ ids }).then((res) => {
         if (res.code == 200) {
@@ -318,8 +317,9 @@ export default {
         let list = res.records || [];
         this.tableData = list;
         this.total = res.total;
+        console.log( this.FSUForm);
           if (this.istrue == 1) {
-          if (this.tableData.length) {
+          if (this.tableData.length!=0) {
             successAlert("查询成功");
           } else {
             warningAlert("查询结果为空");
@@ -333,7 +333,7 @@ export default {
     var that = this;
     document.onkeydown = function (e) {
       var key = window.event.keyCode;
-      if (key == 13 || key == 100) {
+      if (key == 13) {
         that.searchQuery();
       }
     };

src/views/setting/statistics/comp/leakyTable.vue

@@ -4,12 +4,8 @@
       <div style="color: #666666"></div>
 
       <div class="operate-btn">
-        <el-button
-          :type="multipleSelection.length ? 'primary' : 'info'"
-          :disabled="!multipleSelection.length"
-          @click="delData"
-          >删除</el-button
-        >
+      <delids :multipleSelection2="multipleSelection"  @del="del()"
+          >删除</delids> 
         <el-button type="primary" @click="refresh">刷新</el-button>
         <el-button type="primary" @click="block = !block">查询</el-button>
         <el-button type="primary" @click="exportData">导出</el-button>
@@ -134,7 +130,7 @@
     >
       <el-table-column type="selection" width="55" align="center" />
 
-      <el-table-column prop="wayId" label="所在铁路线" align="center" />
+      <el-table-column prop="railWayName" label="所在铁路线" align="center" />
 
       <el-table-column
         prop="hundredMetersLoss"
@@ -299,7 +295,7 @@ export default {
     changeType(item) {
       this.activeName = item.key;
     },
-    delData() {
+    del() {
       let ids = this.ids;
       leakyCablebatchDelete({ ids }).then((res) => {
         if (res.code == 200) {
@@ -389,7 +385,7 @@ export default {
     var that = this;
     document.onkeydown = function (e) {
       var key = window.event.keyCode;
-      if (key == 13 || key == 100) {
+      if (key == 13) {
         that.searchQuery();
       }
     };

src/views/setting/statistics/comp/monitorTable.vue

@@ -4,12 +4,8 @@
       <div style="color: #666666"></div>
 
       <div class="operate-btn">
-        <el-button
-          :type="multipleSelection.length ? 'primary' : 'info'"
-          :disabled="!multipleSelection.length"
-          @click="delData"
-          >删除</el-button
-        >
+      <delids :multipleSelection2="multipleSelection"  @del="del()"
+          >删除</delids> 
         <el-button type="primary" @click="refresh">刷新</el-button>
         <el-button type="primary" @click="block = !block">查询</el-button>
         <el-button type="primary" @click="exportData">导出</el-button>
@@ -110,7 +106,7 @@
     >
       <el-table-column type="selection" width="55" align="center" />
 
-      <el-table-column prop="wayId" label="站点所属铁路线" align="center" />
+      <el-table-column prop="railWayName" label="站点所属铁路线" align="center" />
       <el-table-column prop="equipCode" label="设备身份编号" align="center" />
        <el-table-column prop="ip" label="IP" align="center" />
       <el-table-column
@@ -255,7 +251,7 @@ export default {
     changeType(item) {
       this.activeName = item.key;
     },
-    delData() {
+    del() {
       let ids = this.ids;
       monitorEquipbatchDelete({ ids }).then((res) => {
         if (res.code == 200) {
@@ -336,7 +332,7 @@ export default {
     var that = this;
     document.onkeydown = function (e) {
       var key = window.event.keyCode;
-      if (key == 13 || key == 100) {
+      if (key == 13) {
         that.searchQuery();
       }
     };

src/views/setting/statistics/comp/railWayTable.vue

@@ -4,15 +4,15 @@
       <div style="color: #666666"></div>
 
       <div class="operate-btn">
-        <el-button
-          :type="multipleSelection.length ? 'primary' : 'info'"
-          :disabled="!multipleSelection.length"
-          @click="delData"
-          >删除</el-button
-        >
+        
+         
+        <delids :multipleSelection2="multipleSelection"  @del="del()"
+          >删除</delids> 
         <el-button type="primary" @click="refresh()">刷新</el-button>
         <el-button type="primary" @click="block = !block">查询</el-button>
         <el-button type="primary" @click="exportData">导出</el-button>
+       
+       
       </div>
     </div>
     <el-form
@@ -161,7 +161,8 @@ export default {
     changeType(item) {
       this.activeName = item.key;
     },
-    delData() {
+    del() {
+     
       let ids = this.ids;
       railWaybatchDelete({ ids }).then((res) => {
         if (res.code == 200) {
@@ -194,7 +195,7 @@ export default {
     exportData() {},
     handleSelectionChange(val) {
       this.multipleSelection = val;
-
+      // console.log(val);
       this.ids = this.multipleSelection.map((i) => i.id);
     },
 
@@ -239,7 +240,7 @@ export default {
     var that = this;
     document.onkeydown = function (e) {
       var key = window.event.keyCode;
-      if (key == 13 || key == 100) {
+      if (key == 13) {
         that.searchQuery();
       }
     };

src/views/setting/statistics/comp/stationTable.vue

@@ -4,12 +4,8 @@
       <div style="color: #666666"></div>
 
       <div class="operate-btn">
-        <el-button
-          :type="multipleSelection.length ? 'primary' : 'info'"
-          :disabled="!multipleSelection.length"
-          @click="delData"
-          >删除</el-button
-        >
+      <delids :multipleSelection2="multipleSelection"  @del="del()"
+          >删除</delids>
         <el-button type="primary" @click="refresh">刷新</el-button>
         <el-button type="primary" @click="block = !block">查询</el-button>
         <el-button type="primary" @click="exportData">导出</el-button>
@@ -81,7 +77,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column prop="wayId" label="站点所属铁路线" align="center" />
+      <el-table-column prop="railWayName" label="站点所属铁路线" align="center" />
       <el-table-column prop="siteCode" label="站点编号" align="center" />
       <el-table-column prop="siteName" label="站名" align="center" />
       <el-table-column
@@ -199,7 +195,7 @@ export default {
     changeType(item) {
       this.activeName = item.key;
     },
-    delData() {
+  del() {
       let ids = this.ids;
       sitebatchDelete({ ids }).then((res) => {
         if (res.code == 200) {
@@ -235,7 +231,7 @@ export default {
     exportData() {},
     handleSelectionChange(val) {
       this.multipleSelection = val;
-
+console.log(val);
       this.ids = this.multipleSelection.map((i) => i.id);
     },
 
@@ -281,7 +277,7 @@ export default {
     var that = this;
     document.onkeydown = function (e) {
       var key = window.event.keyCode;
-      if (key == 13 || key == 100) {
+      if (key == 13) {
         that.searchQuery();
       }
     };