From 1c9e53869cafc68b079af7d2bb3b150d2c041901 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Thu, 26 Sep 2024 13:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B9=E6=A1=88=E6=95=B0=E6=8D=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=A1=B9=EF=BC=8C=E6=95=B0=E6=8D=AE=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/planData/components/popup.vue      | 32 +++++++++++++++----
 .../device/planData/components/schemeTree.vue |  4 +--
 src/views/govern/device/planData/index.vue    | 11 +++----
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/views/govern/device/planData/components/popup.vue b/src/views/govern/device/planData/components/popup.vue
index d0e0f94..9e4d160 100644
--- a/src/views/govern/device/planData/components/popup.vue
+++ b/src/views/govern/device/planData/components/popup.vue
@@ -23,7 +23,7 @@
         </el-form>
         <!-- 测试项信息&数据绑定页面 -->
         <el-tabs type="border-card" v-model="activeName" v-if="popupType != 0 && popupType != 1">
-            <el-tab-pane label="测试项信息" :name="0">
+            <el-tab-pane label="测试项信息" :name="0" v-if="openType == 'tree'">
                 <el-form
                     :model="form1"
                     ref="ruleFormRef2"
@@ -167,7 +167,7 @@
                     </el-form-item>
                 </el-form>
             </el-tab-pane>
-            <el-tab-pane label="数据绑定" :name="2">
+            <el-tab-pane label="数据绑定" :name="1" v-if="openType == 'table'">
                 <TreeTransfers :fromData="unBindList" :toData="bindList" @getData="getData" />
             </el-tab-pane>
         </el-tabs>
@@ -386,9 +386,19 @@ const title: any = ref('')
 const popupType: any = ref(null)
 //方案/测试项id
 const planId: any = ref('')
+//打开的类型
+const openType = ref('')
+const detailsType = (val: any) => {
+    openType.value = val
+    if (val == 'tree') {
+        activeName.value = 0
+    }
+    if (val == 'table') {
+        activeName.value = 1
+    }
+}
 //回显方案、测试项操作
 const details = (val: any) => {
-    console.log(val, '回显方案测试项操作66666')
     if (val.records && val.records.length != 0) {
         form.value = {
             describe: val.describe,
@@ -425,7 +435,6 @@ const open = async (val: any, id: any) => {
     title.value = val == 0 ? '新增方案' : val == 1 ? '修改方案' : val == 2 ? '新增测试项' : '修改测试项'
     dialogVisible.value = true
     planId.value = id
-    console.log(11111, val, '==============>>>>>>>>')
     //新增方案或者测试项数据
     if (val == 0 || val == 2) {
         initForm()
@@ -444,7 +453,7 @@ const open = async (val: any, id: any) => {
         getDeviceList({ id: id, isTrueFlag: 1 }).then(res => {
             bindList.value = res.data
         })
-        activeName.value = 0
+        // activeName.value = 0
     }
 }
 //获取选择的绑定的数据
@@ -558,6 +567,17 @@ const submit = () => {
     }
     //修改测试项
     if (popupType.value == 3) {
+        let subForm = JSON.parse(JSON.stringify(form1.value))
+        subForm.list = checkedIdList.value
+        updateRecord(subForm).then((res: any) => {
+            if (res.code == 'A0000') {
+                ElMessage.success('修改测试项成功')
+                initForm()
+                emit('onSubmit')
+                close()
+            }
+        })
+        return
         ruleFormRef2.value.validate((valid: any) => {
             if (valid) {
                 let subForm = JSON.parse(JSON.stringify(form1.value))
@@ -576,7 +596,7 @@ const submit = () => {
         })
     }
 }
-defineExpose({ open, details })
+defineExpose({ open, details, detailsType })
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__content {
diff --git a/src/views/govern/device/planData/components/schemeTree.vue b/src/views/govern/device/planData/components/schemeTree.vue
index f878cf6..379993f 100644
--- a/src/views/govern/device/planData/components/schemeTree.vue
+++ b/src/views/govern/device/planData/components/schemeTree.vue
@@ -188,20 +188,20 @@ const add = (node: any, data: any) => {
 }
 /** 编辑树节点 */
 const edit = async (node: Node, data: any) => {
-    console.log(data, '????????????')
     planId.value = data.id
     await getTestRecordInfo(planId.value)
         .then(res => {
-            console.log(res, '++++++++++++++++++++195========>')
             //修改方案
             if (data.children) {
                 dialogRef.value.details(res.data)
+                dialogRef.value.detailsType("")
                 handleOpen(1, planId.value)
             }
             //修改测试项
             else {
                 monitorId.value = data.id
                 dialogRef.value.details(res.data.records[0])
+                dialogRef.value.detailsType("tree")
                 handleOpen(3, planId.value)
             }
         })
diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue
index 1280287..b6752bf 100644
--- a/src/views/govern/device/planData/index.vue
+++ b/src/views/govern/device/planData/index.vue
@@ -272,7 +272,6 @@ const nodeClick = async (e: anyObj) => {
 const dialogRef = ref()
 const dailogForm = ref()
 const handleOpen = (val: any) => {
-    console.log(deviceData.value, '++++++++')
     deviceData.value.records.map((item: any) => {
         if (item.id == activeName.value) {
             dailogForm.value = item
@@ -281,12 +280,15 @@ const handleOpen = (val: any) => {
     dialogRef.value.details(dailogForm.value)
     // deviceData.value.records[0].id
     let ids = ''
+    //数据绑定
     if (val == 3) {
         ids = deviceData.value.records.find((item: any) => {
             return item.id == activeName.value
         })?.id
+        dialogRef.value.detailsType("table")
     } else {
         ids = ''
+        dialogRef.value.detailsType("")
     }
     dialogRef.value.open(val, ids)
 }
@@ -302,7 +304,6 @@ const range = (start: any, end: any, step: any) => {
 }
 const init = () => {
     //调用子组件的方法切换的时候tree的节点也变化
-    console.log(activeName.value, '000000')
     let list: any = []
     loading.value = true
     //颜色数组
@@ -371,7 +372,6 @@ const init = () => {
 
         getHistoryTrend(obj)
             .then((res: any) => {
-                console.log(res, '+++++++++3666')
                 if (res.code === 'A0000') {
                     historyDataList.value = res.data
                     echartsData.value = null
@@ -390,9 +390,6 @@ const init = () => {
                     xAxis = timeList.sort((a: any, b: any) => {
                         return new Date(a).getTime() - new Date(b).getTime()
                     })
-                    // xAxis.map((item:any)=>{
-                    //     item=item.replace(" ","\n")
-                    // })
                     echartsData.value = {
                         options: {
                             title: [
@@ -447,7 +444,7 @@ const init = () => {
                                 height: 50
                             },
                             grid: {
-                                left: '5%',
+                                left: historyDataList.value.length != 0 ? '5%' : '1%',
                                 right: '5%',
                                 bottom: '10%',
                                 top: '8%',