|
@@ -1,15 +1,9 @@
|
|
|
<template>
|
|
|
- <el-dialog
|
|
|
- title="提示"
|
|
|
- :visible.sync="dialogVisible"
|
|
|
- width="60%"
|
|
|
- @close="handleClose"
|
|
|
- id="applyRules"
|
|
|
- >
|
|
|
+ <el-dialog title="提示" :visible.sync="dialogVisible" width="60%" @close="handleClose" id="applyRules">
|
|
|
<span>对应规则有冲突,请处理</span>
|
|
|
<el-tabs v-model="activeName" @tab-click="handleClick">
|
|
|
<el-tab-pane label="人工填写过表号功能号" name="first"></el-tab-pane>
|
|
|
- <el-tab-pane label="多个标识对应同一个信息点" name="second"></el-tab-pane>
|
|
|
+ <!-- <el-tab-pane label="多个标识对应同一个信息点" name="second"></el-tab-pane> -->
|
|
|
</el-tabs>
|
|
|
<el-table :data="tableData" style="width: 100%;max-height:400px;" height="calc(100% - 160px)">
|
|
|
<el-table-column type="expand" class-name="bgf5">
|
|
@@ -33,7 +27,9 @@
|
|
|
</el-row>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="设备实例本地名(本地编码)" prop="name" class-name="bgf5" align="center"></el-table-column>
|
|
|
+ <el-table-column label="设备实例本地名(本地编码)" prop="name" class-name="bgf5" align="center">
|
|
|
+
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="信息点" prop="name" align="center"></el-table-column>
|
|
|
<el-table-column label="原值" prop="desc" align="center">
|
|
|
<template slot-scope="scope">
|
|
@@ -53,6 +49,13 @@
|
|
|
</el-dialog>
|
|
|
</template>
|
|
|
<script>
|
|
|
+
|
|
|
+import {
|
|
|
+ dynamicPromptobjs, //提示冲突
|
|
|
+ dynamicClashConfirm, //冲突选择确认
|
|
|
+ dynamicQueryPoint, //查点位
|
|
|
+ dynamicExecute, //执行规则
|
|
|
+} from "@/api/scan/request";
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
@@ -127,15 +130,28 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
showDialog() {
|
|
|
- // this.tableData = data;
|
|
|
- this.dialogVisible = true;
|
|
|
+ if (this.tableData.length) {
|
|
|
+ this.dialogVisible = true;
|
|
|
+ } else {
|
|
|
+ dynamicExecute('', res => {
|
|
|
+ this.$message.success('执行成功');
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
- handleClick() {},
|
|
|
- handleClose(done) {},
|
|
|
- handleDelete(i, t) {}
|
|
|
+ handleClick() { },
|
|
|
+ handleClose(done) { },
|
|
|
+ handleDelete(i, t) { },
|
|
|
+ //查询是否有冲突
|
|
|
+ getPromptobjs() {
|
|
|
+ dynamicPromptobjs('', res => {
|
|
|
+ this.tableData = res.Content;
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
- mounted() {},
|
|
|
- created() {}
|
|
|
+ mounted() { },
|
|
|
+ created() {
|
|
|
+ this.getPromptobjs()
|
|
|
+ }
|
|
|
};
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|