Ver código fonte

待办任务修改

duy 4 meses atrás
pai
commit
42e82c842f
4 arquivos alterados com 58 adições e 21 exclusões
  1. 1 1
      src/api/modules/other.js
  2. 28 13
      src/layout/index.vue
  3. 7 0
      src/store/index.js
  4. 22 7
      src/views/tasks/hc-data.vue

+ 1 - 1
src/api/modules/other.js

@@ -86,7 +86,7 @@ export const backMeterTask = (form) => HcApi({
 })
 //获取待办任务数量
 export const getTaskCount = (form) => HcApi({
-    url: '/api/blade-business/task/getTaskCount',
+    url: '/api/blade-meter/task/getTaskCount',
     method: 'get',
     params: form,
 })

+ 28 - 13
src/layout/index.vue

@@ -55,6 +55,7 @@ import { useAppStore } from '~src/store'
 import { initButtons } from '~sto/app'
 import { useProject } from '~sto/useProject'
 import website from '~src/config'
+import { getTaskCount } from '~api/other'
 
 //初始组合式
 const router = useRouter()
@@ -154,21 +155,35 @@ const cascaderSend = async ({ projectId, contractId }) => {
         }
         return
     }
-    //本地模式
-    if (website.localModel) {
-        setTimeout(() => {
-            reloadRouter.value = true
-        }, 1000)
+    // //本地模式
+    // if (website.localModel) {
+    //     setTimeout(() => {
+    //         reloadRouter.value = true
+    //     }, 1000)
+    // } else {
+    //     reloadRouter.value = true
+    // }
+    // //链接webSocket
+    // if (!isNullES(socket)) socket.close()
+    // socket = new HcSocket({ projectId, contractId, userId: userId.value }, (res) => {
+    //     socketData(res?.data)
+    // })
+    getTaskCountData(projectId, contractId)
+}
+ //获取taskCount
+ const getTaskCountData = async (projectId, contractId) => {
+    const { error, code, data } = await getTaskCount({
+        projectId: projectId,
+        contractId: contractId,
+        
+    })
+    if (!error && code === 200) {
+        taskCount.value = data
+        store.setTaskCount(taskCount.value)
     } else {
-        reloadRouter.value = true
+        taskCount.value = 0
     }
-    //链接webSocket
-    if (!isNullES(socket)) socket.close()
-    socket = new HcSocket({ projectId, contractId, userId: userId.value }, (res) => {
-        socketData(res?.data)
-    })
-}
-
+ }
 //长链接消息
 let annUpdateRef
 const annRefs = ref([])

+ 7 - 0
src/store/index.js

@@ -40,6 +40,7 @@ export const useAppStore = defineStore('main', {
         isSource: getStoreValue('isSource') || '', //来源
         isLayout: getStoreValue('isLayout') || '', //是否显示layout
         isLogin: getStoreValue('isLogin') || false, //是否刚登录
+        taskCount: getStoreValue('taskCount') || 0,
     }),
     getters: {
         //系统信息
@@ -72,6 +73,7 @@ export const useAppStore = defineStore('main', {
         getIsSource: state => state.isSource,
         getIsLayout: state => state.isLayout,
         getIsLogin: state => state.isLogin,
+        getTaskCount: state => state.taskCount,
     },
     actions: {
         //系统信息
@@ -180,6 +182,10 @@ export const useAppStore = defineStore('main', {
             this.isLogin = value
             setStoreValue('isLogin', value)
         },
+        setTaskCount(value) {
+            this.taskCount = value
+            setStoreValue('taskCount', value) 
+        },
         //清除缓存和token
         clearStoreData() {
             //清除状态
@@ -202,6 +208,7 @@ export const useAppStore = defineStore('main', {
             this.isSource = ''
             this.isLayout = ''
             this.isLogin = null
+            this.taskCount = 0
             //清除缓存
             clearStoreAll()
             removeToken()

+ 22 - 7
src/views/tasks/hc-data.vue

@@ -63,7 +63,7 @@
 </template>
 
 <script setup>
-import { nextTick, onActivated, ref } from 'vue'
+import { nextTick, onActivated, onMounted, ref } from 'vue'
 import { getArrValue } from 'js-fast-way'
 import mainApi from '~api/tasks/hc-data'
 import { useAppStore } from '~src/store'
@@ -71,6 +71,7 @@ import taskReview from './components/hc-data/task-review.vue'
 import HcTaskTag from './components/hc-data/task-tag.vue'
 
 const useAppState = useAppStore()
+
 const projectId = ref(useAppState.getProjectId || '')
 const contractId = ref(useAppState.getContractId || '')
 
@@ -79,16 +80,19 @@ onActivated(() => {
     queryTaskType()
     queryTaskStatus()
     getTableData()
+  
+   
+
+})
+onMounted(() => {
+    setTaskCount()
 })
 
 //类型处理
+const taskCount = ref(0)
+
 const tabsKey = ref('1')
-const tabsData = [
-    { key: '1', name: '待办任务' },
-    { key: '2', name: '已办任务' },
-    { key: '3', name: '我发起的' },
-   
-]
+const tabsData = ref([]) 
 const tabsClick = ({ key }) => {
     tabsKey.value = key
     searchForm.value.selectedType = key
@@ -96,6 +100,16 @@ const tabsClick = ({ key }) => {
     setTaskTastus(key)
     getTableData()
 
+}
+const setTaskCount = () => {
+    taskCount.value = useAppState.getTaskCount || 0
+    console.log(taskCount.value, 'taskCount.value')
+    tabsData.value = [
+        { key: '1', name: '待办任务', taskCount:taskCount.value },
+        { key: '2', name: '已办任务' },
+        { key: '3', name: '我发起的' },
+    ]
+    
 }
 
 //搜索条件
@@ -107,6 +121,7 @@ const searchForm = ref({
 //获取任务类型
 const tasksType = ref([])
 const queryTaskType = async () => {
+   
     const { data } = await mainApi.queryTaskType()
     tasksType.value = getArrValue(data)