Browse Source

数据权限接口对接

liujiejie 1 year ago
parent
commit
8a7fabc200

+ 5 - 5
src/utils/getMenu.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2024-05-21 14:21:20
- * @LastEditTime: 2024-06-11 14:20:54
+ * @LastEditTime: 2024-06-12 10:23:19
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/utils/getMenu.js
@@ -60,7 +60,7 @@ export const checkDataAuthTreeFn = (data) => {
   recursiveFind(data);
   function recursiveFind(data) {
     data.forEach((item) => {
-      if (item.checked === 1) {
+      if (item.checked === 1 && item.children.length === 0) {
         list.push(item.codeNumber);
       }
       if (item.children && item.children.length > 0) {
@@ -77,10 +77,10 @@ export const getCheckDataAuthTreeFn = (checkIdList, data) => {
     if (checkIdList.includes(node.codeNumber)) {
       // 将当前节点的 codeNumber 加入到列表中
       list.push({ codeNumber: node.codeNumber, codeType: node.type });
-      // 将当前节点的祖先节点的 codeNumber 加入到列表中
+      // 将当前节点的祖先节点的
       ancestors.forEach((ancestor) => {
-        list.push({ codeNumber: ancestor.codeNumber, codeType: node.type });
-      });
+        list.push({ codeNumber: ancestor.codeNumber, codeType: ancestor.type });
+      }); //codeNumber 加入到列表中
     }
     // 递归遍历子节点
     if (node.children && node.children.length > 0) {

+ 10 - 8
src/views/performance/assetssDetail.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-27 09:25:45
- * @LastEditTime: 2024-06-12 09:23:05
+ * @LastEditTime: 2024-06-12 10:31:16
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/assetssDetail.vue
@@ -74,17 +74,16 @@ export default {
   created() {
     //获取分析 分析类型、机组编号 列表
     this.getWindCodeList();
-    //获取详情信息
-    // this.getDetailInfo();
   },
   methods: {
     async getDetailInfo() {
+      const formData = new FormData();
+      formData.append("batchCode", this.$route.query.batchCode);
+      formData.append("analysisTypeCode", this.formInfo.analysisTypeCode);
+      formData.append("fieldEngineCode", this.formInfo.fieldEngineCode);
+      //获取详情信息
       try {
-        const response = await analysisDetail({
-          batchCode: this.$route.query.batchCode,
-          analysisTypeCode: this.formInfo.analysisTypeCode,
-          fieldEngineCode: this.formInfo.fieldEngineCode,
-        });
+        const response = await analysisDetail(formData);
         this.detailInfo = response.data;
       } catch (error) {
         console.error(error);
@@ -97,6 +96,9 @@ export default {
         });
         this.analysisTypeList = response.data.analysisTypeList;
         this.windEngineGroupList = response.data.windEngineGroupList;
+        this.formInfo.fieldEngineCode = response.data.windEngineGroupList[0];
+        this.formInfo.analysisTypeCode =
+          response.data.analysisTypeList[0].typeCode;
         this.getDetailInfo();
       } catch (error) {
         console.error(error);

+ 7 - 2
src/views/system/roleMag/components/dataAuth.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-06-11 09:36:36
- * @LastEditTime: 2024-06-11 14:18:11
+ * @LastEditTime: 2024-06-12 10:26:37
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /dashengmag/performance-test/src/views/system/roleMag/components/dataAuth.vue
@@ -68,8 +68,13 @@ export default {
         this.$refs.tree.getCheckedKeys(),
         this.menuList
       );
+      const uniqueArray = Array.from(
+        new Set(result.map((item) => item.codeNumber))
+      ).map((id) => {
+        return result.find((item) => item.codeNumber === id);
+      });
       return {
-        organizationCodes: result,
+        organizationCodes: uniqueArray,
         roleIdAuth: this.treeObj.roleId,
       };
     },

+ 2 - 2
vue.config.js

@@ -64,9 +64,9 @@ module.exports = {
     // contentBase: path.join(__dirname, "public"),
     proxy: {
       "/api": {
-        // target: "http://192.168.5.4:16200", // 石月
+        target: "http://192.168.5.4:16200", // 石月
         // target: "http://192.168.50.235:16200", //内网
-        target: "http://192.168.5.15:16200",
+        // target: "http://192.168.5.15:16200",
         // target: "http://106.120.102.238:16600", //外网
         changeOrigin: true,
         pathRewrite: {