|
@@ -56,7 +56,7 @@
|
|
|
</el-dialog>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import { dynamicDeleteRelation } from "@/api/scan/request";
|
|
|
+import { dynamicDeleteRelation, dynamicQueryPrompt } from "@/api/scan/request";
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
@@ -177,10 +177,11 @@ export default {
|
|
|
if (res[0].Objs.length > 1 || res[0].Points.length > 1) {
|
|
|
this.dialogWidth = "60%";
|
|
|
}
|
|
|
+ this.getDynamicQueryPrompt(row)
|
|
|
console.log(this.ltableData);
|
|
|
this.dialogVisible = true;
|
|
|
},
|
|
|
- handleClick() {},
|
|
|
+ handleClick() { },
|
|
|
handleClose(done) {
|
|
|
this.dialogVisible = false;
|
|
|
},
|
|
@@ -196,10 +197,37 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
//表格中选择事件
|
|
|
- changeSelection() {}
|
|
|
+ changeSelection() { },
|
|
|
+ //查询两边数据,同时拼删除param
|
|
|
+ getDynamicQueryPrompt(row) {
|
|
|
+ let p1 = {
|
|
|
+ Filters: `TypeCode='${row.TypeCode}';SubTypeCode='${row.SubTypeCode}';EquipmentMark='${row.EquipmentMark}'`,
|
|
|
+ PageNumber: 1,
|
|
|
+ PageSize: 500
|
|
|
+ }
|
|
|
+ //通过标识查询设备实例
|
|
|
+ let promise1 = new Promise((resolve, reject) => {
|
|
|
+ dynamicQueryPrompt(p1, res => {
|
|
|
+ resolve(res)
|
|
|
+ })
|
|
|
+ })
|
|
|
+ let p2 = {
|
|
|
+ Filters: `ObjectID='${row.ObjectID}'`,
|
|
|
+ PageNumber: 1,
|
|
|
+ PageSize: 500
|
|
|
+ }
|
|
|
+ let promise2 = new Promise((resolve, reject) => {
|
|
|
+ dynamicQueryPrompt(p2, res => {
|
|
|
+ resolve(res)
|
|
|
+ })
|
|
|
+ })
|
|
|
+ Promise.all([promise1, promise2]).then(res => {
|
|
|
+ console.log(res)
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
- mounted() {},
|
|
|
- created() {}
|
|
|
+ mounted() { },
|
|
|
+ created() { }
|
|
|
};
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|