Merge remote-tracking branch 'origin/master'

src/store/modules/user.js

@@ -24,8 +24,12 @@ export const useAppLogin = async (form) => {
     if (!error && status === 200) {
         const info = await setUserAppInfo(res)
         return { error: info.error, msg: info.msg }
+    } else if (status === 401) {
+        const info = await setUserAppInfo(res)
+        return { error: info.error, msg: info.msg, status:status }
     } else {
         return Promise.reject({ error, status, res })
+    
     }
 }
 

src/views/data-fill/division.vue

@@ -395,7 +395,7 @@ import HcTreeData from './components/division/HcTreeData.vue'
 import HcTreeData1 from './components/division/HcTreeData1.vue'
 import DivisionTree from './components/division/DivisionTree.vue'
 import HcTreeNode from './components/HcTreeNode.vue'
-import { arrIndex, arrToId, deepClone, formValidate, getArrValue, getObjValue } from 'js-fast-way'
+import { arrDelKey, arrIndex, arrToId, deepClone, formValidate, getArrValue, getObjValue } from 'js-fast-way'
 import { getStoreValue, setStoreValue } from '~src/utils/storage'
 import { getDictionary } from '~api/other'
 import wbsApi from '~api/data-fill/wbs'
@@ -707,8 +707,18 @@ const loadMenu = ({ node, item, level }, resolve)=>{
     let iscan = false
     iscan = childNodes.some(obj => obj.data.isCustom !== 1)
     console.log(iscan, 'iscan')
+
+       //自定义节点类型下如果有自定义节点，就不允许新增节点
+    let iscan1 = false
+    iscan1 = childNodes.some(obj => obj.data.isCustom === 1)
+
     const { isCustom } = item
-    if (isCustom === 1 && !iscan) {
+    if (isCustom === 1 && iscan1 && !iscan) {
+        menusArr.unshift( { icon: 'add-circle', label: '新增自定义节点', key: 'add1' })
+       let menusArr1 = arrDelKey(menusArr, 'label', '新增节点') // [{id:1}]
+        console.log(menusArr1, 'menusArr')
+        resolve(menusArr1)
+    } else if (isCustom === 1 && !iscan) {
         menusArr.unshift( { icon: 'add-circle', label: '新增自定义节点', key: 'add1' })
         resolve(menusArr)
     } else if (level === 1) {
@@ -824,6 +834,31 @@ const copyNodeElTreeClick = ({ data, node }) => {
             } else {
                 window?.$message?.warning('该节点已存在上报数据，不允许复制')
             }
+        } else {
+            if (data['id'] !== formCopyNodeModel.value.id) {//不能复制到本身节点下
+                    //只能往上一级点击，不能跨层级点击
+                    //如果选择的是父级节点，那不能复制到子级节点
+                    if (type === 6 && (data['type'] === 4 || data['type'] === 5 || data['type'] == 6)) {
+                        setCopyNodeTable(data, title)
+                    }
+                    if (type === 5 && data['type'] === 4) {
+                        setCopyNodeTable(data, title, partitionCode)
+                    }
+                    if (type === 4 && (data['type'] === 2 || data['type'] === 3)) {
+                        setCopyNodeTable(data, title, partitionCode)
+                    }
+                    if (type === 3 && data['type'] === 2) {
+                        setCopyNodeTable(data, title, partitionCode)
+                    }
+                    if (type === 2 && data['type'] === 1) {
+                        setCopyNodeTable(data, title, partitionCode)
+                    }
+                    if (type === 1 && data['type'] === 1) {
+                        setCopyNodeTable(data, title, partitionCode)
+                    }
+
+
+                }
         }
       
 

src/views/data-fill/wbs.vue

@@ -528,6 +528,7 @@ import HcTreeNode from './components/HcTreeNode.vue'
 import { getTokenHeader } from '~src/api/request/header'
 import { getStoreValue, setStoreValue } from '~src/utils/storage'
 import {
+    arrDelKey,
     deepClone,
     formValidate,
     getArrValue,
@@ -1228,6 +1229,31 @@ const copyNodeElTreeClick = ({ data, node }) => {
             } else {
                 window?.$message?.warning('该节点已存在上报数据，不允许复制')
             }
+        } else {
+            if (data['id'] !== formCopyNodeModel.value.id) {//不能复制到本身节点下
+                    //只能往上一级点击，不能跨层级点击
+                    //如果选择的是父级节点，那不能复制到子级节点
+                    if (type === 6 && (data['type'] === 4 || data['type'] === 5 || data['type'] == 6)) {
+                        setCopyNodeTable(data, title)
+                    }
+                    if (type === 5 && data['type'] === 4) {
+                        setCopyNodeTable(data, title, partitionCode)
+                    }
+                    if (type === 4 && (data['type'] === 2 || data['type'] === 3)) {
+                        setCopyNodeTable(data, title, partitionCode)
+                    }
+                    if (type === 3 && data['type'] === 2) {
+                        setCopyNodeTable(data, title, partitionCode)
+                    }
+                    if (type === 2 && data['type'] === 1) {
+                        setCopyNodeTable(data, title, partitionCode)
+                    }
+                    if (type === 1 && data['type'] === 1) {
+                        setCopyNodeTable(data, title, partitionCode)
+                    }
+
+
+                }
         }
       
 
@@ -2004,8 +2030,18 @@ const loadMenu = ({ node, item, level }, resolve)=>{
     let iscan = false
     iscan = childNodes.some(obj => obj.data.isCustom !== 1)
     console.log(iscan, 'iscan')
+
+       //自定义节点类型下如果有自定义节点，就不允许新增节点
+    let iscan1 = false
+    iscan1 = childNodes.some(obj => obj.data.isCustom === 1)
+
     const { isCustom } = item
-    if (isCustom === 1 && !iscan) {
+    if (isCustom === 1 && iscan1 && !iscan) {
+        menusArr.unshift( { icon: 'add-circle', label: '新增自定义节点', key: 'add1' })
+       let menusArr1 = arrDelKey(menusArr, 'label', '新增节点') // [{id:1}]
+        console.log(menusArr1, 'menusArr')
+        resolve(menusArr1)
+    } else if (isCustom === 1 && !iscan) {
         menusArr.unshift( { icon: 'add-circle', label: '新增自定义节点', key: 'add1' })
         resolve(menusArr)
     } else if (level === 1) {

src/views/login/index.vue

@@ -150,7 +150,11 @@ const formValidateClick = async () => {
     if (!formRes) return false
     //登录请求
     loading.value = true
-    const { error, msg } = await useAppLogin(formValue.value)
+    const { error, msg, status } = await useAppLogin(formValue.value)
+    if (status === 401) {
+        loading.value = false
+    }
+
     //登录失败
     if (error) {
         loading.value = false
@@ -168,6 +172,8 @@ const formValidateClick = async () => {
             router.push({ path: '/home/index/static' })
         }
     }, 1500)
+
+    loading.value = false
 }
 
 //游客登录