6

src/pages/components/drawModal/AbilityModal.vue

@@ -41,6 +41,7 @@
 import { ref, onMounted, watch, toRefs } from 'vue';
 import flow from "@/api/flow/flow"
 import AddAbility from './AddAbility.vue';
+import { ElMessage } from 'element-plus';
 export default {
     props: {
         abModal: {
@@ -64,6 +65,7 @@ export default {
         let tableData = ref([])//表格数据
         let editOrAdd = ref(0)//0为新增，1为编辑
         let editRow = ref({})//编辑的对象
+        let delFcda = ref("")//需要删除的fcda_id
         watch(() => props.modelId, (newVal) => {
             modelIds.value = newVal
         })
@@ -108,11 +110,27 @@ export default {
         }
         // 删除功能
         function delAbility(row) {
-            console.log(row, 'row');
+            delFcda.value = row.id
         }
         // 确认删除功能
         function firmSure() {
-
+            flow.delModelOn({
+                model_id: modelIds.value - 0,
+                fcda_id: delFcda.value - 0,
+            }).then(res => {
+                if (res.code == 0) {
+                    ElMessage({
+                        type: "success",
+                        message: "删除成功！"
+                    })
+                    copyReload()
+                }else{
+                    ElMessage({
+                        message:res.msg,
+                        type:"error"
+                    })
+                }
+            })
         }
         function addAback(data) {
             addModal.value = data
@@ -137,6 +155,7 @@ export default {
             firmSure,//确认删除功能
             editOrAdd,//0为新增，1为编辑
             editRow,//编辑的对象
+            delFcda,//需要删除的fcdaid
         }
     },
     components: {

src/pages/components/drawModal/AddAbility.vue

@@ -115,13 +115,17 @@ export default {
                 model_id: needModel.value - 0,
                 ied_type: needIedType.value
             }).then(res => {
-                options.value = res.data.map((item, index) => {
-                    return {
-                        label: item.func_name,
-                        id: item.id,
-                        value: item.func_name
-                    }
-                })
+                if (res.data !== null && res.data.length > 0) {
+                    options.value = res.data.map((item, index) => {
+                        return {
+                            label: item.func_name,
+                            id: item.id,
+                            value: item.func_name
+                        }
+                    })
+                } else {
+                    options.value = []
+                }
             })
             if (numState.value == 1) {
                 abilityFrom.value.setAbName = needEditRow.value.func_name
@@ -190,7 +194,12 @@ export default {
         }
         // 设计功能名称change事件
         function abNameChange(e) {
-            abilityFrom.value.setAbName = e.label
+            if (e.label) {
+                abilityFrom.value.setAbName = e.label
+            } else {
+                abilityFrom.value.setAbName = e
+            }
+
         }
         onMounted(() => {
             reload()

src/pages/system/modalComp/AddNode.vue

@@ -120,6 +120,7 @@ export default {
                 ruleForm.value.flashName = props.needRow.vol_id
             })
             litLine.getAllLine({ pageno: 1, pagesize: 100 }).then(res => {
+                console.log(res,'接线方式');
                 moduleList.value = res.data
                 ruleForm.value.linkStyle = props.needRow.line_link_style
             })