ZaiZai 1 anno fa
parent
commit
4492e184a1
2 ha cambiato i file con 14 aggiunte e 7 eliminazioni
  1. 1 1
      components/hc-tree/tree-node.vue
  2. 13 6
      pages/index/index.vue

+ 1 - 1
components/hc-tree/tree-node.vue

@@ -14,7 +14,7 @@
                 <text class="i-ri-checkbox-circle-fill c2" v-else/>
             </view>
             <view class="i-ri-loader-line cuIconfont-spin" v-if="nodeItem.loading"/>
-            <view class="label">{{nodeItem.label}} {{ isCounts? `【${nodeItem.data?.submitCounts ?? 0}】` : '' }}</view>
+            <view class="label">{{nodeItem.label?.replace(/\r|\n/ig,"")}} {{ isCounts? `【${nodeItem.data?.submitCounts ?? 0}】` : '' }}</view>
         </view>
         <template v-if="nodeItem.isExpand">
             <view class="children-bar" v-if="nodeItem.childNodes && nodeItem.childNodes.length > 0">

+ 13 - 6
pages/index/index.vue

@@ -45,7 +45,10 @@
                 </view>
             </view>
             <view class="hc-flex-conten __150 mt-4">
-                <view class="left-col-card-2" :class="isAnimation?'is-animation':''">
+                <view class="left-col-card-2"
+                      :class="isAnimation?'is-animation':''"
+                      @click="toTaskPage"
+                >
                     <view class="card-bg">
                         <view class="icon">
                             <text class="i-fluent-task-list-square-settings-20-filled"/>
@@ -232,15 +235,20 @@ onHide(() => {
 })
 
 //获取配置
+const appCheck = ref(1)
 const userConfigInfo = async () => {
     const { data } = await mainApi.userConfigInfo()
-    console.log(data)
+    appCheck.value = data?.appCheck ?? 1
 }
 
 //资料填报
 const isPopovershow = ref(false);
 const isDataFill = () => {
-    isPopovershow.value = true;
+    if (appCheck.value === 2) {
+        homeToPage('/pages/data-fill/index')
+    } else {
+        isPopovershow.value = true;
+    }
 }
 
 //关闭弹窗
@@ -252,10 +260,9 @@ const closePopover = () => {
 const startDataFill = async () => {
     isPopovershow.value = false;
     if (checkbox1.value.length > 0) {
-        const { data } = await mainApi.userConfigSave({
+        mainApi.userConfigSave({
             appCheck: 2
-        })
-        console.log(data)
+        }).then()
     }
     homeToPage('/pages/data-fill/index')
 }