|
@@ -95,25 +95,31 @@
|
|
|
<el-row :span="24" style="margin-top: 15px">
|
|
|
<el-col :span="8">
|
|
|
<p class="">{{values.originEquipment}}</p>
|
|
|
- <el-cascader
|
|
|
- :key="isResouceShow"
|
|
|
- :options="list"
|
|
|
- v-model="ops"
|
|
|
- :props="props"
|
|
|
- collapse-tags
|
|
|
- clearable
|
|
|
- />
|
|
|
+ <!-- <el-cascader-->
|
|
|
+ <!-- :key="isResouceShow"-->
|
|
|
+ <!-- :options="list"-->
|
|
|
+ <!-- v-model="ops"-->
|
|
|
+ <!-- :props="props"-->
|
|
|
+ <!-- collapse-tags-->
|
|
|
+ <!-- clearable-->
|
|
|
+ <!-- />-->
|
|
|
+ <el-select v-model="assetValue" placeholder="请选择" clearable filterable size="small" @change="changeVal">
|
|
|
+ <el-option v-for="item in assetOptions" :key="item.Code" :label="item.Name" :value="item.Code"></el-option>
|
|
|
+ </el-select>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<p class="">{{values.endEquipment}}</p>
|
|
|
- <el-cascader
|
|
|
- :options="list"
|
|
|
- v-model="filterOps"
|
|
|
- :key="isResouceShow"
|
|
|
- :props="props"
|
|
|
- collapse-tags
|
|
|
- clearable
|
|
|
- />
|
|
|
+ <!-- <el-cascader-->
|
|
|
+ <!-- :options="list"-->
|
|
|
+ <!-- v-model="filterOps"-->
|
|
|
+ <!-- :key="isResouceShow"-->
|
|
|
+ <!-- :props="props"-->
|
|
|
+ <!-- collapse-tags-->
|
|
|
+ <!-- clearable-->
|
|
|
+ <!-- />-->
|
|
|
+ <el-select v-model="assetValueLast" placeholder="请选择" clearable filterable size="small" @change="changeVal">
|
|
|
+ <el-option v-for="item in assetOptions" :key="item.Code" :label="item.Name" :value="item.Code"></el-option>
|
|
|
+ </el-select>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
@@ -237,6 +243,7 @@
|
|
|
<script>
|
|
|
import {mapGetters} from 'vuex'
|
|
|
import storage from '@/framework/utils/storage'
|
|
|
+ import {modelScanTaskQuery} from "@/api/relation/api";
|
|
|
|
|
|
export default {
|
|
|
name: "RelationMaintain",
|
|
@@ -286,6 +293,9 @@
|
|
|
ops: [],
|
|
|
filterOps: [],//为清空第二个选择器
|
|
|
isResouceShow: 0,
|
|
|
+ assetOptions: [],
|
|
|
+ assetValue: '',
|
|
|
+ assetValueLast: ''
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -322,7 +332,14 @@
|
|
|
deepCopy(obj) {
|
|
|
return JSON.parse(JSON.stringify(obj))
|
|
|
},
|
|
|
-
|
|
|
+ dialogEquipmentOpen() {
|
|
|
+ this.dialogEquipment = true
|
|
|
+ modelScanTaskQuery('', res => {
|
|
|
+ this.assetOptions = res.Content
|
|
|
+ })
|
|
|
+ },
|
|
|
+ changeVal() {
|
|
|
+ },
|
|
|
showCascader() {
|
|
|
++this.isResouceShow
|
|
|
let copy = this.deepCopy(this.source)
|
|
@@ -421,22 +438,25 @@
|
|
|
})
|
|
|
},
|
|
|
computedUpdate() {
|
|
|
- if (!this.resultOrigin.length && !this.ops.length) {
|
|
|
- this.$message({
|
|
|
- showClose: true,
|
|
|
- message: '请选择源端设备类',
|
|
|
- type: 'warning'
|
|
|
- });
|
|
|
- return false
|
|
|
- } else {
|
|
|
-
|
|
|
- if (this.resultOrigin.length || this.resultEnd.length) {
|
|
|
- this.resultOrigin.push(...this.resultEnd)
|
|
|
- this.$emit('openComputed', this.resultOrigin)
|
|
|
- }
|
|
|
- this.dialogTableVisibleMore = false
|
|
|
+ // if (!this.resultOrigin.length && !this.ops.length) {
|
|
|
+ // this.$message({
|
|
|
+ // showClose: true,
|
|
|
+ // message: '请选择源端设备类',
|
|
|
+ // type: 'warning'
|
|
|
+ // });
|
|
|
+ // return false
|
|
|
+ // } else {
|
|
|
+ // if (this.resultOrigin.length || this.resultEnd.length) {
|
|
|
+ // this.resultOrigin.push(...this.resultEnd)
|
|
|
+ // this.$emit('openComputed', this.resultOrigin)
|
|
|
+ // }
|
|
|
+ // this.dialogTableVisibleMore = false
|
|
|
+ //
|
|
|
+ // }
|
|
|
+ this.resultOrigin.push(...this.resultEnd)
|
|
|
+ this.$emit('openComputed', this.resultOrigin)
|
|
|
+ this.dialogTableVisibleMore = false
|
|
|
|
|
|
- }
|
|
|
},
|
|
|
}
|
|
|
}
|