|
@@ -59,7 +59,7 @@
|
|
|
<p>IED</p>
|
|
|
</div>
|
|
|
<div id="newIed" v-if="iedVer">
|
|
|
- <p id="addId" @click="lookAdd">
|
|
|
+ <p id="addId" @click="lookAdd(iedVer.i.list)">
|
|
|
<img :src="newlyPng" alt="" class="icons" />
|
|
|
<span style="color: #134bea">新增({{ iedVer.i.list.length }})</span>
|
|
|
</p>
|
|
@@ -67,7 +67,7 @@
|
|
|
<img :src="modifyPng" alt="" class="icons" />
|
|
|
<span style="color: #ffcb11">修改({{ iedVer.u.list.length }})</span>
|
|
|
</p>
|
|
|
- <p id="delId" @click="lookDel">
|
|
|
+ <p id="delId" @click="lookDel(iedVer.d.list)">
|
|
|
<img :src="delPng" alt="" class="icons" />
|
|
|
<span style="color: #e50505">删除({{ iedVer.d.list.length }})</span>
|
|
|
</p>
|
|
@@ -84,6 +84,7 @@
|
|
|
:checkDialogData="checkDialogData"
|
|
|
:iedRelationData="iedRelationData"
|
|
|
:scdView="scdView"
|
|
|
+ :delScdId="delScdId"
|
|
|
></dialog-index>
|
|
|
<div id="wrapperscd"></div>
|
|
|
</div>
|
|
@@ -111,7 +112,7 @@ const props = defineProps({
|
|
|
type: Array,
|
|
|
default: () => [],
|
|
|
},
|
|
|
- clickView: {
|
|
|
+ clickViewData: {
|
|
|
type: Object,
|
|
|
default: () => {},
|
|
|
},
|
|
@@ -161,16 +162,17 @@ const lineWrite = () => {
|
|
|
})
|
|
|
);
|
|
|
hiddenLine2();
|
|
|
- console.log("lineList.value", lineList.value);
|
|
|
};
|
|
|
const clickRow = ref(false);
|
|
|
+const clickRowData = ref({});//对比列表点击的数据
|
|
|
watch(
|
|
|
- () => props.clickView,
|
|
|
+ () => props.clickViewData,
|
|
|
(newValue) => {
|
|
|
+ iedVer.value = {};
|
|
|
if (newValue) {
|
|
|
+ clickRowData.value = newValue;
|
|
|
clickRow.value = true;
|
|
|
detailData.value = null;
|
|
|
- iedVer.value = {};
|
|
|
lineList.value.forEach((item) => item.remove());
|
|
|
lineList.value = [];
|
|
|
}
|
|
@@ -183,7 +185,8 @@ const iedVer = ref({});
|
|
|
watch(
|
|
|
() => props.scdipadMini,
|
|
|
(newValue) => {
|
|
|
- if (newValue && clickRow) {
|
|
|
+ if (newValue && clickRow.value) {
|
|
|
+ iedVer.value = {};
|
|
|
detailData.value = newValue;
|
|
|
// SCD版本数据
|
|
|
const scdv = detailData.value.filter(
|
|
@@ -224,30 +227,53 @@ const done = (emits) => {
|
|
|
openBig.value = emits;
|
|
|
checkDialogData.value = null;
|
|
|
scdView.value = false;
|
|
|
+ delScdId.value = ''
|
|
|
};
|
|
|
const iedRelationData = ref({}); //左侧所有数据
|
|
|
const scdView = ref(false); //是否是点击Scd文件一致性校核进入的
|
|
|
-const lookAdd = async () => {
|
|
|
- console.log('window.ApiServer', window.ApiServer)
|
|
|
- iedRelationData.value = {}
|
|
|
+const delScdId = ref('');//点击删除的scd_id
|
|
|
+const lookAddOrDel =async (comData,del) => {
|
|
|
+ iedRelationData.value = {};
|
|
|
+ checkDialogData.value =null;
|
|
|
scdView.value = true;
|
|
|
- for (let k = 0; k < iedVer.value.i.list.length; k++) {
|
|
|
- let item = iedVer.value.i.list[k];
|
|
|
+ const iedDetail = {};
|
|
|
+ for (let k = 0; k < comData.length; k++) {
|
|
|
+ let item = comData[k];
|
|
|
const key = item.ied_name;
|
|
|
- iedRelationData.value[key] = item;
|
|
|
+ iedDetail[key] = item;
|
|
|
+ }
|
|
|
+ // 获取对象的所有键,并存入数组
|
|
|
+ let keys = Object.keys(iedDetail);
|
|
|
+ // 对键进行排序===
|
|
|
+ keys.sort();
|
|
|
+ for (let key of keys) {
|
|
|
+ iedRelationData.value[key] = iedDetail[key];
|
|
|
}
|
|
|
- console.log("iedRelationData.value", iedRelationData.value);
|
|
|
+ if(del=='del'&&clickRowData.value.target_id){
|
|
|
+ delScdId.value= clickRowData.value.target_id
|
|
|
+ }else{
|
|
|
+ delScdId.value=route.query.id
|
|
|
+ }
|
|
|
+ // 对键进行排序===
|
|
|
const iedRes = await scdIedRelation({
|
|
|
- scd_id: route.query.id,
|
|
|
- ied_name: "CE2201",
|
|
|
+ scd_id: delScdId.value,
|
|
|
+ ied_name: comData[0].ied_name,
|
|
|
reset: 1,
|
|
|
});
|
|
|
- checkDialogData.value = iedRes.data["CE2201"];
|
|
|
+ checkDialogData.value = iedRes.data[comData[0].ied_name];
|
|
|
openBig.value = true;
|
|
|
|
|
|
+}
|
|
|
+const lookAdd = async (comData) => {
|
|
|
+ lookAddOrDel(comData)
|
|
|
// lookType.value = 1;
|
|
|
// emit("nowBack", lookType.value);
|
|
|
};
|
|
|
+const lookDel = (comData) => {
|
|
|
+ lookAddOrDel(comData,'del')
|
|
|
+ // lookType.value = 3;
|
|
|
+ // emit("nowBack", lookType.value);
|
|
|
+};
|
|
|
const hiddenLine2 = () => {
|
|
|
const elmWrapper = document.getElementById("wrapperscd");
|
|
|
// 移动 line
|
|
@@ -281,10 +307,7 @@ const lookEdit = () => {
|
|
|
lookType.value = 2;
|
|
|
emit("nowBack", lookType.value);
|
|
|
};
|
|
|
-const lookDel = () => {
|
|
|
- lookType.value = 3;
|
|
|
- emit("nowBack", lookType.value);
|
|
|
-};
|
|
|
+
|
|
|
onMounted(() => {});
|
|
|
onBeforeUnmount(() => {
|
|
|
// lineList.value.forEach((item) => item.remove());
|