update

src/views/education/component/head.vue

@@ -126,6 +126,29 @@ export default {
                         name: '最近修改时间'
                     },
                 ]
+            } else if (this.type === '11') {
+                 this.productNameArr = [
+                    {
+                        id: '不限',
+                        name: ' '
+                    },
+                    {
+                        id: '设备编号',
+                        name: '设备编号'
+                    },
+                    {
+                        id: '设备名称',
+                        name: '设备名称'
+                    },
+                    {
+                        id: '工序名称',
+                        name: '工序名称'
+                    },
+                    {
+                        id: '线体名称',
+                        name: '线体名称'
+                    }
+                ]
             }
          }else{
               this.placeText = '请输入名称'

src/views/education/component/linePop.vue

@@ -534,6 +534,7 @@ export default {
                 }else if(this.type==7){
                     this.valuedata = {
                         Name:this.nameV,
+                        DevNuber: '',
                     }
                     this.valuedata.LineName = this.lineValue
                     this.valuedata.CellName = this.workValue

src/views/education/component/relateDialog.vue

@@ -11,42 +11,42 @@
                 <div class="searchForm" >
                   <div class="search-block">
                     <span class="search" >设备:</span>
-                    <el-select class="selectName" v-model="equipValue" placeholder="请选择">
+                    <el-select class="selectName" @change="getGroups" v-model="argDevice" placeholder="请选择">
                         <el-option
-                            v-for="item in equipList"
-                            :key="item.name"
-                            :label="item.name"
-                            :value="item.name">
+                            v-for="item in deviceList"
+                            :key="item.Name"
+                            :label="item.Name"
+                            :value="item.Type">
                         </el-option>
                     </el-select>
                   </div>
 
                   <div class="search-block">
                     <span class="search" >组名:</span>
-                    <el-select class="selectName" v-model="equipValue" placeholder="请选择">
+                    <el-select class="selectName" @click="getTypes" v-model="argGroup" placeholder="请选择">
                         <el-option
-                            v-for="item in equipList"
-                            :key="item.name"
-                            :label="item.name"
-                            :value="item.name">
+                            v-for="item in groupList"
+                            :key="item.Name"
+                            :label="item.Name"
+                            :value="item.Type">
                         </el-option>
                     </el-select>
                   </div>
 
                   <div class="search-block">
                     <span class="search" >数据类型:</span>
-                    <el-select class="selectName" v-model="equipValue" placeholder="请选择">
+                    <el-select class="selectName" v-model="argDataType" placeholder="请选择">
                         <el-option
-                            v-for="item in equipList"
-                            :key="item.name"
-                            :label="item.name"
-                            :value="item.name">
+                            v-for="item in typeList"
+                            :key="item.Name"
+                            :label="item.Name"
+                            :value="item.Type">
                         </el-option>
                     </el-select>
                   </div>
 
                   <div class="search-block search-input" style="margin-left: 20px">
-                    <el-input type="text" v-model="equipValue" placeholder="关键字" ></el-input>
+                    <el-input type="text" v-model="argKeyWord" placeholder="关键字" ></el-input>
                   </div>
 
                   <div class="search-btn" >查询</div>
@@ -111,8 +111,13 @@ export default {
       components: { Pagination },
       data() {
         return {
-          equipValue: '',
-          equipList: [],
+          argDevice: '',
+          argGroup: '',
+          argDataType: '',
+          argKeyWord: '',
+          deviceList: [],
+          typeList: [],
+          groupList: [],
           innerTableData: [],
           num: 1,
         }
@@ -140,7 +145,9 @@ export default {
             };
         }
       },
-     
+      created () {
+        this.getDevices()
+      },
       methods:{
         // guid() {
         //   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
@@ -175,7 +182,49 @@ export default {
             value1 : this.value1,
           }
           this.$emit('conserve', dialogData)
+        },
+        getDevices () {
+          this.$axios({
+              method:"post",
+              url:`/api/VariableManage/QueryDevices`,
+            }).then((res)=>{
+              this.deviceList = res.data.data
+              this.typeList = []
+              this.groupList = []
+            })
+        },
+        getGroups () {
+          this.$axios({
+              method:"post",
+              url:`/api/VariableManage/DeviceChange`,
+              data: { device: this.argDevice }
+            }).then((res)=>{
+              if (res.data.data) {
+                this.groupList = res.data.data
+                this.typeList = []
+              } else {
+                this.groupList = []
               }
+            })
+        },
+        getTypes () {
+          var postData = {
+            device: this.argDevice,
+            group: this.argGroup,
+            limit: ''
+          }
+          this.$axios({
+              method:"post",
+              url:`/api/VariableManage/GroupChange`,
+              data: postData
+            }).then((res)=>{
+              if (res.data.data) {
+                this.typeList = res.data.data
+              } else {
+                this.typeList = []
+              }
+            })
+        },
       }
 }
 </script>

src/views/education/deviceManage.vue

@@ -96,7 +96,7 @@
               <LinePop :typePop='type' :tData="tData" :tData2="tData2" :data="itemdata" type="7" v-if="popShow" @openRelate="openRelate" ></LinePop>
               <deletePop ref="delete" :deletetext="deletetext" :type="typeV" v-if="deleteShow"></deletePop>
               <div v-if="popShow || deleteShow" class="box"></div>
-              <relate-dialog v-if="relateShow" @closeDialog="closeDialog" />
+              <relate-dialog v-if="relateShow" @conserve="saveData" @closeDialog="closeDialog" />
        </div>
 </template>
 
@@ -177,6 +177,10 @@ export default {
         },
         closeDialog () {
           this.relateShow = false
+        },
+        // 保存变量
+        saveData (data) {
+          console.log(data)
         },
           //查询添加工序
         queryWord(){
@@ -480,7 +484,6 @@ export default {
              this.num = ''
            }
         }
-
       }
 }
 </script>