Merge branch 'develop' of https://gitlab.com/970104719/tijing into develop

src/components/File/Agency.vue

@@ -3,7 +3,7 @@
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2020-08-06 16:54:54
+ * @LastEditTime: 2021-01-27 18:14:29
  -->
 <template>
     <div class="public-table" @click="changeselect = false"  v-loading="this.$store.state.isShow"
@@ -34,9 +34,18 @@
                 <div class="lookselect">
                     <div class="search">
                         <span>设备类型：</span>
-                        <select name id v-model="oneselect" @click.stop="selectword2">
+                        <div class="selectClass">
+                          <el-select v-model="Meter" placeholder="请选择">
+                            <el-option
+                            :label="Meter"
+                            :value="Meter">
+                            </el-option>
+                        </el-select>
+                        </div>
+                        <!-- <select name id v-model="oneselect" @click.stop="selectword2">
                             <option :value="oneselect">{{oneselect}}</option>
-                        </select>
+                        </select> -->
+
                         <div class="selectword selectword2" v-if="selectword3">
                             <el-tree
                                 :data="data7"
@@ -69,6 +78,8 @@
                         >
                             <el-table-column prop="DeviceName" label="设备名称" :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceNo" label="设备编号" :show-overflow-tooltip="true"></el-table-column>
+                            <el-table-column prop="CellName" label="工序名称" :show-overflow-tooltip="true"></el-table-column>
+                            <el-table-column prop="LineName" label="线体名称" :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceType" label="设备类型" :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceModel" label="设备型号" :show-overflow-tooltip="true"></el-table-column>
                         </el-table>
@@ -80,9 +91,15 @@
         </div>
         <div class="search-container">
             <span>设备类型：</span>
-            <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
+           <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                <el-option
+                :label="Meter"
+                :value="Meter">
+                </el-option>
+            </el-select>
+            <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
                 <option :value="Meter">{{Meter}}</option>
-            </select>
+            </select> -->
 
             <div class="selectword" v-if="changeselect">
                 <el-tree
@@ -460,7 +477,7 @@ export default {
             antable: [],
             abc: '',
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meter1: '不限',
             Meter2: '不限',
             look: require('../../assets/images/icon_look.png'),
@@ -718,7 +735,7 @@ export default {
             this.selectword3 = false;
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
@@ -1218,7 +1235,7 @@ export default {
 
             this.$axios
                 .post(
-                    `/api/FileManage/FileManage_GstSOP?argDeviceType=${c}&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/FileManage/FileManage_GstSOP?argDeviceType=&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
                     if (res.data.code == 0) {
@@ -1321,7 +1338,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -1361,7 +1378,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -2773,6 +2790,15 @@ select {
         background-color: #f4f4f4;
         overflow: hidden;
         border: 1px solid #cccccc;
+        .selectClass{
+            width:180px;
+            height:35px;
+            display:inline-block;
+            margin-right:15px;
+            .el-input--suffix .el-input__inner{
+                height:35px;
+            }
+        }
     }
     .looktop {
         width: 100%;

src/components/File/plan.vue

@@ -3,7 +3,7 @@
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2020-08-06 16:55:59
+ * @LastEditTime: 2021-01-27 18:16:40
  -->
 <template>
     <div class="public-table" @click="changeselect = false"  v-loading="this.$store.state.isShow"
@@ -25,9 +25,18 @@
                 <div class="lookselect">
                     <div class="search">
                         <span>设备类型：</span>
-                        <select name id v-model="oneselect" @click.stop="selectword2">
+                        <!-- <select name id v-model="oneselect" @click.stop="selectword2">
                             <option :value="oneselect">{{oneselect}}</option>
-                        </select>
+                        </select> -->
+                         <div class="selectClass">
+                          <el-select v-model="Meter" placeholder="请选择">
+                            <el-option
+                            :label="Meter"
+                            :value="Meter">
+                            </el-option>
+                        </el-select>
+                        </div>
+                        
                         <div class="selectword selectword2" v-if="selectword3">
                             <el-tree
                                 :data="data7"
@@ -60,6 +69,8 @@
                         >
                             <el-table-column prop="DeviceName" label="设备名称" :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceNo" label="设备编号" :show-overflow-tooltip="true"></el-table-column>
+                            <el-table-column prop="CellName" label="工序名称" :show-overflow-tooltip="true"></el-table-column>
+                            <el-table-column prop="LineName" label="线体名称" :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceType" label="设备类型" :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceModel" label="设备型号" :show-overflow-tooltip="true"></el-table-column>
                         </el-table>
@@ -71,9 +82,15 @@
         </div>
         <div class="search-container">
             <span>设备类型：</span>
-            <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
+            <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
                 <option :value="Meter">{{Meter}}</option>
-            </select>
+            </select> -->
+            <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                <el-option
+                :label="Meter"
+                :value="Meter">
+                </el-option>
+            </el-select>
 
             <div class="selectword" v-if="changeselect">
                 <el-tree
@@ -474,7 +491,7 @@ export default {
             selectname1: [],
             abc: '',
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meter1: '不限',
             Meter2: '不限',
             look: require('../../assets/images/icon_look.png'),
@@ -744,7 +761,7 @@ export default {
             this.selectword3 = false;
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
@@ -1312,7 +1329,7 @@ export default {
 
             this.$axios
                 .post(
-                    `/api/FileManage/FileManage_GstDeviceData?argDeviceType=${c}&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/FileManage/FileManage_GstDeviceData?argDeviceType=&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
                      if (res.data.code == 0) {
@@ -1410,7 +1427,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -1450,7 +1467,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -2876,6 +2893,15 @@ select {
         background-color: #f4f4f4;
         overflow: hidden;
         border: 1px solid #cccccc;
+        .selectClass{
+            width:180px;
+            height:35px;
+            display:inline-block;
+            margin-right:15px;
+            .el-input--suffix .el-input__inner{
+                height:35px;
+            }
+        }
     }
     .looktop {
         width: 100%;
@@ -2889,6 +2915,15 @@ select {
         padding: 30px 30px 0px 60px;
         width: 100%;
         position: relative;
+         .selectClass{
+            width:180px;
+            height:35px;
+            display:inline-block;
+            margin-right:15px;
+            .el-input--suffix .el-input__inner{
+                height:35px;
+            }
+        }
 
         .search {
             .add {

src/components/Repair/Agency.vue

@@ -3,7 +3,7 @@
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2020-08-06 18:14:48
+ * @LastEditTime: 2021-01-27 15:14:13
  -->
 <template>
     <div class="public-table" @click=" changeselect = false"      v-loading="this.$store.state.isShow"
@@ -34,9 +34,19 @@
                 <div class="lookselect">
                     <div class="search">
                         <span>设备类型：</span>
-                        <select name id v-model="oneselect" @click.stop="selectword2">
+                        <!-- <select name id v-model="oneselect" @click.stop="selectword2">
                             <option :value="oneselect">{{oneselect}}</option>
-                        </select>
+                        </select> -->
+                        
+                        <div class="selectClass">
+                            <el-select v-model="oneselect" placeholder="请选择">
+                                <el-option
+                                :label="oneselect"
+                                :value="oneselect">
+                                </el-option>
+                            </el-select>
+                        </div>
+
                         <div class="selectword selectword2" v-if="selectword3">
                             <el-tree
                                 :data="data7"
@@ -69,6 +79,8 @@
                         >
                             <el-table-column prop="DeviceName" label="设备名称"  :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceNo" label="设备编号"  :show-overflow-tooltip="true"></el-table-column>
+                            <el-table-column prop="CellName" label="工序名称" :show-overflow-tooltip="true"></el-table-column>
+                            <el-table-column prop="LineName" label="线体名称" :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceType" label="设备类型"  :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceModel" label="设备型号"  :show-overflow-tooltip="true"></el-table-column>
                         </el-table>
@@ -81,9 +93,16 @@
         <div class="search-container">
             <div>
                 <span>设备类型：</span>
-                <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
+                <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
                     <option :value="Meter">{{Meter}}</option>
-                </select>
+                </select> -->
+                 <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                    <el-option
+                    :label="Meter"
+                    :value="Meter">
+                    </el-option>
+                </el-select>
+
                 <span class="sp1">任务状态：</span>
                 <select v-model="Meter1">
                     <option v-for="(item,index) in ztarr" :key="index" :value="item">{{item}}</option>
@@ -915,7 +934,7 @@ export default {
                 Contact: '',
                 Remarks: ''
             },
-            oneselect: '',
+            oneselect: '全部',
             oneselectid: '',
             over: '已处理',
             tableData1: [],
@@ -957,7 +976,7 @@ export default {
             selectname: [],
             selectname1: [],
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meterid: '',
             wantnowdata: '',
             Meter1: '不限',
@@ -1135,12 +1154,12 @@ export default {
             }
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
         handleNodeClic7(data) {
-            this.oneselect = data.label;
+            // this.oneselect = data.label;
             this.oneselectid = data.NID;
             this.selectword3 = false;
         },
@@ -1762,29 +1781,20 @@ export default {
             this.changeselect = !this.changeselect;
         },
         lookforsearch() {
+            // projectkeyword
             let i = this.projectlistdata1;
             let a = 0;
             let reg = new RegExp(this.projectkeyword);
             this.projectlistdata = [];
             for (a in i) {
                 if (!this.projectkeyword) {
-                    if (
-                        this.oneselectid ==
-                            '11111111-1111-1111-1111-111111111111' ||
-                        this.oneselect == ''
-                    ) {
+                    if (this.oneselectid =='11111111-1111-1111-1111-111111111111' ||this.oneselect == '' || this.oneselect == '全部') {
                         this.projectlistdata = i;
                     } else if (this.oneselect == i[a].DeviceType) {
                         this.projectlistdata.push(i[a]);
                     }
                 } else {
-                    console.log(this.oneselect);
-                    console.log(a);
-                    if (
-                        this.oneselectid ==
-                            '11111111-1111-1111-1111-111111111111' ||
-                        this.oneselect == ''
-                    ) {
+                    if (this.oneselectid == '11111111-1111-1111-1111-111111111111' || this.oneselect == '' || this.oneselect == '全部') {
                         if (
                             reg.test(i[a].DeviceName) ||
                             reg.test(i[a].DeviceNo) ||
@@ -1793,14 +1803,9 @@ export default {
                         ) {
                             this.projectlistdata.push(i[a]);
 
-                            console.log('1');
-
-                            console.log('asd', this.projectlistdata);
                         } else {
                             console.log(reg.test(i[a].DeviceName));
-                            console.log(reg.test(i[a].DeviceNo));
-                            console.log(reg.test(i[a].DeviceModel));
-                            console.log('2');
+    
                         }
                     } else if (this.oneselect == i[a].DeviceType) {
                         if (
@@ -1916,7 +1921,7 @@ export default {
             }
             this.$axios
                 .post(
-                    `/api/RepairManage/RepairManage_GstTask?argDeviceType=${c}&argTaskStatus=${a}&argTaskType=${b}&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/RepairManage/RepairManage_GstTask?argDeviceType=&argTaskStatus=${a}&argTaskType=${b}&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
                     if (res.data.code == 0) {
@@ -2023,7 +2028,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -2063,7 +2068,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -2949,6 +2954,15 @@ select {
         background-color: #f4f4f4;
         overflow: hidden;
         border: 1px solid #cccccc;
+        .selectClass{
+            width:180px;
+            height:35px;
+            display:inline-block;
+            margin-right:15px;
+            .el-input--suffix .el-input__inner{
+                height:35px;
+            }
+        }
     }
     .looktop {
         width: 100%;

src/components/Repair/Record.vue

@@ -3,7 +3,7 @@
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2020-08-06 18:18:01
+ * @LastEditTime: 2021-01-27 15:20:22
  -->
 <template>
     <div class="public-table" @click="changeselect = false"    v-loading="this.$store.state.isShow"
@@ -12,9 +12,16 @@
                 element-loading-background="rgba(0, 0, 0, 0.4)">
         <div class="search-container">
             <span>设备类型：</span>
-            <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
+            <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
                 <option :value="Meter">{{Meter}}</option>
-            </select>
+            </select> -->
+             <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                <el-option
+                :label="Meter"
+                :value="Meter">
+                </el-option>
+            </el-select>
+
             <span class="sp1">任务状态：</span>
             <select v-model="Meter1">
                 <option v-for="(item,index) in ztarr" :key="index" :value="item">{{item}}</option>
@@ -474,7 +481,7 @@ export default {
             selectname: [],
             selectname1: [],
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meterid: '',
             Meter1: '不限',
             Meter2: '不限',
@@ -721,7 +728,7 @@ export default {
 
             this.$axios
                 .post(
-                    `/api/RepairManage/RepairManage_GstRecord?argDeviceType=${c}&argStartTime=${this.value1}&argRecordStatus=${a}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/RepairManage/RepairManage_GstRecord?argDeviceType=&argStartTime=${this.value1}&argRecordStatus=${a}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
                     if (res.data.code == 0) {
@@ -871,7 +878,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;

src/components/Repair/plan.vue

@@ -3,7 +3,7 @@
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2020-08-06 18:17:14
+ * @LastEditTime: 2021-01-27 18:22:52
  -->
 <template>
     <div class="public-table" @click="changeselect = false"       v-loading="this.$store.state.isShow"
@@ -25,9 +25,18 @@
                 <div class="lookselect">
                     <div class="search">
                         <span>设备类型：</span>
-                        <select name id v-model="oneselect" @click.stop="selectword2">
+                        <!-- <select name id v-model="oneselect" @click.stop="selectword2">
                             <option :value="oneselect">{{oneselect}}</option>
-                        </select>
+                        </select> -->
+                        <div class="selectClass">
+                          <el-select v-model="Meter" placeholder="请选择">
+                            <el-option
+                            :label="Meter"
+                            :value="Meter">
+                            </el-option>
+                        </el-select>
+                        </div>
+
                         <div class="selectword selectword2" v-if="selectword3">
                             <el-tree
                                 :data="data7"
@@ -60,6 +69,8 @@
                         >
                             <el-table-column prop="DeviceName" label="设备名称"  :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceNo" label="设备编号"  :show-overflow-tooltip="true"></el-table-column>
+                            <el-table-column prop="CellName" label="工序名称" :show-overflow-tooltip="true"></el-table-column>
+                            <el-table-column prop="LineName" label="线体名称" :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceType" label="设备类型"  :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceModel" label="设备型号"  :show-overflow-tooltip="true"></el-table-column>
                         </el-table>
@@ -71,9 +82,15 @@
         </div>
         <div class="search-container">
             <span>设备类型：</span>
-            <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
+            <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
                 <option :value="Meter">{{Meter}}</option>
-            </select>
+            </select> -->
+             <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                <el-option
+                :label="Meter"
+                :value="Meter">
+                </el-option>
+            </el-select>
 
             <div class="selectword" v-if="changeselect">
                 <el-tree
@@ -696,7 +713,7 @@ export default {
             selectname1: [],
             
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meterid: '',
             Meter1: '不限',
             Meter2: '不限',
@@ -954,7 +971,7 @@ export default {
             this.selectword3 = false;
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
@@ -1505,11 +1522,10 @@ export default {
             }
             this.$axios
                 .post(
-                    `/api/RepairManage/RepairManage_GstPlan?argDeviceType=${c}&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/RepairManage/RepairManage_GstPlan?argDeviceType=&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
-                    console.log( `/api/RepairManage/RepairManage_GstPlan?argDeviceType=${c}&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`)
-                    console.log(res)
+                   
                       if (res.data.code == 0) {
                          this.tableData1 = res.data.data.DataList;
                         this.PageData = res.data.data.ParameterList;
@@ -1603,7 +1619,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -1643,7 +1659,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -3040,6 +3056,15 @@ select {
         background-color: #f4f4f4;
         overflow: hidden;
         border: 1px solid #cccccc;
+        .selectClass{
+            width:180px;
+            height:35px;
+            display:inline-block;
+            margin-right:15px;
+            .el-input--suffix .el-input__inner{
+                height:35px;
+            }
+        }
     }
     .looktop {
         width: 100%;

src/components/Spotinspection/Agency.vue

@@ -3,7 +3,7 @@
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2020-08-06 17:53:22
+ * @LastEditTime: 2021-01-27 18:23:26
  -->
 <template>
     <div class="public-table public-table1" @click="changeselect = false"    v-loading="this.$store.state.isShow"
@@ -41,9 +41,17 @@
  
         <div class="search-container">
             <span>设备类型：</span>
-            <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
+            <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
                 <option :value="Meter">{{Meter}}</option>
-            </select>
+            </select> -->
+            <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                <el-option
+                :label="Meter"
+                :value="Meter">
+                </el-option>
+            </el-select>
+            
+
             <span class="sp1">任务状态：</span>
             <select v-model="Meter1">
                 <option v-for="(item,index) in ztarr" :key="index" :value="item">{{item}}</option>
@@ -432,7 +440,7 @@ export default {
             selectname: [],
             selectname1: [],
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meterid: '',
             Meter1: '不限',
             Meter2: '不限',
@@ -497,7 +505,7 @@ export default {
             );
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
@@ -732,7 +740,7 @@ export default {
 
             this.$axios
                 .post(
-                    `/api/PointInspectionManage/PointInspectionManage_GstTask?argDeviceType=${c}&argStartTime=${this.value1}&argTaskStatus=${a}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/PointInspectionManage/PointInspectionManage_GstTask?argDeviceType=&argStartTime=${this.value1}&argTaskStatus=${a}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
                     console.log(res)
@@ -898,7 +906,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;

src/components/Spotinspection/Record.vue

@@ -3,7 +3,7 @@
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2020-08-06 17:55:12
+ * @LastEditTime: 2021-01-27 16:19:05
  -->
 <template>
     <div class="public-table" @click="changeselect = false"      v-loading="this.$store.state.isShow"
@@ -12,9 +12,16 @@
                 element-loading-background="rgba(0, 0, 0, 0.4)">
         <div class="search-container">
             <span>设备类型：</span>
-            <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
+            <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
                 <option :value="Meter">{{Meter}}</option>
-            </select>
+            </select> -->
+             <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                <el-option
+                :label="Meter"
+                :value="Meter">
+                </el-option>
+            </el-select>
+
             <span class="sp1">任务状态：</span>
             <select v-model="Meter1">
                 <option v-for="(item,index) in ztarr" :key="index" :value="item">{{item}}</option>
@@ -391,7 +398,7 @@ export default {
             selectname: [],
             selectname1: [],
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meterid: '',
             Meter1: '不限',
             Meter2: '不限',
@@ -457,7 +464,7 @@ export default {
             );
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
@@ -649,7 +656,7 @@ export default {
 
             this.$axios
                 .post(
-                    `/api/PointInspectionManage/PointInspectionManage_GstRecord?argDeviceType=${c}&argStartTime=${this.value1}&argTaskStatus=${a}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/PointInspectionManage/PointInspectionManage_GstRecord?argDeviceType=&argStartTime=${this.value1}&argTaskStatus=${a}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
                     if (res.data.code == 0) {
@@ -774,7 +781,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;

src/components/Spotinspection/plan.vue

-
 <!--
  * @Description: 设备台账
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2020-08-06 17:54:27
+ * @LastEditTime: 2021-01-27 18:34:51
  -->
 <template>
     <div class="public-table ysj" @click="changeselect = false"         v-loading="this.$store.state.isShow"
@@ -13,9 +12,20 @@
                 element-loading-background="rgba(0, 0, 0, 0.4)">
         <div class="search-container">
             <span>设备类型：</span>
-            <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
-                <option :value="Meter">{{Meter}}</option>
-            </select>
+             <!-- <div class="seleword" @click.stop="selectword1">
+             <div class="seleword1">
+                  {{Meter}}
+               <img :src="xiala" alt />
+             </div>
+            </div> -->
+             <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                <el-option
+                :label="Meter"
+                :value="Meter">
+                </el-option>
+            </el-select>
+
+
             <div class="selectword" v-if="changeselect">
                 <el-tree
                     :data="data6"
@@ -34,7 +44,7 @@
                 </el-tree>
             </div>
 
-            <span class="sp4">本次开始时间：</span>
+            <span class="sp4 tinput">本次开始时间：</span>
 
             <el-date-picker
                 v-model="value1"
@@ -69,7 +79,7 @@
                 @select-all="select2"
                 border
                 highlight-current-row
-                :header-cell-style="[{background:(($store.state.color=='grey')?'#D9DBDE':'#5a6c98')},{color:(($store.state.color=='grey')?'#000':'#fff')}, {'border-left':'1px solid #cccccc',height:'50px',padding:'0'}]"
+                :header-cell-style="{background:($store.state.color=='grey')?'#D9DBDE':'#5a6c98',color:($store.state.color=='grey')?'#000':'#fff','border-left':'1px solid #cccccc',height:'50px',padding:'0'}"
             >
                 <el-table-column type="selection" width="60"  :show-overflow-tooltip="true" fixed></el-table-column>
                 <el-table-column label="序号" width="100" prop="Number"  :show-overflow-tooltip="true" fixed>
@@ -88,12 +98,11 @@
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="TaskName" label="维修记录名称" width="200" :show-overflow-tooltip="true" fixed></el-table-column>
                 <el-table-column prop="Name" label="计划名称" width="200" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column prop="PeriodValue" label="巡检周期" width="200" :show-overflow-tooltip="true"></el-table-column>
+                <el-table-column prop="PeriodStr" label="重复任务周期" width="200" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="CurrentStartTime" label="本次开始时间" width="300" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="CurrentEndTime" label="本次结束时间" width="300" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column prop="IsEnabled" label="是否启用" :show-overflow-tooltip="true"></el-table-column>
+                <el-table-column prop="IsEnabled" label="计划执行状态"  width="200" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="NextStartTime" label="下次开始时间" width="300" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="NextEndTime" label="下次结束时间" width="300" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="DevicesStr" label="设备名称" width="200" :show-overflow-tooltip="true"></el-table-column>
@@ -195,8 +204,8 @@
                         <el-option
                             v-for="item in useroptions"
                             :key="item.value"
-                            :label="sesstion.Executor"
-                            :value="sesstion.Executor"
+                            :label="item.value"
+                            :value="item.value"
                         ></el-option>
                     </el-select>
                     <el-select
@@ -208,13 +217,13 @@
                         <el-option
                             v-for="item in useroptions"
                             :key="item.value"
-                            :label="item.label"
+                            :label="item.value"
                             :value="item.value"
                         ></el-option>
                     </el-select>
                 </div>
                 <div class="table_name">
-                    <span class="name_text">开始时间</span>
+                    <span class="name_text">任务开始时间</span>
                     <el-date-picker
                         @change="starFun"
                         v-model="startime"
@@ -238,8 +247,70 @@
                         placeholder="选择日期时间"
                     ></el-date-picker>
 
-                    <span class="time_text">结束时间</span>
-                    <el-date-picker
+                    <span class="time_text">任务执行工期</span>
+                    
+                            <div class="is1">
+                                <input type="text" @input="endValue()" v-if="sestion == 1" v-model="sesstion.rwtime" disabled/>
+                                <input type="text" @input="endValue()" v-if="sestion == 2" v-model="sesstion.rwtime"/>
+                                <input type="text" @input="endValue()" v-if="sestion == 3" v-model="rwtime" />
+                                  <el-select
+                            class="sl1"
+                        
+                            v-model="sesstion.rwselect"
+                            placeholder="请选择"
+                            v-if="sestion == 1"
+                    disabled
+                        >
+                            <el-option
+                            
+                                v-for="item in TimeOptions1"
+                                :key="item.value"
+                              :label="item.label"
+                                :value="item.value"
+                            ></el-option>
+                        </el-select>
+                             <el-select
+                            class="sl1"
+                       
+                            v-model="sesstion.rwselect"
+                            placeholder="请选择"
+                            v-if="sestion == 2"
+                        
+                        >
+                            <el-option
+                              
+                                v-for="item in TimeOptions1"
+                                :key="item.value"
+                               :label="item.label"
+                                :value="item.value"
+                            ></el-option>
+                        </el-select>
+                             <el-select
+                            class="sl1"
+                       
+                            v-model="rwselect"
+                            placeholder="请选择"
+                            v-if="sestion == 3"
+                    
+                        >
+                            <el-option
+                                v-for="item in TimeOptions1"
+                                :key="item.value"
+                               :label="item.label"
+                                :value="item.value"
+                            ></el-option>
+                        </el-select>
+                                <!-- <select name id @change="endValue()" v-model="sesstion.endTimeUnit" v-if="sestion == 1">
+                                    <option v-for="(item,index) in sametimearr" :key="index" :value="item">{{item}}</option>
+                                </select>
+                                <select name id @change="endValue()" v-model="sesstion.endTimeUnit" v-if="sestion == 2" disabled>
+                                    <option v-for="(item,index) in sametimearr" :key="index" :value="item">{{item}}</option>
+                                </select>
+                                <select name id @change="endValue()" v-model="sesstion.endTimeUnit" v-if="sestion == 3">
+                                    <option v-for="(item,index) in sametimearr" :key="index" :value="item">{{item}}</option>
+                                </select> -->
+                            </div>
+                    <!-- <el-date-picker
                         @change="endFun"
                         v-model="endtime"
                         type="datetime"
@@ -260,11 +331,16 @@
                         type="datetime"
                         v-if="sestion == 2"
                         placeholder="选择日期时间"
-                    ></el-date-picker>
+                    ></el-date-picker> -->
+                </div>
+                   <el-tooltip effect="dark" content="设置当前计划，首个任务的开始时间，计划进行即实际任务的执行" placement="bottom">
+                                <div class="showtext1">
+                                  <i class="el-icon-question"></i>
                                 </div>
+                            </el-tooltip>
                 <div class="table_inspection">
                     <div class="inspection_left">
-                        <span class="name_text">巡检周期</span>
+                        <span class="name_text">重复任务周期</span>
                         <input
                             class="name_ipt"
                             v-model="inspecionNum"
@@ -333,7 +409,7 @@
                     </div>
 
                     <div class="inspection_right">
-                        <span class="time_text">到期时间</span>
+                        <span class="time_text">计划到期时间</span>
                         <el-date-picker
                             @change="expireFun"
                             v-if="sestion == 3"
@@ -358,10 +434,14 @@
                         ></el-date-picker>
                     </div>
                 </div>
-
+<el-tooltip effect="dark" content="一个任务结束后，根据任务开始时间和周期时间，自动生成下一个任务" placement="bottom">
+                                <div class="showtext">
+                                  <i class="el-icon-question"></i>
+                                </div>
+                            </el-tooltip>
                 <div class="table_inspection">
                     <div class="inspection_left">
-                        <span class="name_text">提前提醒</span>
+                        <span class="name_text">任务提前提醒</span>
                         <input
                             class="name_ipt"
                             v-model="inspectionNum2"
@@ -426,7 +506,7 @@
                         </el-select>
                     </div>
                     <div class="inspection_right">
-                        <span class="name-text">是否启用</span>
+                        <span class="name-text">计划执行状态</span>
                         <el-select v-model="hsavalue" placeholder="请选择" v-if="sestion == 3">
                             <el-option
                                 v-for="item in hasoptions"
@@ -464,7 +544,7 @@
                 </div>
                 <div class="inspection_ipt">
                     <div class="inspection_left">
-                        <span class="name_text">巡检备注</span>
+                        <span class="name_text">任务执行内容</span>
                     </div>
                     <div class="inspection_right">
                         <input
@@ -505,6 +585,7 @@
                     <div class="id">序号</div>
                     <div class="name">设备名称</div>
                     <div class="num">设备编号</div>
+
                     <div class="setType">设备类型</div>
                     <div class="typeNum">设备型号</div>
                     <div class="type">类型</div>
@@ -521,6 +602,7 @@
                                 :class="{nowcheck:nowcheck == i.Number}"
                             >{{i.DeviceName}}</div>
                             <div class="num" :class="{nowcheck:nowcheck == i.Number}">{{i.DeviceNo}}</div>
+
                             <div
                                 class="setType"
                                 :class="{nowcheck:nowcheck == i.Number}"
@@ -558,6 +640,7 @@
                                 :class="{nowcheck:nowcheck == i.Number}"
                             >{{i.DeviceName}}</div>
                             <div class="num" :class="{nowcheck:nowcheck == i.Number}">{{i.DeviceNo}}</div>
+
                             <div
                                 class="setType"
                                 :class="{nowcheck:nowcheck == i.Number}"
@@ -596,6 +679,7 @@
                                 :class="{nowcheck:nowcheck == i.Number}"
                             >{{i.DeviceName}}</div>
                             <div class="num" :class="{nowcheck:nowcheck == i.Number}">{{i.DeviceNo}}</div>
+
                             <div
                                 class="setType"
                                 :class="{nowcheck:nowcheck == i.Number}"
@@ -651,9 +735,20 @@
             <div class="conter">
                 <div class="conter_title">
                     <span class="name_text">设备类型</span>
-                    <select class="conter_ipt" v-model="Meter3" @click.stop="treechange">
-                        <option class="option2" :value="Meter3">{{Meter3}}</option>
-                    </select>
+                     <div class="selectClass">
+                          <el-select v-model="Meter" placeholder="请选择">
+                            <el-option
+                            :label="Meter"
+                            :value="Meter">
+                            </el-option>
+                        </el-select>
+                        </div>
+                            <!-- <div class="seleword2" @click.stop="treechange">
+                                <div class="seleword1">
+                                    {{Meter3}}
+                                <img :src="xiala" alt />
+                                </div>
+                                </div> -->
 
                     <div class="selectword selectword2" v-if="treetrue">
                         <el-tree
@@ -673,7 +768,7 @@
                         </el-tree>
                     </div>
 
-                    <input class="conter_ipt" type="text" v-model="keyWord" placeholder="请输入关键字" />
+                    <input class="conter_ipt tinput1" type="text" v-model="keyWord" placeholder="请输入关键字" />
                     <div @click="queryBtnFun" class="conter_btn">查询</div>
                 </div>
                 <div class="conter_middle">
@@ -683,6 +778,10 @@
                         </div>
                         <div class="name">设备名称</div>
                         <div class="id">设备编号</div>
+                        
+                        <div class="name">工序名称</div>
+                        <div class="name">线体名称</div>
+
                         <div class="type">设备类型</div>
                         <div class="typeNum">设备型号</div>
                     </div>
@@ -694,6 +793,10 @@
                             </div>
                             <div class="name">{{item.DeviceName}}</div>
                             <div class="id">{{item.DeviceNo}}</div>
+                            
+                            <div class="name">{{item.CellName}}</div>
+                            <div class="name">{{item.LineName}}</div>
+
                             <div class="type">{{item.DeviceType}}</div>
                             <div class="typeNum">{{item.DeviceModel}}</div>
                         </div>
@@ -712,6 +815,7 @@
 
 <script>
 import MySearch from '../public/search01.vue';
+import moment from 'moment'
 // import MyPage from '../public/Pages.vue';
 import XLSX from 'xlsx';
 export default {
@@ -778,7 +882,7 @@ export default {
             selectname: [],
             selectname1: [],
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meterid: '',
             Meter1: '不限',
             Meter2: '不限',
@@ -822,12 +926,30 @@ export default {
             //
             hasoptions: [
                 {
-                    value: '是',
-                    label: '是'
+                    value: '启用',
+                    label: '启用'
+                },
+                {
+                    value: '停止',
+                    label: '停止'
+                }
+            ],
+    TimeOptions1: [
+                {
+                    value: '小时',
+                    label: '小时'
+                },
+                {
+                    value: '天',
+                    label: '天'
+                },
+                {
+                    value: '周',
+                    label: '周'
                 },
                 {
-                    value: '否',
-                    label: '否'
+                    value: '月',
+                    label: '月'
                 }
             ],
 
@@ -868,7 +990,8 @@ export default {
                     label: '月'
                 }
             ],
-            hsavalue: '是',
+            // xiala:require('../../assets/images/ziyuan4.png'),
+            hsavalue: '启用',
             addShow: false, //弹窗是否显示
             equipmentShow: false,
             timeValue: '小时',
@@ -883,31 +1006,155 @@ export default {
             startimeS: '', //时间戳,
             treetrue: false,
             planName: '',
-
-            inspecionNum: '',
-            inspectionNum2: '',
+            rwselect:'小时',
+            inspecionNum: 2,
+            inspectionNum2: 1,
             reduceTime: '',
             EquipmentTypeAll: [],
+            EquipmentTypeAll2:[],
             deviceType: '',
             keyWord: '',
             checkArr: [],
+            checkArr2:[],
             checkDeleArr: [],
             RemarksText: '',
             ValueSID: '',
             SID: '',
-            yidata: ''
+            yidata: '',
+            jurisdiction:[],
+            buttonarr:[],
+            cxid:'',
+            cxshow:true,
+            tjid:"",
+            tjshow:true,
+            scid:'',
+            scshow:true,
+            ckid:'',
+            ckshow:true,
+            bjid:'',
+            bjshow:true,
+            zxtime:1,
+            rwtime:1,
         };
     },
 
     created() {
+              this.jurisdiction = this.$store.state.btnPowerData
+     this.buttonarr = this.findPathByLeafId(this.GetUrlParam('id'),this.jurisdiction)[0].Children
+     console.log("dsad",this.buttonarr)
+         this.buttonarr.forEach((item)=>{
+         if(item.RightName == "点巡检计划-查询按钮"){
+          this.cxid = item.RightID
+         }else if(item.RightName == "点巡检计划-添加按钮"){
+          this.tjid = item.RightID
+         }else if(item.RightName == "点巡检计划-删除按钮"){
+          this.scid = item.RightID
+         }else if(item.RightName == "点巡检计划-查看按钮"){
+          this.ckid = item.RightID
+         }else if(item.RightName == "点巡检计划-编辑按钮"){
+          this.bjid = item.RightID
+         }
+     })
+      var userid = ''
+      if (!JSON.parse(sessionStorage.getItem('userInfo1'))) {
+                userid = JSON.parse(
+                    sessionStorage.getItem('sightseerInfo1')
+                ).SCMSUserID;
+            } else {
+                userid = JSON.parse(
+                    sessionStorage.getItem('userInfo1')
+                ).SCMSUserID;
+            }
+             this.$axios({
+                  method: 'post',
+                  url: `/api/UserManage/UserManage_CheckAuthority?argUserID=${userid}&argRightID=${this.cxid}`,
+              }).then(res => {
+                  this.cxshow = res.data.data
+              
+              }).catch((err)=>{
+                  console.log('err',err)
+              })
+               this.$axios({
+                  method: 'post',
+                  url: `/api/UserManage/UserManage_CheckAuthority?argUserID=${userid}&argRightID=${this.tjid}`,
+              }).then(res => {
+                  this.tjshow = res.data.data
+              
+              }).catch((err)=>{
+                  console.log('err',err)
+              })
+               this.$axios({
+                  method: 'post',
+                  url: `/api/UserManage/UserManage_CheckAuthority?argUserID=${userid}&argRightID=${this.scid}`,
+              }).then(res => {
+                  this.scshow = res.data.data
+              
+              }).catch((err)=>{
+                  console.log('err',err)
+              })
+               this.$axios({
+                  method: 'post',
+                  url: `/api/UserManage/UserManage_CheckAuthority?argUserID=${userid}&argRightID=${this.ckid}`,
+              }).then(res => {
+                  this.ckshow = res.data.data
+              
+              }).catch((err)=>{
+                  console.log('err',err)
+              })
+               this.$axios({
+                  method: 'post',
+                  url: `/api/UserManage/UserManage_CheckAuthority?argUserID=${userid}&argRightID=${this.bjid}`,
+              }).then(res => {
+                  this.bjshow = res.data.data
+              
+              }).catch((err)=>{
+                  console.log('err',err)
+              })
         this.getEquipmentType();
         this.req(1);
         this.time4 = this.getNowTime();
         this.InspectingPeopleAxios();
-        this.getDate();
+        // this.getDate();
         this.initTime();
     },
     methods: {
+           findPathByLeafId(id,node,path){
+        if(!path){
+             path = []
+         }
+        for(let i=0;i<node.length;i++){
+          var temPath = path.concat();
+        
+          if(id == node[i].RightID){
+                temPath.push(node[i])
+           return temPath
+          }
+          if(node[i].Children){
+           var findResult = this.findPathByLeafId(id,node[i].Children,temPath)
+           if(findResult){
+           return findResult
+           }
+          }
+        }
+        },
+          GetUrlParam(paraName) {
+        let url = document.location.toString();
+        let arrObj = url.split("?");
+        if (arrObj.length > 1) {
+            let arrPara = arrObj[1].split("&");
+            let arr;
+           for(let i=0;i<arrPara.length;i++){
+            arr = arrPara[i].split("=");
+            if(arr&&arr[0] == paraName){
+              
+               return arr[1]
+            }
+           }
+           return ''
+        }else {
+            return ''
+        }
+          },
         currStationChange(val) {
             this.$forceUpdate();
             this.$nextTick(function() {
@@ -934,14 +1181,11 @@ export default {
             return arr;
         },
         shang() {
-            console.log('ss==>',this.yinum)
             if (this.yinum !== 0) {
                 this.swapArray(this.checkArr, this.yinum, this.yinum - 1);
                 this.yinum--;
             }
          
-           console.log('nn',this.yinum)
-         
         },
         xia() {
        
@@ -953,6 +1197,12 @@ export default {
         },
 
         deldata1() {
+              if(!this.scshow){
+                   this.tipchange = true;
+                 this.pdyd1 = true;
+                this.tipword = `该账户无操作权限！`;
+                return
+            }
             let i = 0;
             let a = [];
             for (i in this.list) {
@@ -987,7 +1237,7 @@ export default {
                     this.tipword = res.data.data;
                     this.tipchange = true;
                      this.pdyd1 = true;
-                    this.sad();
+                    this.sad(1);
                 });
         },
         no1(){
@@ -1006,14 +1256,27 @@ export default {
         timeValueFun() {},
         //添加查询
         queryBtnFun() {
-            this.addPopAxios();
+            // this.addPopAxios();
+             let reg = new RegExp(this.keyWord);
+            this.EquipmentTypeAll = []
+            for(let i=0;i<this.EquipmentTypeAll2.length;i++){
+                if (reg.test(this.EquipmentTypeAll2[i].DeviceName) || reg.test(this.EquipmentTypeAll2[i].DeviceNo) || 
+                reg.test(this.EquipmentTypeAll2[i].DeviceModel) || reg.test(this.EquipmentTypeAll2[i].PersonInCharge)) {
+                    this.EquipmentTypeAll.push(this.EquipmentTypeAll2[i])
+                }
+            }
         },
         treechange() {
             this.selectword2();
         },
         //开启添加弹窗
         addPopFun() {
-
+              if(!this.tjshow){
+                   this.tipchange = true;
+                 this.pdyd1 = true;
+                this.tipword = `该账户无操作权限！`;
+                return
+            }
             this.getDate();
             this.nowcheck = '';
             this.sestion = 3;
@@ -1022,14 +1285,18 @@ export default {
             this.checkArr = [];
             this.checkDeleArr1 = [];
             this.planName = '';
-            this.inspecionNum = '';
-            this.inspectionNum2 = '';
+            this.inspecionNum = 2;
+            this.inspectionNum2 = 1;
             this.timeValue = '小时';
             this.timeValuee = '小时';
-            this.hsavalue = '是';
+            this.hsavalue = '启用';
             this.RemarksText = '';
+            this.rwselect = '小时';
               this.addShow = true;
+               this.userValue = 'SuperAdmin'
               this.pdyd3 = true;
+            this.rwtime = 1
+                 this.Expiretime = moment(this.startime).add(Number(6),"days").format("YYYY-MM-DD HH:mm:ss")
            
         },
         //关闭添加弹窗
@@ -1050,21 +1317,38 @@ export default {
         },
         //关闭设备弹窗
         EquipmentCancelFun() {
-            if (this.sestion == 3) {
-                // this.checkArr = [];
-                this.checkArr = this.checkArr11;
-            } else {
-                this.checkArr = this.checkArr1;
-            }
+             this.checkArr2 = []
+            // console.log('(this.sestion',this.sestion)
+            // if (this.sestion == 3) {
+            //     // this.checkArr = [];
+            //     this.checkArr = this.checkArr11;
+            // } else {
+            //     this.checkArr = this.checkArr1;
+            // }
 
             this.equipmentShow = false;
         },
         //确定设备弹窗
         EquipmentQuerFun() {
+
+             var checkArr2arr = []
+            for(let i=0;i<this.checkArr.length;i++){
+                checkArr2arr.push(this.checkArr[i].AID)
+            }
+            var check = []
+            for(let j=0;j<this.checkArr2.length;j++){
+                var index = checkArr2arr.indexOf(this.checkArr2[j].AID)
+                if(index == -1){
+                    check.push(this.checkArr2[j])
+                }
+            }
+
+            this.checkArr = JSON.parse(JSON.stringify(this.checkArr.concat(check)))
             this.equipmentShow = false;
             for (let i = 0; i < this.checkArr.length; i++) {
                 this.checkArr[i].Number = i + 1;
             }
+             this.checkArr2 = []
         },
         //开启设备关联弹窗
         inspectionAddFun() {
@@ -1089,15 +1373,26 @@ export default {
             }
 
             if (this.checkDeleArr.length != 0) {
-                var tt = false;
-                for (var i = 0; i < this.checkDeleArr.length; i++) {
-                    var ind = this.checkDeleArr[i];
-                    if (tt) {
-                        ind = ind - 1;
-                    }
+                // var tt = false;
+                // for (var i = 0; i < this.checkDeleArr.length; i++) {
+                //     var ind = this.checkDeleArr[i];
+                //     if (tt) {
+                //         ind = ind - 1;
+                //     }
 
-                    this.checkArr.splice(ind, 1);
-                    tt = true;
+                //     this.checkArr.splice(ind, 1);
+                //     tt = true;
+                // }
+                  var deleteArr = []
+                for(let i=0;i<this.checkDeleArr.length;i++){
+                    deleteArr.push(this.checkArr[this.checkDeleArr[i]])
+                }
+                for(let k=0;k<this.checkArr.length;k++){
+                    var index = deleteArr.indexOf(this.checkArr[k])
+                    if(index != -1){
+                        this.checkArr.splice(k, 1);
+                        k--
+                    }
                 }
 
                 var checkDom = this.$refs.checkipt1;
@@ -1106,6 +1401,7 @@ export default {
                 }
                 this.checkDeleArr = [];
             }
+             this.AllShow = false
         },
         // 巡检人接口
         InspectingPeopleAxios() {
@@ -1118,6 +1414,7 @@ export default {
                 argKeyWord: ''
             })
                 .then(res => {
+                    console.log("巡检人",res)
                     var data = res.data.data.DataList;
                     this.useroptions = [];
                     this.userValue = data[0].UserAccount;
@@ -1128,6 +1425,7 @@ export default {
                         };
                         this.useroptions.push(value);
                     }
+                   
                 })
                 .catch(function(error) {
                     // console.log(error);
@@ -1141,7 +1439,7 @@ export default {
             var mothe = month > 9 ? month : '0' + month; //获取当前日
             var date = myDate.getDate();
             var da = date > 9 ? date : '0' + date;
-            var h = myDate.getHours(); //获取当前小时数(0-23)
+            var h = myDate.getHours()+1; //获取当前小时数(0-23)
             var he = h > 9 ? h : '0' + h;
             var m = myDate.getMinutes(); //获取当前分钟数(0-59)
             var me = m > 9 ? m : '0' + m;
@@ -1156,6 +1454,7 @@ export default {
         },
         //转为日期时间
         getTime(dt) {
+            dt = new Date(dt)
             var year = dt.getFullYear(); //获取当前月
             var month = dt.getMonth() + 1;
             var mothe = month > 9 ? month : '0' + month; //获取当前日
@@ -1176,6 +1475,17 @@ export default {
             time = time.replace(/-/g, '/'); // 把所有-转化成/
             let timestamp = new Date(time).getTime();
             return timestamp;
+        },
+            endValue(time,stime,endtime){
+            if(time == '小时'){
+               return moment(stime).add(Number(endtime),"hours").format("YYYY-MM-DD HH:mm:ss")
+            }else if(time == '天'){
+              return  moment(stime).add(Number(endtime),"days").format("YYYY-MM-DD HH:mm:ss")
+            }else if(time == '周'){
+              return  moment(stime).add(Number(endtime),"weeks").format("YYYY-MM-DD HH:mm:ss")
+            }else if(time == '月'){
+               return moment(stime).add(Number(endtime),"months").format("YYYY-MM-DD HH:mm:ss")
+            }
         },
         initTime() {
             var da1 = this.startime;
@@ -1208,7 +1518,22 @@ export default {
         },
         //添加弹窗确定按钮
         addQuerFun() {
+            console.log('确定了',this.sestion)
             if (this.sestion == 3) {
+              
+                 if(this.rwselect == '小时'){
+               this.endtime  = 
+                moment(this.startime).add(Number(this.rwtime),"hours").format("YYYY-MM-DD HH:mm:ss")
+            }else if(this.rwselect == '天'){
+               this.endtime  = 
+                moment(this.startime).add(Number(this.rwtime),"days").format("YYYY-MM-DD HH:mm:ss")
+            }else if(this.rwselect == '周'){
+               this.endtime  = 
+                moment(this.startime).add(Number(this.rwtime),"weeks").format("YYYY-MM-DD HH:mm:ss")
+            }else if(this.rwselect == '月'){
+               this.endtime = 
+                moment(this.startime).add(Number(this.rwtime),"months").format("YYYY-MM-DD HH:mm:ss")
+            }
                 if (this.planName == '') {
                     this.tipchange = true;
                      this.pdyd1 = true;
@@ -1216,13 +1541,13 @@ export default {
                     return;
                 }
                 var newDate = new Date().getTime();
-                if (newDate > this.startimeS) {
+                if (newDate > this.startime) {
                     this.tipchange = true;
                      this.pdyd1 = true;
                     this.tipword = '开始时间必须大于当前时间';
                     return;
                 }
-                if (this.endtimeS <= this.startimeS) {
+                if (this.endtime <= this.startime) {
                     this.tipchange = true;
                      this.pdyd1 = true;
                     this.tipword = '结束时间必须大于开始时间';
@@ -1318,6 +1643,7 @@ export default {
                         }
                     }
                 }
+               console.log('eee')
                 //注意
                 if (this.checkArr.length == 0) {
                     this.tipchange = true;
@@ -1336,7 +1662,7 @@ export default {
                 }
 
                 //巡检判断结束
-                if (this.ExpiretimeS <= this.endtimeS) {
+                if (this.Expiretime <= this.endtime) {
                     this.tipchange = true;
                      this.pdyd1 = true;
                     this.tipword = '到期时间必须大于结束时间';
@@ -1390,18 +1716,20 @@ export default {
                     PeriodUnit: this.PeriodUnit,
                     ReminderTimeValue: Number(this.inspectionNum2),
                     ReminderTimeUnit: this.ReminderTimeUnit,
-                    IsEnabled: this.hsavalue == '是' ? true : false,
+                    IsEnabled: this.hsavalue == '启用' ? true : false,
                     Remarks: this.RemarksText,
                     DeviceAndStandardGroup: []
                 };
                    
                 var checkArrSid = [];
                 for (var t = 0; t < this.checkArr.length; t++) {
-                    checkArrSid.push(this.checkArr[t].SIDValue);
+                    checkArrSid.push(this.checkArr[t].AID);
                 }
+
+              
                 for (var w = 0; w < this.EquipmentTypeAll.length; w++) {
                     var indexof = checkArrSid.indexOf(
-                        this.EquipmentTypeAll[w].SIDValue
+                        this.EquipmentTypeAll[w].AID
                     );
 
                     if (indexof != -1) {
@@ -1436,8 +1764,6 @@ export default {
                     .catch(function(error) {
                         console.log('errss', error);
                     });
-
-                console.log('EquipmentTypeAll', this.EquipmentTypeAll);
             } else {
                 if (this.sesstion.PeriodUnit == '小时') {
                     this.sesstion.PeriodUnit = 1;
@@ -1457,9 +1783,9 @@ export default {
                 } else if (this.sesstion.ReminderTimeUnit == '月') {
                     this.sesstion.ReminderTimeUnit = 4;
                 }
-                if (this.sesstion.IsEnabled == '是') {
+                if (this.sesstion.IsEnabled == '启用') {
                     this.sesstion.IsEnabled = true;
-                } else if (this.sesstion.IsEnabled == '否') {
+                } else if (this.sesstion.IsEnabled == '停止') {
                     this.sesstion.IsEnabled = false;
                 }
                 let a = [
@@ -1475,6 +1801,54 @@ export default {
                     b.DeviceID = this.checkArr[i].AID;
                     b.StandardID = this.checkArr[i].SID;
                     a.push(b);
+                }
+                 if(this.sesstion.rwselect == '小时'){
+              this.sesstion.CurrentEndTime = 
+                moment(this.sesstion.CurrentStartTime).add(Number(this.sesstion.rwtime),"hours").format("YYYY-MM-DD HH:mm:ss")
+            }else if(this.sesstion.rwselect == '天'){
+              this.sesstion.CurrentEndTime = 
+                moment(this.sesstion.CurrentStartTime).add(Number(this.sesstion.rwtime),"days").format("YYYY-MM-DD HH:mm:ss")
+            }else if(this.sesstion.rwselect == '周'){
+              this.sesstion.CurrentEndTime = 
+                moment(this.sesstion.CurrentStartTime).add(Number(this.sesstion.rwtime),"weeks").format("YYYY-MM-DD HH:mm:ss")
+            }else if(this.sesstion.rwselect == '月'){
+              this.sesstion.CurrentEndTime= 
+                moment(this.sesstion.CurrentStartTime).add(Number(this.sesstion.rwtime),"months").format("YYYY-MM-DD HH:mm:ss")
+            }
+              //判断是否存在相同设备或未选择的巡检项目
+              console.log('aaaaaaaa',a)
+              if(a.length){
+                  var StandardIDArr = []
+                  var isStandard = true
+                  var StandardIndex
+                  for(let o=0;o<a.length;o++){
+                      if(typeof(a[o].StandardID) != 'string'){
+                         this.tipchange = true;
+                         this.pdyd1 = true;
+                         this.tipword = `请选择巡检设备第${o + 1}行的巡检项目！`;
+                        return;
+                      }else{
+                          console.log('a[o]',a[o])
+                          StandardIDArr.push(a[o].DeviceID)
+                      }
+                  }
+                  var indexArr = []
+                  for(let o1=0;o1<StandardIDArr.length;o1++){
+                      let ind = indexArr.indexOf(StandardIDArr[o1])
+                       if(ind == -1){
+                          indexArr.push(StandardIDArr[o1])
+                       }else{
+                           isStandard = false
+                           StandardIndex = o1
+                       }
+                  }
+                  if(!isStandard){
+                      this.tipchange = true;
+                      this.pdyd1 = true;
+                      this.tipword = `巡检设备第${StandardIndex + 1}行已存在相同标准的设备，请重新选择`;
+                       return;
+                  }
+                
               }
 
                 this.$axios({
@@ -1498,7 +1872,7 @@ export default {
                     }
                 }).then(res => {
                     if (res.data.code == 0) {
-                        this.sad();
+                        this.sad(1);
                         this.addShow = false;
                         this.tipchange = true;
                          this.pdyd1 = true;
@@ -1506,6 +1880,9 @@ export default {
                     } else {
                         this.tipchange = true;
                          this.pdyd1 = true;
+                         console.log('aaa',this.checkArr)
+
+
                         this.tipword = res.data.msg;
                         if (this.sesstion.PeriodUnit == 1) {
                             this.sesstion.PeriodUnit = '小时';
@@ -1527,9 +1904,9 @@ export default {
                         }
 
                         if (this.sesstion.IsEnabled == true) {
-                            this.sesstion.IsEnabled = '是';
+                            this.sesstion.IsEnabled = '启用';
                         } else if (this.sesstion.IsEnabled == false) {
-                            this.sesstion.IsEnabled = '否';
+                            this.sesstion.IsEnabled = '停止';
                         }
                     }
                 });
@@ -1546,16 +1923,18 @@ export default {
             if (this.Meter3id == '11111111-1111-1111-1111-111111111111') {
                 this.deviceType = '';
             }
+            console.log('keyWord',this.keyWord)
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${this.deviceType}&argKeyword=${this.keyWord}&argPageIndex=1&argPageSize=50`,
+                url: `/api/PointInspectionManage/PointInspectionManage_GstEquipmentAccount?argDeviceType=&argKeyword=${this.keyWord}&argPageIndex=1&argPageSize=50`,
                 argDeviceType: this.deviceType,
                 argKeyword: this.keyWord,
                 argPageIndex: 1,
                 argPageSize: 50
             })
                 .then(res => {
-                    var dataAll = res.data.data.DataList;
+                    console.log('设备',res.data.data)
+                    var dataAll = res.data.data;
 
                     this.$axios({
                         method: 'post',
@@ -1564,18 +1943,22 @@ export default {
                         argKeyword: ''
                     })
                         .then(res => {
+                            
                             var data = res.data.data;
+                            console.log('添加',data)
                             var AIDShow = false;
                             this.EquipmentTypeAll = [];
                             for (let i = 0; i < dataAll.length; i++) {
                                 this.typeArr = [];
                                 this.SID = [];
-
+                                    console.log('设备类型',dataAll[i])
                                 var value = {
                                     DeviceName: dataAll[i].DeviceName,
                                     DeviceNo: dataAll[i].DeviceNo,
                                     DeviceModel: dataAll[i].DeviceModel,
                                     DeviceType: dataAll[i].DeviceType,
+                                    CellName:dataAll[i].CellName,
+                                    LineName:dataAll[i].LineName,
                                     type: this.typeArr,
                                     AID: dataAll[i].AID,
                                     value: '',
@@ -1608,17 +1991,8 @@ export default {
                                                 };
                                                 this.SID.push(value2);
                                                 AIDShow = true;
-                                                // break;
                                             }
-                                            // else{
-                                            //     AIDShow = false
-                                            //     this.typeArr = [];
-                                            //     this.SID = [];
-                                            // }
                                         }
-                                        // if(AIDShow){
-                                        //     break;
-                                        // }
                                     } else {
                                         AIDShow = false;
                                         this.typeArr = [];
@@ -1636,10 +2010,7 @@ export default {
                                 this.EquipmentTypeAll.push(value);
                             }
 
-                            console.log(
-                                'EquipmentTypeAll',
-                                this.EquipmentTypeAll
-                            );
+                          this.EquipmentTypeAll2 = this.EquipmentTypeAll
                         })
                         .catch(function(error) {
                             console.log('err111111111111111111111', error);
@@ -1653,10 +2024,12 @@ export default {
         checkFun(item, index) {
             var checkDom = this.$refs.checkipt;
             if (checkDom[index].checked) {
-                this.checkArr.push(item);
+                // this.checkArr.push(item);
+                this.checkArr2.push(item)
             } else {
                 var a = this.checkArr.indexOf(item);
-                this.checkArr.splice(a, 1);
+                // this.checkArr.splice(a, 1);
+                 this.checkArr2.splice(a, 1);
             }
 
             //全选框是否选中
@@ -1668,30 +2041,34 @@ export default {
                     break;
                 }
             }
+   
         },
         //全选框
         checkAllFun() {
             if (this.$refs.checkiptAll.checked) {
-
                 if(this.checkArr.length != 0){
-
+                     this.checkArr2 =  []
                     for(var j=0;j<this.EquipmentTypeAll.length;j++){
-                        this.checkArr.push(this.EquipmentTypeAll[j])
+                        // this.checkArr.push(this.EquipmentTypeAll[j])
+                        this.checkArr2.push(this.EquipmentTypeAll[j])
                     }
                 }else{
-                    this.checkArr = this.EquipmentTypeAll;
+                    // this.checkArr = this.EquipmentTypeAll;
+                    this.checkArr2 = JSON.parse(JSON.stringify(this.EquipmentTypeAll))
                 }
-                   
-                for (let i1 = 0; i1 < this.checkArr.length; i1++) {
-                    this.checkArr[i1].Number = i1 + 1;
+                for (let i1 = 0; i1 < this.checkArr2.length; i1++) {
+                    // this.checkArr[i1].Number = i1 + 1;
+                    this.checkArr2[i1].Number = i1 + 1;
                 }
             } else {
-                this.checkArr = this.checkArr11;
+                // this.checkArr = this.checkArr11;
+                this.checkArr2 = []
             }
             var checkDom = this.$refs.checkipt;
             for (var i = 0; i < checkDom.length; i++) {
                 checkDom[i].checked = this.$refs.checkiptAll.checked;
             }
+           
         },
         //添加弹窗单选框
         checkFun1(item, index) {
@@ -1750,7 +2127,7 @@ export default {
             );
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
@@ -1834,6 +2211,13 @@ export default {
         },
 
         handleEdit(a, b) {
+        
+              if(!this.ckshow){
+                   this.tipchange = true;
+                 this.pdyd1 = true;
+                this.tipword = `该账户无操作权限！`;
+                return
+            }
             this.nowcheck = '';
             this.setionchange = true;
             this.sestion = 1;
@@ -1861,9 +2245,9 @@ export default {
                 b.ReminderTimeUnit = '月';
             }
             if (b.IsEnabled == false) {
-                b.IsEnabled = '否';
+                b.IsEnabled = '停止';
             } else {
-                b.IsEnabled = '是';
+                b.IsEnabled = '启用';
             }
             let aaa = b.MaturityTime.indexOf('/');
             if (aaa == 0) {
@@ -1871,23 +2255,62 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/PointInspectionManage/PointInspectionManage_GstStandard?argDeviceType&argKeyword`,
+                url: `/api/PointInspectionManage/PointInspectionManage_GstStandard?argDeviceType&argKeyword&argPageSize=50000000&argPageIndex=1`,
                 argDeviceType: '',
                 argKeyword: ''
             }).then(res => {
-                for (let i = 0; i < res.data.data.length; i++) {
+                for (let i = 0; i < res.data.data.DataList.length; i++) {
                     for (let j = 0; j < b.Devices.length; j++) {
-                        if (b.Devices[j].SID == res.data.data[i].ID) {
-                            b.Devices[j].Name = res.data.data[i].Name;
+                        if (b.Devices[j].SID == res.data.data.DataList[i].ID) {
+                            b.Devices[j].Name = res.data.data.DataList[i].Name;
+                            console.log('设备名称',res.data.data.DataList[i])
+                            b.Devices[j].DeviceType = res.data.data.DataList[i].DeviceType;
+                            // for(let a =0;a<res.data.data.DataList[i].Devices.length;a++){
+                            //     if(b.Devices[j].AID==res.data.data.DataList[i].Devices[a].AID){
+                            //         b.Devices[j].DeviceType = res.data.data.DataList[i].Devices[a].DevicePath
+                            //     }
+                            // }
                         }
                     }
                 }
+
+           
                 this.checkArr = b.Devices;
             });
 
             this.sesstion = b;
+            var startime = moment( this.sesstion.CurrentStartTime)
+            var endtime = moment( this.sesstion.CurrentEndTime)
+            var jsvalue = endtime.diff(startime,'hours')
+            var ss =  this.sesstion.CurrentStartTime.slice(8)
+            var ee =  this.sesstion.CurrentEndTime.slice(8)
+            var cc = ss == ee
+            console.log('jsvalue==>',jsvalue)
+           if(cc){
+                jsvalue = endtime.diff(startime,'months')
+                 this.sesstion.rwtime = jsvalue
+                 this.sesstion.rwselect = '月'
+           }else{
+               if(jsvalue % 168 == 0){
+                    this.sesstion.rwtime = jsvalue / 168
+                    this.sesstion.rwselect = '周'
+               }else if(jsvalue % 24 == 0){
+                    this.sesstion.rwtime = jsvalue / 24
+                    this.sesstion.rwselect = '天'
+               }else{
+                    this.sesstion.rwtime = jsvalue
+                    this.sesstion.rwselect = '小时'
+               }
+           }
         },
         handleEdit2(a, b) {
+           
+              if(!this.bjshow){
+                   this.tipchange = true;
+                 this.pdyd1 = true;
+                this.tipword = `该账户无操作权限！`;
+                return
+            }
             this.nowcheck = '';
             this.setionchange = true;
             this.sestion = 2;
@@ -1896,6 +2319,7 @@ export default {
              this.pdyd3 = true;
             b.a = parseInt(b.PeriodStr);
             b.b = parseInt(b.ReminderTimeValue);
+         
             if (b.PeriodUnit == 1) {
                 b.PeriodUnit = '小时';
             } else if (b.PeriodUnit == 2) {
@@ -1915,9 +2339,9 @@ export default {
                 b.ReminderTimeUnit = '月';
             }
             if (b.IsEnabled == false) {
-                b.IsEnabled = '否';
+                b.IsEnabled = '停止';
             } else {
-                b.IsEnabled = '是';
+                b.IsEnabled = '启用';
             }
             let aaa = b.MaturityTime.indexOf('/');
             if (aaa == 0) {
@@ -1930,6 +2354,7 @@ export default {
                 argDeviceType: '',
                 argKeyword: ''
             }).then(res => {
+                console.log(res)
                 var a = [];
                 for (let z = 0; z < res.data.data.length; z++) {
                     let b = {};
@@ -1938,20 +2363,50 @@ export default {
                     b.label = res.data.data[z].Name;
                     a.push(b);
                 }
-
+                 console.log(a)
                 for (let i = 0; i < res.data.data.length; i++) {
                     for (let j = 0; j < b.Devices.length; j++) {
                         b.Devices[j].type = a;
 
                         if (b.Devices[j].SID == res.data.data[i].ID) {
                             b.Devices[j].Name = res.data.data[i].Name;
+                            // console.log('设备名称',res.data.data[i])
+                            // b.Devices[j].DeviceType = res.data.data[i].DeviceType;
+                            //  for(let a =0;a<res.data.data[i].Devices.length;a++){
+                            //     if(b.Devices[j].AID==res.data.data[i].Devices[a].AID){
+                            //         b.Devices[j].DeviceType = res.data.data[i].Devices[a].DevicePath
+                            //     }
+                            // }
                         }
                     }
                 }
+              
                 this.checkArr = b.Devices;
                 this.checkArr1 = b.Devices;
             });
             this.sesstion = b;
+                    var startime = moment( this.sesstion.CurrentStartTime)
+            var endtime = moment( this.sesstion.CurrentEndTime)
+            var jsvalue = endtime.diff(startime,'hours')
+            var ss =  this.sesstion.CurrentStartTime.slice(8)
+            var ee =  this.sesstion.CurrentEndTime.slice(8)
+            var cc = ss == ee
+           if(cc){
+                jsvalue = endtime.diff(startime,'months')
+                 this.sesstion.rwtime = jsvalue
+                 this.sesstion.rwselect = '月'
+           }else{
+               if(jsvalue % 168 == 0){
+                    this.sesstion.rwtime = jsvalue / 168
+                    this.sesstion.rwselect = '周'
+               }else if(jsvalue % 24 == 0){
+                    this.sesstion.rwtime = jsvalue / 24
+                    this.sesstion.rwselect = '天'
+               }else{
+                    this.sesstion.rwtime = jsvalue
+                    this.sesstion.rwselect = '小时'
+               }
+           }
         },
         getNowTime() {
             let date = new Date();
@@ -2047,13 +2502,12 @@ export default {
         abck() {
             if (1 < this.PageData.PageIndex && this.PageData.PageIndex !== 1) {
                 this.PageData.PageIndex--;
-
                 this.onetable();
             }
         },
         next() {
             if (
-                this.pageDate.PageIndex < this.PageData.TotalPage &&
+                this.PageData.PageIndex < this.PageData.TotalPage &&
                 this.PageData.PageIndex !== this.PageData.TotalPage
             ) {
                 this.PageData.PageIndex++;
@@ -2100,12 +2554,13 @@ export default {
 
             this.$axios
                 .post(
-                    `/api/PointInspectionManage/PointInspectionManage_GstPlan?argDeviceType=${c}&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/PointInspectionManage/PointInspectionManage_GstPlan?argDeviceType=&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
                     console.log("this",res)
                     if (res.data.code == 0) {
                         this.tableData1 = res.data.data.DataList;
+                         console.log('this.tableData1',res.data.data.ParameterList)
                         this.PageData = res.data.data.ParameterList;
                         let i = 0;
                         for (i in this.tableData1) {
@@ -2156,7 +2611,13 @@ export default {
                                 this.tableData1[i].ReminderTimeValue =
                                     this.tableData1[i].ReminderTimeValue + '年';
                             }
+                           if(this.tableData1[i].IsEnabled){
+                               this.tableData1[i].IsEnabled = '启用'
+                           }else{
+                               this.tableData1[i].IsEnabled = '停止'
+                           }
                         }
+                        console.log('this.tableData1',this.tableData1)
                     } else {
                         this.tipchange = true;
                          this.pdyd1 = true;
@@ -2252,8 +2713,13 @@ export default {
             window.onmousemove = null;
             event.currentTarget.style.cursor = 'move';
         },
-        sad() {
-            this.onetable();
+        sad(a) {
+            if(!this.cxshow&&a!==1){
+                   this.tipchange = true;
+                 this.pdyd1 = true;
+                this.tipword = `该账户无操作权限！`;
+                return
+            }
             if (
                 new Date(this.value1).getTime() >
                 new Date(this.value2).getTime()
@@ -2261,7 +2727,9 @@ export default {
                 this.tipchange = true;
                  this.pdyd1 = true;
                 this.tipword = `查询开始时间不能大于结束时间！`;
+                return
             }
+               this.onetable();
         },
         setParams(params) {
             this.searchData = params;
@@ -2273,14 +2741,14 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/PointInspectionManage/PointInspectionManage_GstEquipmentAccount?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.PageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
-                    for (i in res.data.data.DataList) {
-                        res.data.data.DataList[i].number = ++i;
+                    for (i in res.data.data) {
+                        res.data.data[i].number = ++i;
                     }
-                    this.muchdata = res.data.data.DataList;
+                    this.muchdata = res.data.data;
                 })
                 .catch(function(error) {
                     console.log(error);
@@ -2318,11 +2786,11 @@ export default {
         req(pageIndex) {
             let params = Object.assign(this.searchData, {
                 argPageIndex: pageIndex,
-                argPageSize: this.pageData.PageSize
+                argPageSize: this.PageData.PageSize
             });
             this.$axios
                 .post(
-                    `/api/EquipmentAccount/EquipmentAccount_GstEquipment`,
+                    `/api/PointInspectionManage/PointInspectionManage_GstEquipmentAccount`,
                     null,
                     {
                         params
@@ -2330,11 +2798,11 @@ export default {
                 )
                 .then(res => {
                     if (res.data.code == 0) {
-                        this.data = res.data.data.DataList;
-                        this.pageData = res.data.data.ParameterList;
+                        this.data = res.data.data;
+                        this.PageData = res.data.data.ParameterList;
                     }
                     this.pageindex = pageIndex;
-                    this.pagesize = this.pageData.PageSize;
+                    this.pagesize = this.PageData.PageSize;
                 })
                 .then(() => {
                     this.somethingdata();
@@ -2365,12 +2833,12 @@ export default {
                     }
                 })
                 .then(() => {
-                    this.sad();
+                    this.sad(1);
                 })
                 .catch(() => {
                     this.value1 = this.GMTToStr(this.value1);
                     this.value2 = this.GMTToStr(this.value2);
-                    this.sad();
+                    this.sad(1);
                 });
         }
     },
@@ -2426,6 +2894,14 @@ select {
         line-height: 32px;
     }
 }
+.is1{
+    .sl1{
+     .el-input--suffix .el-input__inner {
+         width:100%;
+     }
+    }
+}
+
 }
 
 </style>
@@ -2566,6 +3042,7 @@ select {
     }
 }
 .search-container {
+    position: relative;
     .sp1 {
         margin-left: 10px;
     }
@@ -2667,7 +3144,7 @@ select {
         width: 1130px;
         height: 600px;
         background: #eeeeee;
-        position: absolute;
+        position: fixed;
         top: 100px;
         left: 500px;
         z-index: 999;
@@ -2703,12 +3180,12 @@ select {
             background: #f4f4f4;
             margin-top: 15px;
 
-            .selectword2 {
-                position: absolute !important;
-                left: 138px !important;
-                top: 122px !important;
-                z-index: 999 !important;
-            }
+            // .selectword2 {
+            //     position: absolute !important;
+            //     left: 138px !important;
+            //     top: 122px !important;
+            //     z-index: 999 !important;
+            // }
 
             .selectword {
                 position: fixed;
@@ -2723,10 +3200,20 @@ select {
             }
 
             .conter_title {
+                position: relative;
                 width: 100%;
                 height: 30px;
                 margin-top: 15px;
                 margin-bottom: 15px;
+                .selectClass{
+                    width:180px;
+                    height:35px;
+                    display:inline-block;
+                    margin-right:15px;
+                    .el-input--suffix .el-input__inner{
+                        height:35px;
+                    }
+                }
 
                 .option2 {
                     opacity: 0;
@@ -2768,7 +3255,8 @@ select {
             overflow: auto;
 
             .middle_title {
-                width: 100%;
+                // width: 100%;
+                width:1600px;
                 height: 40px;
                 box-sizing: border-box;
                 overflow: hidden;
@@ -2777,35 +3265,35 @@ select {
 
                 .id {
                     float: left;
-                    width: 22%;
+                    width: 12%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .type {
                     float: left;
-                    width: 22%;
+                    width: 12%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .typeNum {
                     float: left;
-                    width: 22%;
+                    width: 17%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .ipt {
                     float: left;
-                    width: 12%;
+                    width: 8%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .name {
                     float: left;
-                    width: 22%;
+                    width: 17%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
@@ -2813,7 +3301,8 @@ select {
             }
 
             .middle_conter {
-                width: 100%;
+                // width: 100%;
+                width:1600px;
                 height: 40px;
                 box-sizing: border-box;
                 overflow: hidden;
@@ -2822,35 +3311,35 @@ select {
 
                 .id {
                     float: left;
-                    width: 22%;
+                    width: 12%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .type {
                     float: left;
-                    width: 22%;
+                    width: 12%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .typeNum {
                     float: left;
-                    width: 22%;
+                    width: 17%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .ipt {
                     float: left;
-                    width: 12%;
+                    width: 8%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .name {
                     float: left;
-                    width: 22%;
+                    width: 17%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
@@ -2983,7 +3472,7 @@ select {
         }
 
         .addPop_table {
-            width: 80%;
+            width: 85%;
             margin: 0 auto;
             height: 346px;
 
@@ -2996,6 +3485,9 @@ select {
 
                 .name_text {
                     font-size: 16px;
+                    display: inline-block;
+                    width: 100px;
+                    text-align: right;
                     margin-right: 15px;
                 }
                 .name_ipt {
@@ -3005,11 +3497,17 @@ select {
                 }
                 .porper_text {
                     margin-right: 15px;
-                    margin-left: 98px;
+                    display: inline-block;
+                    width: 100px;
+                    margin-left: 37px;
+                    text-align: right;
                 }
                 .time_text {
                     margin-right: 15px;
-                    margin-left: 144px;
+                    width: 100px;
+                    margin-left: 100px;
+                    text-align: right;
+                    display: inline-block;
                 }
             }
 
@@ -3031,6 +3529,9 @@ select {
 
                     .name_text {
                         font-size: 16px;
+                         display: inline-block;
+                    width: 100px;
+                    text-align: right;
                         margin-right: 15px;
                     }
 
@@ -3046,12 +3547,16 @@ select {
                     height: 100%;
 
                     .time_text {
-                        margin-left: 44px;
+                        width: 100px;
+                    // margin-left: 100px;
+                    margin-left: 10px;
+                    text-align: right;
+                    display: inline-block;
                         margin-right: 15px;
                     }
                     .name-text {
                         margin-right: 15px;
-                        margin-left: 41px;
+                        margin-left: 17px;
                     }
                 }
             }
@@ -3067,6 +3572,9 @@ select {
                     vertical-align: middle;
 
                     .name_text {
+                         display: inline-block;
+                    width: 100px;
+                    text-align: right;
                         margin-right: 15px;
                     }
                 }
@@ -3076,6 +3584,8 @@ select {
                     .inspecion_ipt {
                         height: 90px;
                         width: 720px;
+                        position: relative;
+                        left: 36px;
                     }
                 }
             }
@@ -3143,7 +3653,7 @@ select {
             height: 50px !important;
         }
         .addPop_list {
-            width: 80%;
+            width: 85%;
             height: 265px;
             margin: 0 auto;
             overflow: auto;
@@ -3181,7 +3691,7 @@ select {
                 }
                 .num {
                     float: left;
-                    width: 20%;
+                    width: 16%;
                     height: 40px;
                     line-height: 40px;
                     background: #dcf0f9;
@@ -3193,7 +3703,7 @@ select {
                 .name {
                     float: left;
                     float: left;
-                    width: 15%;
+                    width: 17%;
                     height: 40px;
                     line-height: 40px;
                     background: #dcf0f9;
@@ -3217,7 +3727,7 @@ select {
                 .typeNum {
                     float: left;
                     float: left;
-                    width: 15%;
+                    width: 17%;
                     height: 40px;
                     line-height: 40px;
                     background: #dcf0f9;
@@ -3270,7 +3780,7 @@ select {
                 }
                 .num {
                     float: left;
-                    width: 20%;
+                    width: 16%;
                     height: 40px;
                     line-height: 40px;
                     background: #fff;
@@ -3282,7 +3792,7 @@ select {
                 .name {
                     float: left;
                     float: left;
-                    width: 15%;
+                    width: 17%;
                     height: 40px;
                     line-height: 40px;
                     background: #fff;
@@ -3306,7 +3816,7 @@ select {
                 .typeNum {
                     float: left;
                     float: left;
-                    width: 15%;
+                    width: 17%;
                     height: 40px;
                     line-height: 40px;
                     background: #fff;
@@ -3383,6 +3893,7 @@ select {
         border: 1px solid #b0b0b0;
         // -webkit-tab-highlight-color: rgba(0,0,0,0);
         color: #fff;
+        padding:0;
         // background: #DEDEDE;
     }
     input[type='checkbox']:after {
@@ -3756,5 +4267,104 @@ img{
 .a::before{
     color: #000 !important;
 }
+.showtext{
+    position: absolute;
+    top: 200px;
+    left: 475px;
+}
+.showtext1{
+    position: absolute;
+    top: 150px;
+    left: 475px;
+}
+   .is1 {
+        display: inline-block;
+        position: absolute;
+        width: 300px;
+        overflow: hidden;
+        height: 32px;
+        input {
+                position: relative;
+            top: 1px;
+            float: left;
+            height: 30px;
+            width: 180px;
+        }
+        .sl1 {
+            width: 100px;
+            height: 30px;
+            float: left;
+            .el-input__inner{
+                width: 100%;
+            }
+        }
+    }
+       .seleword{
+    display: inline-block;
+    width: 13%;
+    height: 40px;
+    position: absolute;
+    top: 12px;
+    background: #fff;
+    text-indent: 1em;
+    line-height: 40px;
+    .seleword1{
+        width: calc(100%);
+        position: relative;
+        height: 100%;
+        padding-right: 20px;
+         white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
+        img{
+            position: absolute;
+            right: 2px;
+            width: 20px;
+            height: 20px;
+            top: 10px;
+        }
+    }
+    // align-content: bottom;
+}
+.tinput{
+    margin-left: 15% !important;
+}
+.tinput1{
+    margin-left: 23% !important;
+}
+ .seleword2{
+    display: inline-block;
+    width: 21%;
+    height: 30px;
+    position: absolute;
+    top: 3px;
+    background: #fff;
+    text-indent: 1em;
+    line-height: 30px;
+    .seleword1{
+        width: calc(100%);
+        position: relative;
+        height: 100%;
+        padding-right: 20px;
+         white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
+        img{
+            position: absolute;
+            right: 2px;
+            width: 20px;
+            height: 20px;
+            top: 5px;
+        }
+    }
+    // align-content: bottom;
+}
+.selectword2 {
+    position: absolute !important;
+    top: 34px !important;
+    left: 94px !important;
+}
 </style>
 

src/components/Spotinspection/standard.vue

@@ -3,7 +3,7 @@
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2020-08-06 17:55:51
+ * @LastEditTime: 2021-01-27 17:25:35
  -->
 <template>
     <div class="public-table" @click="changeselect = false"        v-loading="this.$store.state.isShow"
@@ -12,9 +12,19 @@
                 element-loading-background="rgba(0, 0, 0, 0.4)">
         <div class="search-container">
             <span>设备类型：</span>
-            <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
-                <option :value="Meter">{{Meter}}</option>
-            </select>
+             <!-- <div class="seleword" @click.stop="selectword1">
+             <div class="seleword1">
+                  {{Meter}}
+               <img :src="xiala" alt />
+             </div>
+            </div> -->
+            <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                <el-option
+                :label="Meter"
+                :value="Meter">
+                </el-option>
+            </el-select>
+
             <div class="selectword" v-if="changeselect">
                 <el-tree
                     :data="data6"
@@ -33,7 +43,7 @@
                 </el-tree>
             </div>
 
-            <input type="text" placeholder="请输入关键字" v-model="keyword" />
+            <input type="text" class="tinput" placeholder="请输入关键字" v-model="keyword" />
             <div class="sad" @click="sad">查询</div>
 
             <div @click="addPopFun" class="addBtn">添加</div>
@@ -52,7 +62,7 @@
                 @select-all="select2"
                  border
                 highlight-current-row
-              :header-cell-style="[{background:(($store.state.color=='grey')?'#D9DBDE':'#5a6c98')},{color:(($store.state.color=='grey')?'#000':'#fff')}, {'border-left':'1px solid #cccccc',height:'50px',padding:'0'}]"
+              :header-cell-style="{background:($store.state.color=='grey')?'#D9DBDE':'#5a6c98',color:($store.state.color=='grey')?'#000':'#fff','border-left':'1px solid #cccccc',height:'50px',padding:'0'}"
             >
                 <el-table-column type="selection" width="60" :show-overflow-tooltip="true" fixed></el-table-column>
                 <el-table-column label="序号" width="100" prop="Number" :show-overflow-tooltip="true" fixed>
@@ -72,9 +82,8 @@
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="TaskName" label="维修记录名称" width="300" :show-overflow-tooltip="true" fixed></el-table-column>
                 <el-table-column prop="Name" label="标准名称" :show-overflow-tooltip="true"></el-table-column>
-                <el-table-column prop="DevicesStr" label="设备类型" :show-overflow-tooltip="true"></el-table-column>
+                <el-table-column prop="DevicesStr" label="关联设备" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="Requirement" label="巡检要求" :show-overflow-tooltip="true"></el-table-column>
             </el-table>
         </div>
@@ -201,6 +210,10 @@
                         </div>
                         <div class="num">序号</div>
                         <div class="name">设备名称</div>
+                        
+                        <div class="name">工序名称</div>
+                        <div class="name">线体名称</div>
+
                         <div class="id">设备编号</div>
                         <div class="type">设备类型</div>
                         <div class="typeNum">设备型号</div>
@@ -217,8 +230,14 @@
                                 </div>
                                 <div class="num">{{ind + 1}}</div>
                                 <div class="name">{{i.DeviceName}}</div>
+
+                                <div class="name">{{i.CellName}}</div>
+                                <div class="name">{{i.LineName}}</div>
+
                                 <div class="id">{{i.DeviceNo}}</div>
-                                <div class="type">{{i.DeviceType}}</div>
+                                <div class="type"> <el-tooltip class="item" effect="dark" :content="i.DeviceType" placement="top-start">
+                                     <span>{{i.DeviceType}}</span>
+                                 </el-tooltip></div>
                                 <div class="typeNum">{{i.DeviceModel}}</div>
                             </div>
                         </div>
@@ -235,8 +254,12 @@
                                 </div>
                                 <div class="num">{{ind + 1}}</div>
                                 <div class="name">{{i.DeviceName}}</div>
+                                <div class="name">{{i.CellName}}</div>
+                                <div class="name">{{i.LineName}}</div>
                                 <div class="id">{{i.DeviceNo}}</div>
-                                <div class="type">{{i.DeviceType}}</div>
+                              <div class="type"> <el-tooltip class="item" effect="dark" :content="i.DeviceType" placement="top-start">
+                                     <span>{{i.DeviceType}}</span>
+                                 </el-tooltip></div>
                                 <div class="typeNum">{{i.DeviceModel}}</div>
                             </div>
                         </div>
@@ -253,8 +276,12 @@
                                 </div>
                                 <div class="num">{{ind + 1}}</div>
                                 <div class="name">{{i.DeviceName}}</div>
+                                <div class="name">{{i.CellName}}</div>
+                                <div class="name">{{i.LineName}}</div>
                                 <div class="id">{{i.DeviceNo}}</div>
-                                <div class="type">{{i.DeviceType}}</div>
+                                 <div class="type"> <el-tooltip class="item" effect="dark" :content="i.DeviceType" placement="top-start">
+                                     <span>{{i.DeviceType}}</span>
+                                 </el-tooltip></div>
                                 <div class="typeNum">{{i.DeviceModel}}</div>
                             </div>
                         </div>
@@ -432,9 +459,21 @@
             <div class="conter">
                 <div class="conter_title">
                     <span class="name_text">设备类型</span>
-                    <select class="conter_ipt" v-model="Meter3" @click.stop="treechange">
-                        <option class="option2" :value="Meter3">{{Meter3}}</option>
-                    </select>
+                                <!-- <div class="seleword2" @click.stop="treechange"> -->
+                                <!-- <div class="seleword1">
+                                    {{Meter3}}
+                                    <img :src="xiala" alt />
+                                </div> -->
+                        <div class="selectClass">
+                          <el-select v-model="Meter" placeholder="请选择">
+                            <el-option
+                            :label="Meter"
+                            :value="Meter">
+                            </el-option>
+                        </el-select>
+                        </div>
+
+            <!-- </div> -->
                     <div class="selectword selectword2" v-if="treetrue">
                         <el-tree
                             :data="data7"
@@ -452,7 +491,7 @@
                             </span>
                         </el-tree>
                     </div>
-                    <input class="conter_ipt" v-model="keyWord1" type="text" placeholder="请输入关键字" />
+                    <input class="conter_ipt tinput1" v-model="keyWord1" type="text" placeholder="请输入关键字" />
                     <div @click="addQueryBtnFun" class="conter_btn">查询</div>
                 </div>
                 <div class="conter_middle">
@@ -462,19 +501,27 @@
                         </div>
                         <div class="name">设备名称</div>
                         <div class="id">设备编号</div>
+                        
+                        <div class="name">工序名称</div>
+                        <div class="name">线体名称</div>
+
                         <div class="type">设备类型</div>
                         <div class="typeNum">设备型号</div>
                     </div>
 
                     <div>
-                        <div class="middle_conter" v-for="(item,index) in EquipmentTypeAll" :key="index">
+                        <div class="middle_conter" v-for="(it,ind) in EquipmentTypeAll" :key="ind">
                             <div class="ipt">
-                                <input @click="checkFun(item,index)" ref="checkipt" type="checkbox" />
+                                <input @click="checkFun(it,ind)" ref="checkipt" type="checkbox" />
                             </div>
-                            <div class="name">{{item.DeviceName}}</div>
-                            <div class="id">{{item.DeviceNo}}</div>
-                            <div class="type">{{item.DeviceType}}</div>
-                            <div class="typeNum">{{item.DeviceModel}}</div>
+                            <div class="name">{{it.DeviceName}}</div>
+                            <div class="id">{{it.DeviceNo}}</div>
+                            
+                            <div class="name">{{it.CellName}}</div>
+                            <div class="name">{{it.LineName}}</div>
+
+                            <div class="type">{{it.DeviceType}}</div>
+                            <div class="typeNum">{{it.DeviceModel}}</div>
                         </div>
                     </div>
                 </div>
@@ -517,6 +564,9 @@ export default {
                     24 * 60 * 60 * 1000 -
                     1
             ),
+            //   xiala:require('../../assets/images/ziyuan4.png'),
+            EquipmentTypeAll:[],
+            EquipmentTypeAll2:[],
             Meter3: '',
             Meter3id: '',
             deltrue: true,
@@ -595,7 +645,7 @@ export default {
             selectname: [],
             selectname1: [],
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meterid: '',
             Meter1: '不限',
             Meter2: '不限',
@@ -663,12 +713,93 @@ export default {
             ],
             name1Text: '', //名称
             name2Text: '',
-            TipsText: '标准名称不能为空'
+            TipsText: '标准名称不能为空',
+            cxid:'',
+            cxshow:true,
+            tjid:'',
+            tjshow:true,
+            scid:'',
+            scshow:true,
+            ckid:"",
+            ckshow:true,
+            bjid:'',
+            bjshow:true
         };
     },
 
 
     created() {
+              this.jurisdiction = this.$store.state.btnPowerData
+     this.buttonarr = this.findPathByLeafId(this.GetUrlParam('id'),this.jurisdiction)[0].Children
+     console.log("sda",this.buttonarr)
+       this.buttonarr.forEach((item)=>{
+         if(item.RightName == "点巡检标准-查询按钮"){
+          this.cxid = item.RightID
+         }else if(item.RightName == "点巡检标准-添加按钮"){
+          this.tjid = item.RightID
+         }else if(item.RightName =="点巡检标准-删除按钮"){
+          this.scid = item.RightID
+         }else if(item.RightName =="点巡检标准-查看按钮"){
+          this.ckid = item.RightID
+         }else if(item.RightName =="点巡检标准-编辑按钮"){
+          this.bjid = item.RightID
+         }
+     })
+       var userid = ''
+      if (!JSON.parse(sessionStorage.getItem('userInfo1'))) {
+                userid = JSON.parse(
+                    sessionStorage.getItem('sightseerInfo1')
+                ).SCMSUserID;
+            } else {
+                userid = JSON.parse(
+                    sessionStorage.getItem('userInfo1')
+                ).SCMSUserID;
+            }
+              this.$axios({
+                  method: 'post',
+                  url: `/api/UserManage/UserManage_CheckAuthority?argUserID=${userid}&argRightID=${this.ckid}`,
+              }).then(res => {
+                  this.cxshow = res.data.data
+              
+              }).catch((err)=>{
+                  console.log('err',err)
+              })
+              this.$axios({
+                  method: 'post',
+                  url: `/api/UserManage/UserManage_CheckAuthority?argUserID=${userid}&argRightID=${this.tjid}`,
+              }).then(res => {
+                  this.tjshow = res.data.data
+              
+              }).catch((err)=>{
+                  console.log('err',err)
+              })
+                this.$axios({
+                  method: 'post',
+                  url: `/api/UserManage/UserManage_CheckAuthority?argUserID=${userid}&argRightID=${this.scid}`,
+              }).then(res => {
+                  this.scshow = res.data.data
+              
+              }).catch((err)=>{
+                  console.log('err',err)
+              })
+                 this.$axios({
+                  method: 'post',
+                  url: `/api/UserManage/UserManage_CheckAuthority?argUserID=${userid}&argRightID=${this.ckid}`,
+              }).then(res => {
+                  this.ckshow = res.data.data
+              
+              }).catch((err)=>{
+                  console.log('err',err)
+              })
+                this.$axios({
+                  method: 'post',
+                  url: `/api/UserManage/UserManage_CheckAuthority?argUserID=${userid}&argRightID=${this.bjid}`,
+              }).then(res => {
+                  this.bjshow = res.data.data
+              
+              }).catch((err)=>{
+                  console.log('err',err)
+              })
         this.getEquipmentType();
         this.req(1);
         this.time4 = this.getNowTime();
@@ -676,7 +807,43 @@ export default {
     },
    
     methods: {
+        findPathByLeafId(id,node,path){
+        if(!path){
+             path = []
+         }
+        for(let i=0;i<node.length;i++){
+          var temPath = path.concat();
+        
+          if(id == node[i].RightID){
+                temPath.push(node[i])
+           return temPath
+          }
+          if(node[i].Children){
+           var findResult = this.findPathByLeafId(id,node[i].Children,temPath)
+           if(findResult){
+           return findResult
+           }
+          }
+        }
+        },
+          GetUrlParam(paraName) {
+        let url = document.location.toString();
+        let arrObj = url.split("?");
+        if (arrObj.length > 1) {
+            let arrPara = arrObj[1].split("&");
+            let arr;
+           for(let i=0;i<arrPara.length;i++){
+            arr = arrPara[i].split("=");
+            if(arr&&arr[0] == paraName){
               
+               return arr[1]
+            }
+           }
+           return ''
+        }else {
+            return ''
+        }
+          },
         ProjectTypeFun(item,text){
             if(text == 3){
             console.log('item',item)
@@ -746,7 +913,16 @@ export default {
         },
         //添加弹窗查询
         addQueryBtnFun() {
-            this.addPopAxios();
+            // this.addPopAxios();
+            let reg = new RegExp(this.keyWord1);
+            this.EquipmentTypeAll = []
+            for(let i=0;i<this.EquipmentTypeAll2.length;i++){
+                if (reg.test(this.EquipmentTypeAll2[i].DeviceName) || reg.test(this.EquipmentTypeAll2[i].DeviceNo) || 
+                reg.test(this.EquipmentTypeAll2[i].DeviceModel) || reg.test(this.EquipmentTypeAll2[i].PersonInCharge)) {
+                    this.EquipmentTypeAll.push(this.EquipmentTypeAll2[i])
+                }
+            }
+
         },
         //巡检确定
         InspectionQureyFun() {
@@ -838,7 +1014,7 @@ export default {
                             this.tipword = res.data.data;
                             this.addShow = false;
                             this.addPopShow = false;
-                            this.sad();
+                            this.sad(1);
                         } else {
                             this.tipchange = true;
                               this.pdyd1 = true;
@@ -882,7 +1058,7 @@ export default {
                     }
                 }).then(res => {
                     if (res.data.code == 0) {
-                        this.sad();
+                        this.sad(1);
                         this.tipword = res.data.data;
                         this.tipchange = true;
                           this.pdyd1 = true;
@@ -910,7 +1086,12 @@ export default {
 
         //开启弹窗
         addPopFun() {
-            console.log('点击弹窗');
+            if(!this.tjshow){
+                 this.tipchange = true;
+                  this.pdyd1 = true;
+                this.tipword = `该账户无操作权限！`;
+                return
+            }
             this.name1Text = '';
             this.name2Text = '';
             this.sestion = 3;
@@ -933,40 +1114,55 @@ export default {
         },
         //关闭设备弹窗
         addEquipmentOffFun() {
+            this.keyWord1 = ''
             this.equipmentShow = false;
-             this.checkArr = this.checkArr11;
+            //  this.checkArr = this.checkArr11;
+            this.checkArr2 = []
         },
         foolCancel() {
-            console.log('this.checkArr11',this.checkArr11)
+            this.keyWord1 = ''
             this.equipmentShow = false;
-            this.checkArr = this.checkArr11;
+            this.checkArr2 = []
+            // this.checkArr = this.checkArr11;
         },
 
         //开启设备弹窗
         addequipmentPopFun() {
-
-            this.checkArr11 = this.checkArr
-            
-
-            
-                    this.addPopAxios();
+                    this.checkArr2 = []
                     var self= this
-                setTimeout(function(){
-                    self.addPopAxios();
-
-                },100)
                     this.equipmentShow = true;
                     this.pdyd2 = true;
+                    this.addPopAxios();
+                    setTimeout(function(){
+                        self.addPopAxios();
                       
-
-             console.log('EquipmentTypeAll');
-            
+                    },500)
                 
         },
 
         //设备确定
         foolQueryFun() {
+            // this.equipmentShow = false;
+            this.keyWord1 = ''
+            var checkArr2arr = []
+            for(let i=0;i<this.checkArr.length;i++){
+                checkArr2arr.push(this.checkArr[i].AID)
+            }
+            var check = []
+            for(let j=0;j<this.checkArr2.length;j++){
+                var index = checkArr2arr.indexOf(this.checkArr2[j].AID)
+                if(index == -1){
+                    check.push(this.checkArr2[j])
+                }
+            }
+            console.log('check',check)
+            this.checkArr = JSON.parse(JSON.stringify(this.checkArr.concat(check)))
+
             this.equipmentShow = false;
+            for (let i = 0; i < this.checkArr.length; i++) {
+                this.checkArr[i].Number = i + 1;
+            }
+             this.checkArr2 = []
         },
         //添加点检数据
         spotcheckBtnFun() {
@@ -1014,14 +1210,15 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${this.deviceType}&argKeyword=${this.keyWord1}&argPageIndex=1&argPageSize=50`,
+                url:`/api/PointInspectionManage/PointInspectionManage_GstEquipmentAccount?argDeviceType=&argKeyword=${this.keyWord1}&argPageIndex=1&argPageSize=50`,
                 argDeviceType: this.deviceType,
                 argKeyword: this.keyWord1,
                 argPageIndex: 1,
                 argPageSize: 50
             })
                 .then(res => {
-                    var dataAll = res.data.data.DataList;
+                    var dataAll = res.data.data;
+                    console.log('res4444',res)
  
                     this.$axios({
                         method: 'post',
@@ -1037,11 +1234,15 @@ export default {
                             for (let i = 0; i < dataAll.length; i++) {
                                 this.typeArr = [];
                                 this.SID = [];
+                                 console.log('设备类型5',dataAll[i])
                                 var value = {
                                     DeviceName: dataAll[i].DeviceName,
                                     DeviceNo: dataAll[i].DeviceNo,
                                     DeviceModel: dataAll[i].DeviceModel,
                                     DeviceType: dataAll[i].DeviceType,
+                                    LineName:dataAll[i].LineName,
+                                    CellName:dataAll[i].CellName,
+                                    DetailDeviceType:dataAll[i].DeviceType,
                                     type: this.typeArr,
                                     AID: dataAll[i].AID,
                                     SID: this.SID,
@@ -1072,6 +1273,7 @@ export default {
                             }
 
                             this.EquipmentTypeAll = this.EquipmentTypeAll
+                            this.EquipmentTypeAll2 = this.EquipmentTypeAll
                             
                         })
                         .catch(function(error) {
@@ -1085,28 +1287,15 @@ export default {
 
         //设备管理单选框
         checkFun(item, index) {
+            console.log('item',item,index)
            var checkDom = this.$refs.checkipt;
-            var inputShow = false
-            console.log('this.',this.checkArr)
-
-            for(var j=0;j<this.checkArr.length;j++){
-                if(this.checkArr[j].AID == item.AID){
-                   inputShow = true
-                }
-            }
-            if(!inputShow){
             if (checkDom[index].checked) {
-                    item.a = '';
-                    this.checkArr.push(item);
+                this.checkArr2.push(item)
             } else {
                 var a = this.checkArr.indexOf(item);
-                    this.checkArr.splice(a, 1);
-                    console.log('a', a);
-                }
+                 this.checkArr2.splice(a, 1);
             }
 
-
-
             //全选框是否选中
             for (var i = 0; i < checkDom.length; i++) {
                 if (checkDom[i].checked) {
@@ -1120,15 +1309,19 @@ export default {
         //全选框
         checkAllFun() {
             if (this.$refs.checkiptAll.checked) {
-                this.checkArr = [];
-                let i = 0;
-                for (i in this.EquipmentTypeAll) {
-                    this.EquipmentTypeAll[i].a = '';
+                if(this.checkArr.length != 0){
+                     this.checkArr2 =  []
+                    for(var j=0;j<this.EquipmentTypeAll.length;j++){
+                        this.checkArr2.push(this.EquipmentTypeAll[j])
+                    }
+                }else{
+                    this.checkArr2 = JSON.parse(JSON.stringify(this.EquipmentTypeAll))
+                }
+                for (let i1 = 0; i1 < this.checkArr2.length; i1++) {
+                    this.checkArr2[i1].Number = i1 + 1;
                 }
-                this.checkArr = this.EquipmentTypeAll;
-                console.log(this.EquipmentTypeAll);
             } else {
-                this.checkArr = [];
+                this.checkArr2 = []
             }
             var checkDom = this.$refs.checkipt;
             for (var i = 0; i < checkDom.length; i++) {
@@ -1141,15 +1334,12 @@ export default {
         checkFun1(item, index) {
             var checkDom = this.$refs.checkipt1;
 
-          console.log('aa',this.checkArr)
-
             if (checkDom[index].checked) {
                 this.checkDeleArr.push(index);
             } else {
                 var a = this.checkDeleArr.indexOf(index);
                 this.checkDeleArr.splice(a, 1);
             }
-
             //全选框是否选中
             for (var i = 0; i < checkDom.length; i++) {
                 if (checkDom[i].checked) {
@@ -1161,6 +1351,7 @@ export default {
             }
         },
         checkAllFun1() {
+            console.log('this.$refs.checkipt1',this.$refs.checkipt1)
             if (this.$refs.checkiptAll1.checked) {
                 this.AllShow = true;
             } else {
@@ -1182,6 +1373,7 @@ export default {
         },
         //添加点检单选框
         checkIpt2(item, index) {
+            console.log('eee')
             var checkDom = this.$refs.checkipt22;
 
             if (checkDom[index].checked) {
@@ -1264,26 +1456,23 @@ export default {
 
         //删除设备
         inspectionDeleteFun() {
-            if (this.AllShow) {
+            this.nowcheck = ''
+            if (this.AllShow == true) {
                 this.checkArr = [];
                 this.$refs.checkiptAll1.checked = false;
-                this.AllShow = false
-            }
-
-            if(this.$resf.checkipt1.length == 1){
-                this.$refs.checkiptAll1.checked = false;
             }
                 
             if (this.checkDeleArr.length != 0) {
-                var tt = false;
-                for (var i = 0; i < this.checkDeleArr.length; i++) {
-                    var ind = this.checkDeleArr[i];
-                    if (tt) {
-                        ind = ind - 1;
+                 var deleteArr = []
+                for(let i=0;i<this.checkDeleArr.length;i++){
+                    deleteArr.push(this.checkArr[this.checkDeleArr[i]])
+                }
+                for(let k=0;k<this.checkArr.length;k++){
+                    var index = deleteArr.indexOf(this.checkArr[k])
+                    if(index != -1){
+                        this.checkArr.splice(k, 1);
+                        k--
                     }
-
-                    this.checkArr.splice(ind, 1);
-                    tt = true;
                 }
 
                 var checkDom = this.$refs.checkipt1;
@@ -1292,6 +1481,7 @@ export default {
                 }
                 this.checkDeleArr = [];
             }
+            this.AllShow = false
         },
 
         //删除点检
@@ -1307,15 +1497,26 @@ export default {
             }
 
             if (this.checkDeleArr1.length != 0) {
-                var tt = false;
-                for (var i = 0; i < this.checkDeleArr1.length; i++) {
-                    var ind = this.checkDeleArr1[i];
-                    if (tt) {
-                        ind = ind - 1;
-                    }
+                // var tt = false;
+                // for (var i = 0; i < this.checkDeleArr1.length; i++) {
+                //     var ind = this.checkDeleArr1[i];
+                //     if (tt) {
+                //         ind = ind - 1;
+                //     }
 
-                    this.SpotcheckArr.splice(ind, 1);
-                    tt = true;
+                //     this.SpotcheckArr.splice(ind, 1);
+                //     tt = true;
+                // }
+                  var deleteArr = []
+                for(let i=0;i<this.checkDeleArr1.length;i++){
+                    deleteArr.push(this.SpotcheckArr[this.checkDeleArr1[i]])
+                }
+                for(let k=0;k<this.SpotcheckArr.length;k++){
+                    var index = deleteArr.indexOf(this.SpotcheckArr[k])
+                    if(index != -1){
+                        this.SpotcheckArr.splice(k, 1);
+                        k--
+                    }
                 }
 
                 var checkDom = this.$refs.checkipt22;
@@ -1343,7 +1544,7 @@ export default {
             );
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
@@ -1442,13 +1643,20 @@ export default {
                 data: a
             }).then(res => {
                 console.log(res);
-                this.tipword = res.data.data;
+                this.tipword = "删除成功！";
                 this.tipchange = true;
                   this.pdyd1 = true;
-                this.sad();
+                  this.deltrue = true
+                this.sad(1);
             });
         },
         deldata1() {
+              if(!this.scshow){
+                 this.tipchange = true;
+                  this.pdyd1 = true;
+                this.tipword = `该账户无操作权限！`;
+                return
+            }
             let i = 0;
             let a = [];
             for (i in this.list) {
@@ -1473,8 +1681,12 @@ export default {
             this.deviceType = this.Meter3;
         },
         handleEdit(a, b) {
-            console.log(a);
-            console.log(b);
+              if(!this.ckshow){
+                 this.tipchange = true;
+                  this.pdyd1 = true;
+                this.tipword = `该账户无操作权限！`;
+                return
+            }
             this.checkArr = [];
             let c = 0;
             let cc = 0;
@@ -1515,8 +1727,12 @@ export default {
             console.log(this.SpotcheckArr);
         },
         handleEdit1(a, b) {
-            console.log(a);
-            console.log(b);
+              if(!this.bjshow){
+                 this.tipchange = true;
+                  this.pdyd1 = true;
+                this.tipword = `该账户无操作权限！`;
+                return
+            }
             this.SpotcheckArr = [];
             this.checkArr = [];
             let aa = '';
@@ -1542,14 +1758,13 @@ export default {
             this.sestion = 2;
             this.disabled = true;
             this.sesstion = b;
+            console.log('bbbb',b)
             this.checkArr = b.Devices;
-            //
+
             let j = 0;
             for (j in this.SpotcheckArr) {
                 if (this.SpotcheckArr[j].Type == 1) {
                     this.SpotcheckArr[j].Type = '数值';
-
-                    console.log(this.SpotcheckArr[j].a);
                 } else if (this.SpotcheckArr[j].Type == 2) {
                     this.SpotcheckArr[j].Type = '判断';
                 } else if (this.SpotcheckArr[j].Type == 3) {
@@ -1558,8 +1773,6 @@ export default {
                     this.SpotcheckArr[j].Type = '选项';
                 }
             }
-            console.log(this.SpotcheckArr);
-            console.log('asdasdwwwwwwwwwwwwwwwwwwww', aa);
             this.SpotcheckArr = aa.Projects;
         },
         getNowTime() {
@@ -1631,7 +1844,7 @@ export default {
         },
         next() {
             if (
-                this.pageDate.PageIndex < this.PageData.TotalPage &&
+                this.PageData.PageIndex < this.PageData.TotalPage &&
                 this.PageData.PageIndex !== this.PageData.TotalPage
             ) {
                 this.PageData.PageIndex++;
@@ -1673,12 +1886,15 @@ export default {
 
             this.$axios
                 .post(
-                    `/api/PointInspectionManage/PointInspectionManage_GstStandard?argDeviceType=${c}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/PointInspectionManage/PointInspectionManage_GstStandard?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
+                   
                     if (res.data.code == 0) {
                         this.tableData1 = res.data.data;
-                        console.log(this.tableData1);
+                        console.log('tableData1==>',this.tableData1)
+                        //   this.PageData = res.data.data.ParameterList;
+
                         let i = 0;
                         for (i in this.tableData1) {
                             let a = i;
@@ -1687,6 +1903,7 @@ export default {
                             this.pageDate.togeIndex = Math.ceil(
                                 this.tableData1.length / 50
                             );
+                         
                         }
                     } else {
                         this.tipchange = true;
@@ -1758,8 +1975,13 @@ export default {
             this.PageData.PageIndex = this.nowpage;
             this.onetable();
         },
-        sad() {
-            this.onetable();
+        sad(a) {
+            if(!this.ckshow&&a!==1){
+                 this.tipchange = true;
+                  this.pdyd1 = true;
+                this.tipword = `该账户无操作权限！`;
+                return
+            }
             if (
                 new Date(this.value1).getTime() >
                 new Date(this.value2).getTime()
@@ -1767,7 +1989,9 @@ export default {
                 this.tipchange = true;
                   this.pdyd1 = true;
                 this.tipword = `查询开始时间不能大于结束时间！`;
+                return
             }
+            this.onetable();
         },
         setParams(params) {
             this.searchData = params;
@@ -1779,14 +2003,14 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/PointInspectionManage/PointInspectionManage_GstEquipmentAccount?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.PageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
-                    for (i in res.data.data.DataList) {
-                        res.data.data.DataList[i].number = ++i;
+                    for (i in res.data.data) {
+                        res.data.data[i].number = ++i;
                     }
-                    this.muchdata = res.data.data.DataList;
+                    this.muchdata = res.data.data;
                 })
                 .catch(function(error) {
                     console.log(error);
@@ -1824,11 +2048,11 @@ export default {
         req(pageIndex) {
             let params = Object.assign(this.searchData, {
                 argPageIndex: pageIndex,
-                argPageSize: this.pageData.PageSize
+                argPageSize: this.PageData.PageSize
             });
             this.$axios
                 .post(
-                    `/api/EquipmentAccount/EquipmentAccount_GstEquipment`,
+                    `/api/PointInspectionManage/PointInspectionManage_GstEquipmentAccount`,
                     null,
                     {
                         params
@@ -1836,11 +2060,11 @@ export default {
                 )
                 .then(res => {
                     if (res.data.code == 0) {
-                        this.data = res.data.data.DataList;
-                        this.pageData = res.data.data.ParameterList;
+                        this.data = res.data.data;
+                        this.PageData = res.data.data.ParameterList;
                     }
                     this.pageindex = pageIndex;
-                    this.pagesize = this.pageData.PageSize;
+                    this.pagesize = this.PageData.PageSize;
                 })
                 .then(() => {
                     this.somethingdata();
@@ -1851,7 +2075,7 @@ export default {
     mounted() {
         this.value1 = this.GMTToStr(this.value1);
         this.value2 = this.GMTToStr(this.value2);
-        this.sad();
+        this.sad(1);
         console.log(this.tableData);
     }
 };
@@ -2003,6 +2227,7 @@ export default {
     }
 }
 .search-container {
+    position: relative;
     .deleteBtn {
         color: #fff;
         width: 120px;
@@ -2025,7 +2250,7 @@ export default {
         line-height: 40px;
         text-align: center;
         background-color: #fff;
-        margin-left: 774px;
+        margin-left: 740px;
         border-radius: 4px;
         font-weight: 600;
         display: inline-block;
@@ -2125,6 +2350,14 @@ export default {
             padding-top: 20px;
             text-align: center;
             box-sizing: border-box;
+
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            white-space: normal;
+            word-break: break-all;
+            text-align: left;
+            margin:auto;
         }
         .fool {
             width: 100%;
@@ -2147,6 +2380,7 @@ export default {
 
     input[type='checkbox'] {
         top: -1px;
+        padding:0;
         left: 0;
         width: 24px;
         height: 24px;
@@ -2313,7 +2547,8 @@ export default {
                     height: 50px !important;
                 }
                 .middle_title {
-                    width: 100%;
+                    // width: 100%;
+                    width:1600px;
                     height: 50px;
                     box-sizing: border-box;
                     overflow: hidden;
@@ -2332,21 +2567,21 @@ export default {
 
                     .id {
                         float: left;
-                        width: 20%;
+                        width: 12%;
                         height: 40px;
                         padding-left: 5px;
                         border-right: 1px solid #ddd;
                     }
                     .type {
                         float: left;
-                        width: 20%;
+                        width: 12%;
                         height: 40px;
                         padding-left: 5px;
                         border-right: 1px solid #ddd;
                     }
                     .typeNum {
                         float: left;
-                        width: 20%;
+                        width: 14%;
                         height: 40px;
                         padding-left: 5px;
                         border-right: 1px solid #ddd;
@@ -2360,7 +2595,7 @@ export default {
                     }
                     .name {
                         float: left;
-                        width: 20%;
+                        width: 14%;
                         height: 40px;
                         padding-left: 5px;
                         border-right: 1px solid #ddd;
@@ -2368,7 +2603,8 @@ export default {
                 }
 
                 .middle_conter {
-                    width: 100%;
+                    // width: 100%;
+                    width:1600px;
                     height: 40px;
                     box-sizing: border-box;
                     overflow: hidden;
@@ -2387,21 +2623,21 @@ export default {
 
                     .id {
                         float: left;
-                        width: 20%;
+                        width: 12%;
                         height: 40px;
                         padding-left: 5px;
                         border-right: 1px solid #ddd;
                     }
                     .type {
                         float: left;
-                        width: 20%;
+                        width: 12%;
                         height: 40px;
                         padding-left: 5px;
                         border-right: 1px solid #ddd;
                     }
                     .typeNum {
                         float: left;
-                        width: 20%;
+                        width: 14%;
                         height: 40px;
                         padding-left: 5px;
                         border-right: 1px solid #ddd;
@@ -2415,7 +2651,7 @@ export default {
                     }
                     .name {
                         float: left;
-                        width: 20%;
+                        width: 14%;
                         height: 40px;
                         padding-left: 5px;
                         border-right: 1px solid #ddd;
@@ -2804,7 +3040,7 @@ export default {
         width: 1130px;
         height: 600px;
         background: #eeeeee;
-        position: absolute;
+        position: fixed;
         top: 100px;
         left: 500px;
         z-index: 999;
@@ -2833,10 +3069,20 @@ export default {
             margin-top: 15px;
 
             .conter_title {
-                width: 100%;
+                position: relative;
+                width: 1800px;
                 height: 30px;
                 margin-top: 15px;
                 margin-bottom: 15px;
+                .selectClass{
+                    width:180px;
+                    height:35px;
+                    display:inline-block;
+                    margin-right:15px;
+                    .el-input--suffix .el-input__inner{
+                        height:35px;
+                    }
+                }
 
                 .option2 {
                     opacity: 0;
@@ -2876,9 +3122,10 @@ export default {
             width: 100%;
             height: 360px;
             background: #fff;
-
+            overflow: auto;
             .middle_title {
-                width: 100%;
+                // width: 100%;
+                width:1600px;
                 height: 40px;
                 box-sizing: border-box;
                 overflow: hidden;
@@ -2887,35 +3134,35 @@ export default {
 
                 .id {
                     float: left;
-                    width: 22%;
+                    width: 18%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .type {
                     float: left;
-                    width: 22%;
+                    width: 15%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .typeNum {
                     float: left;
-                    width: 22%;
+                    width: 14%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .ipt {
                     float: left;
-                    width: 12%;
+                    width: 8%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .name {
                     float: left;
-                    width: 22%;
+                    width: 15%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
@@ -2923,7 +3170,8 @@ export default {
             }
 
             .middle_conter {
-                width: 100%;
+                // width: 100%;
+                width:1600px;
                 height: 40px;
                 box-sizing: border-box;
                 overflow: hidden;
@@ -2932,35 +3180,35 @@ export default {
 
                 .id {
                     float: left;
-                    width: 22%;
+                    width: 18%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .type {
                     float: left;
-                    width: 22%;
+                    width: 15%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .typeNum {
                     float: left;
-                    width: 22%;
+                    width: 14%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .ipt {
                     float: left;
-                    width: 12%;
+                    width: 8%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
                 }
                 .name {
                     float: left;
-                    width: 22%;
+                    width: 15%;
                     height: 40px;
                     padding-left: 5px;
                     border-right: 1px solid #ddd;
@@ -3325,12 +3573,12 @@ textarea {
     top: 0;
     left: 0;
 }
-.selectword2 {
-    position: absolute !important;
-    left: 138px !important;
-    top: 122px !important;
-    z-index: 999 !important;
-}
+// .selectword2 {
+//     position: absolute !important;
+//     left: 138px !important;
+//     top: 122px !important;
+//     z-index: 999 !important;
+// }
 .yd{
    margin: auto;
      top: 0 !important;
@@ -3367,5 +3615,72 @@ img{
 .a::before{
     color: #000 !important;
 }
-</style>
+    .seleword{
+    display: inline-block;
+    width: 13%;
+    height: 40px;
+    position: absolute;
+    top: 12px;
+    background: #fff;
+    text-indent: 1em;
+    line-height: 40px;
+    .seleword1{
+        width: calc(100%);
+        position: relative;
+        height: 100%;
+        padding-right: 20px;
+         white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
+        img{
+            position: absolute;
+            right: 2px;
+            width: 20px;
+            height: 20px;
+            top: 10px;
+        }
+    }
+    // align-content: bottom;
+}
+.tinput{
+    margin-left: 15% !important;
+}
+.tinput1{
+    margin-left: 23% !important;
+}
+ .seleword2{
+    display: inline-block;
+    width: 21%;
+    height: 30px;
+    position: absolute;
+    top: 3px;
+    background: #fff;
+    text-indent: 1em;
+    line-height: 30px;
     
+    .seleword1{
+        width: calc(100%);
+        position: relative;
+        height: 100%;
+        padding-right: 20px;
+         white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all;
+        img{
+            position: absolute;
+            right: 2px;
+            width: 20px;
+            height: 20px;
+            top: 5px;
+        }
+    }
+    // align-content: bottom;
+}
+.selectword2 {
+    position: absolute !important;
+    top: 34px !important;
+    left: 94px !important;
+}
+</style>

src/components/Vulnerableparts/Agency.vue

@@ -2,8 +2,8 @@
  * @Description: 设备台账
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
- * @LastEditors: 随风
- * @LastEditTime: 2019-11-27 21:22:27
+ * @LastEditors: Tao
+ * @LastEditTime: 2021-01-27 15:27:45
  -->
 <template>
     <div class="public-table" @click=" changeselect = false"   v-loading="this.$store.state.isShow"
@@ -188,9 +188,19 @@
                 <div class="lookselect">
                     <div class="search">
                         <span>设备类型：</span>
-                        <select name id v-model="oneselect" @click.stop="selectword2">
+                        <!-- <select name id v-model="oneselect" @click.stop="selectword2">
                             <option :value="oneselect">{{oneselect}}</option>
-                        </select>
+                        </select> -->
+                         <div class="selectClass">
+                            <el-select v-model="oneselect" placeholder="请选择">
+                                <el-option
+                                :label="oneselect"
+                                :value="oneselect">
+                                </el-option>
+                            </el-select>
+                        </div>
+                        
+
                         <div class="selectword selectword2" v-if="selectword3">
                             <el-tree
                                 :data="data7"
@@ -223,6 +233,8 @@
                         >
                             <el-table-column prop="DeviceName" label="设备名称"></el-table-column>
                             <el-table-column prop="DeviceNo" label="设备编号"></el-table-column>
+                            <el-table-column prop="CellName" label="工序名称" :show-overflow-tooltip="true"></el-table-column>
+                            <el-table-column prop="LineName" label="线体名称" :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceType" label="设备类型"></el-table-column>
                             <el-table-column prop="DeviceModel" label="设备型号"></el-table-column>
                         </el-table>
@@ -235,9 +247,16 @@
         <div class="search-container">
             <div>
                 <span>设备类型：</span>
-                <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
+                <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
                     <option :value="Meter">{{Meter}}</option>
-                </select>
+                </select> -->
+                <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                    <el-option
+                    :label="Meter"
+                    :value="Meter">
+                    </el-option>
+                </el-select>
+
                 <span class="spge">更换时间范围：</span>
 
                 <el-date-picker
@@ -1150,7 +1169,7 @@ export default {
             ID: '',
             daibang: false,
             change1: false,
-            oneselect: '',
+            oneselect: '全部',
             oneselectid: '',
             over: '已处理',
             tableData1: [],
@@ -1208,7 +1227,7 @@ export default {
             selectname: [],
             selectname1: [],
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meterid: '',
             Meter1: '不限',
             Meter2: '不限',
@@ -1548,7 +1567,7 @@ export default {
             } else {
                 c = this.Meter;
             }
-                this.$axios.post( `/api/VulnerablePartManage/VulnerablePartManage_GstPlan?argDeviceType=${c}&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.TotalCount}&argPageIndex=1`).then(res =>{
+                this.$axios.post( `/api/VulnerablePartManage/VulnerablePartManage_GstPlan?argDeviceType=&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.TotalCount}&argPageIndex=1`).then(res =>{
                     this.daochu = res.data.data.DataList;
                         if (140000 < this.daochu.length&&this.daochu.length<= 150000) {
                             this.excelDatas = [
@@ -2390,12 +2409,12 @@ export default {
             }
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
         handleNodeClic7(data) {
-            this.oneselect = data.label;
+            // this.oneselect = data.label;
             this.oneselectid = data.NID;
             this.selectword3 = false;
         },
@@ -3339,7 +3358,7 @@ export default {
                     if (
                         this.oneselectid ==
                             '11111111-1111-1111-1111-111111111111' ||
-                        this.oneselect == ''
+                        this.oneselect == '' || this.oneselect == '全部'
                     ) {
                         this.projectlistdata = i;
                     } else if (this.oneselect == i[a].DeviceType) {
@@ -3351,7 +3370,7 @@ export default {
                     if (
                         this.oneselectid ==
                             '11111111-1111-1111-1111-111111111111' ||
-                        this.oneselect == ''
+                        this.oneselect == ''|| this.oneselect == '全部'
                     ) {
                         if (
                             reg.test(i[a].DeviceName) ||
@@ -3482,7 +3501,7 @@ export default {
             }
             this.$axios
                 .post(
-                    `/api/VulnerablePartManage/VulnerablePartManage_GstPlan?argDeviceType=${c}&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/VulnerablePartManage/VulnerablePartManage_GstPlan?argDeviceType=&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
                       if (res.data.code == 0) {
@@ -3603,7 +3622,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -3644,7 +3663,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -4668,6 +4687,15 @@ select {
         background-color: #f4f4f4;
         overflow: hidden;
         border: 1px solid #cccccc;
+        .selectClass{
+            width:180px;
+            height:35px;
+            display:inline-block;
+            margin-right:15px;
+            .el-input--suffix .el-input__inner{
+                height:35px;
+            }
+        }
     }
     .looktop {
         width: 100%;

src/components/Vulnerableparts/plan.vue

@@ -2,8 +2,8 @@
  * @Description: 设备台账
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
- * @LastEditors: 随风
- * @LastEditTime: 2019-11-27 21:22:27
+ * @LastEditors: Tao
+ * @LastEditTime: 2021-01-27 15:31:01
  -->
 <template>
     <div class="public-table" @click=" changeselect = false"     v-loading="this.$store.state.isShow"
@@ -12,9 +12,16 @@
                 element-loading-background="rgba(0, 0, 0, 0.4)">
         <div class="search-container">
             <span>设备类型：</span>
-            <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
+            <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
                 <option :value="Meter">{{Meter}}</option>
-            </select>
+            </select> -->
+            <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                    <el-option
+                    :label="Meter"
+                    :value="Meter">
+                    </el-option>
+            </el-select>
+            
             <div class="selectword" v-if="changeselect">
                 <el-tree
                     :data="data6"
@@ -457,7 +464,7 @@ export default {
             selectname: [],
             selectname1: [],
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meterid: '',
             Meter1: '不限',
             Meter2: '不限',
@@ -519,7 +526,7 @@ export default {
             );
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
@@ -701,7 +708,7 @@ export default {
             console.log(this.Meterid);
             this.$axios
                 .post(
-                    `/api/VulnerablePartManage/VulnerablePartManage_GstRecord?argDeviceType=${c}&argStartTime=${this.value1}&argRecordStatus=${a}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/VulnerablePartManage/VulnerablePartManage_GstRecord?argDeviceType=&argStartTime=${this.value1}&argRecordStatus=${a}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
                     if (res.data.code == 0) {
@@ -796,7 +803,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;

src/components/maintain/Agency.vue

@@ -3,7 +3,7 @@
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2020-08-06 17:46:58
+ * @LastEditTime: 2021-01-27 14:54:40
  -->
 <template>
     <div class="public-table" @click="changeselect = false"   v-loading="this.$store.state.isShow"
@@ -24,9 +24,19 @@
                 <div class="lookselect">
                     <div class="search">
                         <span>设备类型：</span>
-                        <select name id v-model="oneselect" @click="selectword2">
+                        
+                        <div class="selectClass">
+                            <el-select v-model="oneselect" placeholder="请选择">
+                                <el-option
+                                :label="oneselect"
+                                :value="oneselect">
+                                </el-option>
+                            </el-select>
+                        </div>
+
+                        <!-- <select name id v-model="oneselect" @click="selectword2">
                             <option :value="oneselect">{{oneselect}}</option>
-                        </select>
+                        </select> -->
                         <div class="selectword selectword2" v-if="selectword3">
                             <el-tree
                                 :data="data7"
@@ -70,9 +80,16 @@
         </div>
         <div class="search-container">
             <span>设备类型：</span>
-            <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
+            <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
                 <option :value="Meter">{{Meter}}</option>
-            </select>
+            </select> -->
+             <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                <el-option
+                :label="Meter"
+                :value="Meter">
+                </el-option>
+            </el-select>
+
             <span class="sp1">任务状态：</span>
             <select v-model="Meter1">
                 <option v-for="(item,index) in ztarr" :key="index" :value="item">{{item}}</option>
@@ -794,7 +811,7 @@ export default {
                 Contact: '',
                 Remarks: ''
             },
-            oneselect: '',
+            oneselect: '全部',
             oneselectid: '',
             over: '已处理',
             tableData1: [],
@@ -836,7 +853,7 @@ export default {
             selectname: [],
             selectname1: [],
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meterid: '',
             wantnowdata: '',
             Meter1: '不限',
@@ -941,12 +958,12 @@ export default {
             }
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
         handleNodeClic7(data) {
-            this.oneselect = data.label;
+            // this.oneselect = data.label;
             this.oneselectid = data.NID;
             this.selectword3 = false;
         },
@@ -1624,8 +1641,6 @@ export default {
                         this.projectlistdata.push(i[a]);
                     }
                 } else {
-                    console.log(this.oneselect);
-                    console.log(a);
                     if (
                         this.oneselectid ==
                             '11111111-1111-1111-1111-111111111111' ||
@@ -1638,15 +1653,8 @@ export default {
                             reg.test(i[a].PersonInCharge)
                         ) {
                             this.projectlistdata.push(i[a]);
-
-                            console.log('1');
-
-                            console.log('asd', this.projectlistdata);
                         } else {
                             console.log(reg.test(i[a].DeviceName));
-                            console.log(reg.test(i[a].DeviceNo));
-                            console.log(reg.test(i[a].DeviceModel));
-                            console.log('2');
                         }
                     } else if (this.oneselect == i[a].DeviceType) {
                         if (
@@ -1770,7 +1778,7 @@ export default {
 
             this.$axios
                 .post(
-                    `/api/MaintenanceManage/MaintenanceManage_GstTask?argDeviceType=${c}&argTaskStatus=${a}&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/MaintenanceManage/MaintenanceManage_GstTask?argDeviceType=&argTaskStatus=${a}&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
                     console.log(res);
@@ -1891,7 +1899,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -1931,7 +1939,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -2838,6 +2846,15 @@ select {
         background-color: #f4f4f4;
         overflow: hidden;
         border: 1px solid #cccccc;
+        .selectClass{
+            width:180px;
+            height:35px;
+            display:inline-block;
+            margin-right:15px;
+            .el-input--suffix .el-input__inner{
+                height:35px;
+            }
+        }
     }
     .looktop {
         width: 100%;

src/components/maintain/Record.vue

@@ -3,7 +3,7 @@
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2020-08-06 17:49:55
+ * @LastEditTime: 2021-01-27 14:59:46
  -->
 <template>
     <div class="public-table" @click="changeselect = false"       v-loading="this.$store.state.isShow"
@@ -12,9 +12,17 @@
                 element-loading-background="rgba(0, 0, 0, 0.4)">
         <div class="search-container">
             <span>设备类型：</span>
-            <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
+            <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
                 <option :value="Meter">{{Meter}}</option>
-            </select>
+            </select> -->
+
+             <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                <el-option
+                :label="Meter"
+                :value="Meter">
+                </el-option>
+            </el-select>
+            
             <span class="sp1">任务状态：</span>
             <select v-model="Meter1">
                 <option v-for="(item,index) in ztarr" :key="index" :value="item">{{item}}</option>
@@ -444,7 +452,7 @@ export default {
             selectname: [],
             selectname1: [],
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meterid: '',
             Meter1: '不限',
             Meter2: '不限',
@@ -507,7 +515,7 @@ export default {
             );
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
@@ -722,7 +730,7 @@ export default {
 
             this.$axios
                 .post(
-                    `/api/MaintenanceManage/MaintenanceManage_GstRecord?argDeviceType=${c}&argStartTime=${this.value1}&argTaskStatus=${a}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/MaintenanceManage/MaintenanceManage_GstRecord?argDeviceType=&argStartTime=${this.value1}&argTaskStatus=${a}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
                      if (res.data.code == 0) {
@@ -864,7 +872,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;

src/components/maintain/plan.vue

@@ -3,7 +3,7 @@
  * @Date: 2019-11-25 19:07:09
  * @Author: 随风
  * @LastEditors: Tao
- * @LastEditTime: 2020-08-06 17:49:06
+ * @LastEditTime: 2021-01-27 18:20:56
  -->
 <template>
     <div class="public-table"  @click="changeselect = false"     v-loading="this.$store.state.isShow"
@@ -31,9 +31,18 @@
                 <div class="lookselect">
                     <div class="search">
                         <span>设备类型：</span>
-                        <select name id v-model="oneselect" @click.stop="selectword2">
+                        <!-- <select name id v-model="oneselect" @click.stop="selectword2">
                             <option :value="oneselect">{{oneselect}}</option>
-                        </select>
+                        </select> -->
+                         <div class="selectClass">
+                            <el-select v-model="oneselect" placeholder="请选择">
+                                <el-option
+                                :label="oneselect"
+                                :value="oneselect">
+                                </el-option>
+                            </el-select>
+                        </div>
+
                         <div class="selectword selectword2" v-if="selectword3">
                             <el-tree
                                 :data="data7"
@@ -67,6 +76,8 @@
                         >
                             <el-table-column prop="DeviceName" label="设备名称" :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceNo" label="设备编号" :show-overflow-tooltip="true"></el-table-column>
+                            <el-table-column prop="CellName" label="工序名称" :show-overflow-tooltip="true"></el-table-column>
+                            <el-table-column prop="LineName" label="线体名称" :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceType" label="设备类型" :show-overflow-tooltip="true"></el-table-column>
                             <el-table-column prop="DeviceModel" label="设备型号" :show-overflow-tooltip="true"></el-table-column>
                         </el-table>
@@ -78,9 +89,15 @@
         </div>
         <div class="search-container">
             <span>设备类型：</span>
-            <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
+            <!-- <select name id @click.stop="selectword1" v-model="Meter" class="firstselect">
                 <option :value="Meter">{{Meter}}</option>
-            </select>
+            </select> -->
+             <el-select class="firstselect" v-model="Meter" placeholder="请选择">
+                <el-option
+                :label="Meter"
+                :value="Meter">
+                </el-option>
+            </el-select>
 
             <div class="selectword" v-if="changeselect">
                 <el-tree
@@ -721,7 +738,7 @@ export default {
             selectname: [],
             selectname1: [],
             cancel1: false,
-            Meter: '',
+            Meter: '全部',
             Meterid: '',
             Meter1: '不限',
             Meter2: '不限',
@@ -779,7 +796,7 @@ export default {
             projectkeyword: '',
             ztarr: ['不限', '未开始', '进行中', '已延误'],
             leixinarr: ['不限', '计划维修', '故障维修'],
-            oneselect: '',
+            oneselect: '全部',
             oneselectid: '',
             data7: [],
             changetrue: false,
@@ -1044,12 +1061,12 @@ export default {
             }
         },
         handleNodeClic7(data) {
-            this.oneselect = data.label;
+            // this.oneselect = data.label;
             this.oneselectid = data.NID;
             this.selectword3 = false;
         },
         handleNodeClic6(data) {
-            this.Meter = data.label;
+            // this.Meter = data.label;
             this.Meterid = data.NID;
             this.changeselect = false;
         },
@@ -1596,7 +1613,7 @@ export default {
             }
             this.$axios
                 .post(
-                    `/api/MaintenanceManage/MaintenanceManage_GstPlan?argDeviceType=${c}&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
+                    `/api/MaintenanceManage/MaintenanceManage_GstPlan?argDeviceType=&argStartTime=${this.value1}&argEndTime=${this.value2}&argKeyword=${this.keyword}&argPageSize=${this.PageData.PageSize}&argPageIndex=${this.PageData.PageIndex}`
                 )
                 .then(res => {
                      if (res.data.code == 0) {
@@ -1704,7 +1721,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pagesize}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -1744,7 +1761,7 @@ export default {
             }
             this.$axios({
                 method: 'post',
-                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=${rang}&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
+                url: `/api/EquipmentAccount/EquipmentAccount_GstEquipment?argDeviceType=&argKeyword=${this.keyword}&argPageSize=${this.pageData.TotalCount}&argPageIndex=${this.pageindex}`
             })
                 .then(res => {
                     let i = 0;
@@ -3166,6 +3183,15 @@ select {
         background-color: #f4f4f4;
         overflow: hidden;
         border: 1px solid #cccccc;
+        .selectClass{
+            width:180px;
+            height:35px;
+            display:inline-block;
+            margin-right:15px;
+            .el-input--suffix .el-input__inner{
+                height:35px;
+            }
+        }
     }
     .looktop {
         width: 100%;

src/views/education/ManageList.vue

@@ -111,7 +111,7 @@
 </template>
 
 <script>
-import searchForm from './component/searchForm'
+import searchForm from './component/SearchForm'
 import deletePop from './component/deletePop'
 import Pagination from './component/Pagination.vue'
 import relateDialog from './component/relateDialog'

src/views/education/MaterialDelivery.vue

@@ -88,8 +88,8 @@
 </template>
 
 <script>
-import searchForm from './component/searchForm'
-import storeDialog from './component/storeDialog'
+import searchForm from './component/SearchForm'
+import storeDialog from './component/StoreDialog'
 import deletePop from './component/deletePop'
 import Pagination from './component/Pagination'
 

src/views/education/MaterialWarehousingMoudle.vue

@@ -86,8 +86,8 @@
 </template>
 
 <script>
-import searchForm from './component/searchForm'
-import storeDialog from './component/storeDialog'
+import searchForm from './component/SearchForm'
+import storeDialog from './component/StoreDialog'
 import deletePop from './component/deletePop'
 import Pagination from './component/Pagination'
 

src/views/education/ProductDelivery.vue

@@ -88,8 +88,8 @@
 </template>
 
 <script>
-import searchForm from './component/searchForm'
-import storeDialog from './component/storeDialog'
+import searchForm from './component/SearchForm'
+import storeDialog from './component/StoreDialog'
 import deletePop from './component/deletePop'
 import Pagination from './component/Pagination'
 

src/views/education/ProductHouseshow.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import searchForm from './component/searchForm'
+import searchForm from './component/SearchForm'
 import deletePop from './component/deletePop'
 import Pagination from './component/Pagination'
 import baseTable from './component/baseTable'

src/views/education/ProductStorage.vue

@@ -88,9 +88,9 @@
 </template>
 
 <script>
-import searchForm from './component/searchForm'
-import storeDialog from './component/storeDialog'
-import deletePop from './component/deletePop'
+import searchForm from './component/SearchForm'
+import storeDialog from './component/StoreDialog'
+import deletePop from './component/deletePop.vue'
 import Pagination from './component/Pagination.vue'
 
 export default {

src/views/education/materialinventory.vue

@@ -12,10 +12,10 @@
 </template>
 
 <script>
-import searchForm from './component/searchForm'
-import deletePop from './component/deletePop'
-import Pagination from './component/Pagination'
-import baseTable from './component/baseTable'
+import searchForm from './component/SearchForm'
+import deletePop from './component/deletePop.vue'
+import Pagination from './component/Pagination.vue'
+import baseTable from './component/baseTable.vue'
 
 export default {
   components: { searchForm, deletePop, baseTable, Pagination },

src/views/education/productManage.vue

@@ -3,7 +3,7 @@
  * @Date: 2020-08-10 09:10:53
  * @Author: Tao
  * @LastEditors: Tao
- * @LastEditTime: 2020-09-09 10:27:57
+ * @LastEditTime: 2021-01-27 11:54:11
 -->
 <template>
     <div class="lineBox">
@@ -127,9 +127,9 @@
 
 <script>
 import Head from './component/head.vue'
-import LinePop from './component/linePop'
-import deletePop from './component/deletePop'
-import BomPop from './component/BomPop'
+import LinePop from './component/linePop.vue'
+import deletePop from './component/deletePop.vue'
+import BomPop from './component/BomPop.vue'
 export default {
       components:{
         Head,

src/views/education/schedulingStatistics.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import searchForm from './component/searchForm'
+import searchForm from './component/SearchForm'
 import deletePop from './component/deletePop'
 import Pagination from './component/Pagination.vue'
 import baseTable from './component/baseTable'

vue.config.js

@@ -3,7 +3,7 @@
  * @Date: 2019-11-12 17:31:23
  * @Author: Tao
  * @LastEditors: Tao
- * @LastEditTime: 2021-01-04 09:25:31
+ * @LastEditTime: 2021-01-27 11:25:32
  */
 /**
  * @description: vue-cli配置文件
@@ -23,7 +23,7 @@ module.exports = {
         proxy: {
             '/api': {
                 //这里最好有一个 /
-                target: 'http://192.168.1.125:8802', // 后台接口域名
+                target: 'http://192.168.1.180:8802', // 后台接口域名
                 ws: true, //如果要代理 websockets，配置这个参数
                 secure: false, // 如果是https接口，需要配置这个参数
                 changeOrigin: true, //是否跨域