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/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, //是否跨域