11

ruoyi-ui/src/views/platform/plugin/index.vue

@@ -3,7 +3,7 @@
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
          <el-form-item label="目录名称" prop="deptName">
             <el-input
-               v-model="queryParams.deptName"
+               v-model="queryParams.catalogName"
                placeholder=""
                clearable
                style="width: 200px"

ruoyi-ui/src/views/register/componentReg/index.vue

@@ -1877,7 +1877,7 @@ async function editSer(row){
 }
 const dialogVisibleSer = ref(false)
 function handleNodeClick(node, data){
-    console.log(node.mgid)
+  console.log(node,data)
     parMgid.value = node.mgid
     var keyArray = []
     selFen.value = false
@@ -2005,6 +2005,7 @@ function saveChangePar(){
       }
     })
     if(parRule === true){
+      tableDataCanAll.value = removeDuplicateObjects(tableDataCanAll.value)
       changePar(tableDataCanAll.value).then(res=>{
         if(res.code===200){
           proxy.$modal.msgSuccess("修改成功");
@@ -2030,6 +2031,14 @@ function saveChangePar(){
     })
   }
 }
+function removeDuplicateObjects(arr) {
+    // 将对象数组转换为JSON字符串数组，利用Set去重，再转换回对象
+    const uniqueArray = Array.from(
+        new Set(arr.map(obj => JSON.stringify(obj)))
+    ).map(str => JSON.parse(str));
+    
+    return uniqueArray;
+}
 async function showPei(row){
   remarkVer.value = ''
   fileVersion.value = ''
@@ -2074,13 +2083,7 @@ async function showPei(row){
       }
     }
   })
-  await getModelParList(par).then(res=>{
-    groupTreeData.value = res.data
-    groupTreeData.value.forEach((item, index, array) => { 
-      item.label = item.parGroupName
-      item.value = item.parGroupCode
-    })
-  })
+  
   await getModelDetail(row.mdid).then(res=>{
     parForm.value = res.data
     formJi.value = res.data
@@ -2094,6 +2097,18 @@ async function showPei(row){
   }) 
   
   tableDataCanAll.value = JSON.parse(JSON.stringify(tableDataCan.value))
+  await getModelParList(par).then(res=>{
+    groupTreeData.value = res.data
+    groupTreeData.value.forEach((item, index, array) => { 
+      item.label = item.parGroupName
+      item.value = item.parGroupCode
+    })
+    console.log(groupTreeData.value)
+    var par1  = {
+      data:groupTreeData.value[0]
+    }
+    handleNodeClick(groupTreeData.value[0],par1)
+  })
 }
 function delCan(index,row){
   tableDataCan.value.splice(index, 1)
@@ -2342,11 +2357,12 @@ async function delVer(row) {
   });
 }
 function clearForm(){
+  parMgid.value = null
   tableDataCan.value = []
   formAdd.value = {
   }
   tableDataCanAdd.value = []
-  checked1.value = false
+  checked1.value = true
   activeName.value = 'first'
   fileList.value = []
   fileList1.value = []

ruoyi-ui/src/views/register/componentReg/peizhi.vue

@@ -75,7 +75,12 @@
         <el-table-column prop="address" label="操作" width="100">
             <template #default="scope">
                 <div style="display: flex;justify-content: space-between;width: 100%;">
+                    <!-- <el-button type="primary" @click="showEdit(scope.row)" size="mini" text style="margin-left: 0%;">编辑</el-button> -->
+                    <!-- <el-button type="danger" text size="mini" style="margin-left: -5%;" @click="handleDelete(scope.row)">注销</el-button> -->
+                    <!-- <el-button @click="showDe(scope.row)" type="primary" text size="mini" style="margin-left: -5%;">查看</el-button> -->
                     <el-button @click="showPei(scope.row)" type="warning" text size="mini" style="margin-left: -5%;">配置</el-button>
+                    <!-- <el-button type="danger" @click="delModel(scope.row)" text size="mini" style="margin-left: -5%;">删除</el-button>
+                    <el-button v-if="scope.row.audit === null||scope.row.audit === '2'||scope.row.audit === ''" type="info" @click="shenhe(scope.row)" text size="mini" style="margin-left: -5%;">审核申请</el-button> -->
                 </div>
             </template>
         </el-table-column>
@@ -1872,7 +1877,7 @@ async function editSer(row){
 }
 const dialogVisibleSer = ref(false)
 function handleNodeClick(node, data){
-    console.log(node.mgid)
+  console.log(node,data)
     parMgid.value = node.mgid
     var keyArray = []
     selFen.value = false
@@ -2000,6 +2005,7 @@ function saveChangePar(){
       }
     })
     if(parRule === true){
+      tableDataCanAll.value = removeDuplicateObjects(tableDataCanAll.value)
       changePar(tableDataCanAll.value).then(res=>{
         if(res.code===200){
           proxy.$modal.msgSuccess("修改成功");
@@ -2025,6 +2031,14 @@ function saveChangePar(){
     })
   }
 }
+function removeDuplicateObjects(arr) {
+    // 将对象数组转换为JSON字符串数组，利用Set去重，再转换回对象
+    const uniqueArray = Array.from(
+        new Set(arr.map(obj => JSON.stringify(obj)))
+    ).map(str => JSON.parse(str));
+    
+    return uniqueArray;
+}
 async function showPei(row){
   remarkVer.value = ''
   fileVersion.value = ''
@@ -2069,13 +2083,7 @@ async function showPei(row){
       }
     }
   })
-  await getModelParList(par).then(res=>{
-    groupTreeData.value = res.data
-    groupTreeData.value.forEach((item, index, array) => { 
-      item.label = item.parGroupName
-      item.value = item.parGroupCode
-    })
-  })
+  
   await getModelDetail(row.mdid).then(res=>{
     parForm.value = res.data
     formJi.value = res.data
@@ -2089,6 +2097,18 @@ async function showPei(row){
   }) 
   
   tableDataCanAll.value = JSON.parse(JSON.stringify(tableDataCan.value))
+  await getModelParList(par).then(res=>{
+    groupTreeData.value = res.data
+    groupTreeData.value.forEach((item, index, array) => { 
+      item.label = item.parGroupName
+      item.value = item.parGroupCode
+    })
+    console.log(groupTreeData.value)
+    var par1  = {
+      data:groupTreeData.value[0]
+    }
+    handleNodeClick(groupTreeData.value[0],par1)
+  })
 }
 function delCan(index,row){
   tableDataCan.value.splice(index, 1)
@@ -2337,11 +2357,12 @@ async function delVer(row) {
   });
 }
 function clearForm(){
+  parMgid.value = null
   tableDataCan.value = []
   formAdd.value = {
   }
   tableDataCanAdd.value = []
-  checked1.value = false
+  checked1.value = true
   activeName.value = 'first'
   fileList.value = []
   fileList1.value = []

ruoyi-ui/src/views/service/fabu/fabu.vue

@@ -197,6 +197,9 @@
                   <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.state=='1'">
                     已发布
                   </div>
+                  <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.state=='2'">
+                    下线
+                  </div>
                   <div style="text-align: center;display: flex;color:#F56C6C" v-if="scope.row.state=='0'||scope.row.state==null">
                     未发布
                   </div>

ruoyi-ui/src/views/service/info/fabu.vue

@@ -230,6 +230,9 @@
               </el-table-column>
               <el-table-column prop="audit" label="发布状态" width="100">
                 <template #default="scope">
+                  <div style="text-align: center;display: flex;color:red" v-if="scope.row.state=='2'">
+                    已下线
+                  </div>
                   <div style="text-align: center;display: flex;color:#67C23A" v-if="scope.row.state=='1'">
                     已发布
                   </div>