Merge branch 'li_s1' of http://172.20.2.87:3000/herenshan112/ShutongInterconnectedChemicalCloudPlatform into li_s1

src/components/DesignForm/formControlPropertiNew.vue

@@ -2166,7 +2166,7 @@ watch(
         {
           id: "rootid_" + getAssociatedFormsCurrentFieldTreeData.label,
           //label: '当前表单',
-          label: "当前表单-" + getAssociatedFormsCurrentFieldTreeData.treeAttrs.show,
+          label: "当前表单-blibli----" + getAssociatedFormsCurrentFieldTreeData.treeAttrs.show,
           children: resDataForGlxxszExceptself1,
           treeAttrs: getAssociatedFormsCurrentFieldTreeData.treeAttrs, //
         },
@@ -2712,7 +2712,7 @@ let getAssociatedFormsCurrentFieldTreeData: any;
 getAssociatedFormsCurrentFieldTree1();
 function getAssociatedFormsCurrentFieldTree1() {
   getAssociatedFormsCurrentFieldTree().then(({ data }) => {
-    // console.log(data)
+    console.log("cfid为空----------------------->",data)
     getAssociatedFormsCurrentFieldTreeData = JSON.parse(JSON.stringify(data));
     // console.log(getAssociatedFormsCurrentFieldTreeData)
     if (data.id === "cfid为空" || data.id === "masterTable为null") {
@@ -2930,7 +2930,7 @@ const zdtcszTree = computed(()=>{
     datapropsformList = JSON.parse(JSON.stringify(props.formList))
   }
   
-  if(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children.length>0){
+  if(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children.length>0){
     let datab = JSON.parse(JSON.stringify(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children))
     let currentCompId = controlData.value.name
     const treeC = mergeAndFilterFormTrees(datapropsformList, datab,currentCompId);
@@ -3975,7 +3975,8 @@ const glxxszTree = computed(()=>{
   }
   
   console.log(datapropsformList)
-  if(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children.length>0){
+   console.log(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value)
+  if(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children && associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children.length>0){
 
     
     let datab = JSON.parse(JSON.stringify(associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value[0].children))

src/components/DesignForm/public/form/formGroup.vue

@@ -764,8 +764,8 @@ const currentNodePowerKey = inject('currentNodeKey') as any
 
 //获取当前节点授权
 const curNodePowerAry = () => {
-  console.log("获取当前节点授权",currentNodePowerKey)
+  // console.log("获取当前节点授权",currentNodePowerKey)
-  console.log("获取当前节点授权",allNodePwoer)
+  // console.log("获取当前节点授权",allNodePwoer)
   if(currentNodePowerKey && currentNodePowerKey.value && currentNodePowerKey.value != ""){
     if(allNodePwoer.value && Array.isArray(allNodePwoer.value) && allNodePwoer.value.length > 0){
       let powerAry: any[] = []
@@ -789,7 +789,7 @@ const curNodePowerAry = () => {
 */
 const judgeIsShow = (key: string) => {
   let myPower = curNodePowerAry()     //获取权限数组
-  console.log("判断此组件是否可见",myPower)
+  // console.log("判断此组件是否可见",myPower)
   if(Array.isArray(myPower) && myPower.length > 0){
     let isOk = true
     myPower.forEach((item:powerAryInfo) => {

src/components/DesignForm/public/form/formItem.vue

@@ -739,7 +739,7 @@ const judgeIsShow = (key: string) => {
 @ 功能: 判断是否禁用
 */
 const judgeIsDisabled = (key: string) => {
-  console.log("判断是否禁用", key);
+  // console.log("判断是否禁用", key);
 // console.log("测试是否获取授权-1-->",allNodePwoer)
 //     console.log("测试是否获取授权-2-->",currentNodePowerKey)
   if (type.value === 3) {
@@ -755,7 +755,7 @@ const judgeIsDisabled = (key: string) => {
 
 
   let myPower = curNodePowerAry()
- console.log("测试是否获取授权-3-->",Array.isArray(myPower),myPower)
+//  console.log("测试是否获取授权-3-->",Array.isArray(myPower),myPower)
   if(Array.isArray(myPower) && myPower.length > 0){
     let isOk = false
     myPower.forEach((item:powerAryInfo) => {
@@ -764,8 +764,8 @@ const judgeIsDisabled = (key: string) => {
       }
     })
 
-    console.log("判断是否禁用------key------->", key);
+    // console.log("判断是否禁用------key------->", key);
-    console.log("判断是否禁用------isOk------->", isOk);
+    // console.log("判断是否禁用------isOk------->", isOk);
 
     return isOk
   }else{

src/utils/request.ts

@@ -60,8 +60,8 @@ service.interceptors.request.use(
             }
             // console.error('请求拦截---------->', randomString)
             // console.error('请求拦截----headers------>', headers)
-            console.log('请求拦截----config---url--->', config.url)
+            // console.log('请求拦截----config---url--->', config.url)
-            console.log('请求拦截----data------>', data)
+            // console.log('请求拦截----data------>', data)
             // console.error('请求拦截----config------>', config)
             
         // console.log('请求拦截----content-type------>', config.headers['Content-Type'])
@@ -88,7 +88,7 @@ service.interceptors.response.use(
             let jsonData = sm4DecryptMethod(data.data, authKey)
             response.data.data = JSON.parse(jsonData)
         }
-        console.log('行营结果----解密结构------>', response.data)
+        // console.log('行营结果----解密结构------>', response.data)
         const { code, msg } = response.data;
         if (code === 0 || code === 200 || code === 10001) {
             return response.data;