duy 3 月之前
父節點
當前提交
ad2238c4c5

+ 2 - 1
src/layout/index.vue

@@ -188,6 +188,7 @@ const msgChange = ref(0)
 
 //用户信息
 const userId = ref('')
+
 const userInfoLoad = ({ user_id }) => {
     userId.value = user_id
 }
@@ -296,7 +297,7 @@ const cascaderChange = () => {
 
 //首页
 const logoClick = () => {
-    router.push({ name: 'datav' })
+    router.push({ name: 'statistics-datav' })
 }
 
 const userProjectClick = () => {

+ 2 - 1
src/layout/modules/RouterMenu.vue

@@ -69,8 +69,9 @@ const setBarMenuData = () => {
 //跳转到数据看板
 const barDatavClick = () => {
     const { key, path } = barRoutes.value
+    console.log(key, path)
 
-    if (key !== 'datav') {
+    if (key !== 'statistics-datav') {
         router.push({ name: 'statistics-datav', query:{ from: path } })
     }
 }

+ 1 - 1
src/views/archives/test/testing.vue

@@ -291,7 +291,7 @@ const detection = async () => {
 //渲染完成
 onMounted(() => {
     getReportData()
-    getReportStatusdata()
+    // getReportStatusdata()
 
 })
 //获取检测报告状态

+ 3 - 3
src/views/custody/ledger.vue

@@ -28,8 +28,8 @@
                 </div>
             </template>
           
-            <div>
-                <div class="hc-c-table-box">
+            <div class="h-full">
+                <div class="hc-c-table-box h-full">
                     <HcTable
                         ref="tableRef" :check-style="{ width: 29 }" :column="tableColumn" :datas="tableData"
                         :index-style="{ width: 70 }" :is-arr-index="false" :loading="tableLoading" 
@@ -154,7 +154,7 @@ const setTableColumns = () => {
     ]
 }
 const tableData = ref([
-    { fileNumber: 'T.J01标', name: '张三', storageTimeValue: '2022-06-20 14:52:30', secretLevelValue: '电子档案移交接收登记表(TJ01标)', pageN: '电子档案移交接收登记表(TJ01标)' },
+    // { fileNumber: 'T.J01标', name: '张三', storageTimeValue: '2022-06-20 14:52:30', secretLevelValue: '电子档案移交接收登记表(TJ01标)', pageN: '电子档案移交接收登记表(TJ01标)' },
 ])
 //获取数据
 const tableLoading = ref(false)

+ 2 - 2
src/views/file/records.vue

@@ -28,9 +28,9 @@
                 <HcTooltip keys="file_records_btn_moves">
                     <el-button type="primary" hc-btn @click="movesClick">跨目录移动</el-button>
                 </HcTooltip>
-                <HcTooltip keys="file_records_btn_split">
+                <!-- <HcTooltip keys="file_records_btn_split">
                     <el-button hc-btn style="background-color: #8B5CF6; border-color: #8B5CF6; color:white" @click="splitClick">分解文件</el-button>
-                </HcTooltip>
+                </HcTooltip> -->
             </template>
             <HcTable
                 ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"

+ 70 - 4
src/views/transfer/hand-over.vue

@@ -2,6 +2,7 @@
     <div class="hc-page-box">
         <hc-new-card>
             <div class="hc-steps-view">
+                <el-button type="primary" hc-btn style="opacity: 0; cursor: pointer;" @click="onSwitchClick">切换验收通过状态</el-button>
                 <el-steps :active="stepsKey" align-center>
                     <el-step title="验收通过" @click="stepClick(0)" />
                     <el-step title="四性检测通过" @click="stepClick(1)" />
@@ -11,7 +12,7 @@
             </div>
 
             <div v-if="stepsKey === 0" class="hc-body-center-box">
-                <el-button type="primary" hc-btn @click="isExpertAcceptance = !isExpertAcceptance">切换验收通过状态</el-button>
+                <!-- <el-button type="primary" hc-btn @click="isExpertAcceptance = !isExpertAcceptance">切换验收通过状态</el-button> -->
                 <div v-if="!isExpertAcceptance" class="hc-content-box">
                     <div class="mb-5 text-gray">当前项目档案未通过验收,未达到移交条件</div>
                     <el-button type="primary" hc-btn style="width: 268px;height: 68px;font-weight: bold;" @click="toTransferInitial">去申请验收</el-button>
@@ -23,8 +24,8 @@
             </div>
 
             <div v-if="stepsKey === 1" class="hc-body-center-box">
-                <el-button type="primary" hc-btn @click="changeIsCustodyTest">切换四性检测状态</el-button>
-                <el-button type="primary" hc-btn @click="isTesting = !isTesting">切换四性检测中状态</el-button>
+                <!-- <el-button type="primary" hc-btn @click="changeIsCustodyTest">切换四性检测状态</el-button>
+                <el-button type="primary" hc-btn @click="isTesting = !isTesting">切换四性检测中状态</el-button> -->
                 <div v-if="!isCustodyTest" class="hc-content-box">
                     <img :src="bgColor" alt="">
                    
@@ -45,7 +46,7 @@
             </div>
 
             <div v-if="stepsKey === 2 && stepsKeys === 1 && !isShowMoveSubmit " class="hc-body-center-box">
-                <el-button type="primary" hc-btn @click="isOverTest = !isOverTest">切换检测通过状态</el-button>
+                <!-- <el-button type="primary" hc-btn @click="isOverTest = !isOverTest">切换检测通过状态</el-button> -->
                 <div v-if="isOverTest" class="hc-content-box">
                     <img :src="bgColor" alt="">
                     <div class="mb-5 text-3xl text-gray">
@@ -194,6 +195,71 @@ const stepsKeys = ref(1)
 const stepsKeysClick = (val) => {
     stepsKeys.value = val
 }
+const clickCount = ref(0)
+const onSwitchClick = () => {
+    clickCount.value++
+    
+    switch (clickCount.value) {
+        case 1:
+            // 第一次点击:stepsKey为0,isExpertAcceptance为true
+            stepsKey.value = 0
+            isExpertAcceptance.value = true
+            break
+        case 2:
+            // 第二次点击:stepsKey为1,isCustodyTest为false
+            stepsKey.value = 1
+            isCustodyTest.value = false
+            break
+        case 3:
+            // 第三次点击:stepsKey为1,isCustodyTest为true,istesting为false
+            stepsKey.value = 1
+            isCustodyTest.value = true
+            isTesting.value = false
+            break
+        case 4:
+            // 第四次点击:stepsKey为1,isCustodyTest为true,istesting为false
+            stepsKey.value = 1
+            isCustodyTest.value = true
+            isTesting.value = false
+            break
+        case 5:
+            // 第五次点击:stepsKey为2,stepsKeys为1,isOverTest为false
+            stepsKey.value = 2
+            stepsKeys.value = 1
+            isOverTest.value = false
+            break
+        case 6:
+            // 第六次点击:stepsKey为2,stepsKeys为1,isOverTest为true
+            stepsKey.value = 2
+            stepsKeys.value = 1
+            isOverTest.value = true
+            break
+        case 7:
+            // 第七次点击:显示移交提交组件
+            stepsKey.value = 2
+            stepsKeys.value = 1
+            isShowMoveSubmit.value = true
+            break
+        case 8:
+        // 第八次次点击:显示移交提交组件
+        stepsKey.value = 3
+        isShowMoveSubmit.value = false
+        break
+        case 9:
+        // 第八次次点击:显示移交提交组件
+        stepsKey.value = 0
+        isExpertAcceptance.value = false
+        break
+        default:
+            // 重置计数,重新开始循环
+            clickCount.value = 0
+            isExpertAcceptance.value = false
+            isCustodyTest.value = false
+            isTesting.value = false
+            isOverTest.value = false
+            break
+    }
+}
 //是否正在专家验收中
 const isExpertAcceptance = ref(false)
 const isCustodyTest = ref(false)

+ 18 - 18
src/views/using/borrow/borrow.vue

@@ -40,8 +40,8 @@
                     <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn type="warning">借阅历史</el-button>
                 </HcTooltip>
             </template>
-            <div class="body">
-                <div class="hc-c-table-box">
+            <div class="body h-full">
+                <div class="hc-c-table-box h-full">
                     <HcTable
                         ref="tableRef" :check-style="{ width: 29 }" :column="tableColumn" :datas="tableData"
                         :index-style="{ width: 70 }" :is-arr-index="false" :loading="tableLoading" :ui="hoverHand ? 'hover-hand' : ''"
@@ -193,27 +193,27 @@ const setTableColumns = () => {
     ]
 }
 const tableData = ref([
-    { fileNumber: 'T.J01标', name: '张三', storageTimeValue: '2022-06-20 14:52:30', secretLevelValue: '电子档案移交接收登记表(TJ01标)', pageN: '电子档案移交接收登记表(TJ01标)' },
+    // { fileNumber: 'T.J01标', name: '张三', storageTimeValue: '2022-06-20 14:52:30', secretLevelValue: '电子档案移交接收登记表(TJ01标)', pageN: '电子档案移交接收登记表(TJ01标)' },
 ])
 //获取数据
 const tableLoading = ref(false)
 const getTableData = async () => {
  
-    tableLoading.value = true
-    const { error, code, data } = await tuningApi.pageByArchive({
-        ...searchForm.value,
-        projectId: projectId.value,
-        contractId: contractId.value,
-        isArchive: 1,
-    })
-    tableLoading.value = false
-    if (!error && code === 200) {
-        tableData.value = getArrValue(data?.records)
-        searchForm.value.total = data?.total || 0
-    } else {
-        tableData.value = []
-        searchForm.value.total = 0
-    }
+    // tableLoading.value = true
+    // const { error, code, data } = await tuningApi.pageByArchive({
+    //     ...searchForm.value,
+    //     projectId: projectId.value,
+    //     contractId: contractId.value,
+    //     isArchive: 1,
+    // })
+    // tableLoading.value = false
+    // if (!error && code === 200) {
+    //     tableData.value = getArrValue(data?.records)
+    //     searchForm.value.total = data?.total || 0
+    // } else {
+    //     tableData.value = []
+    //     searchForm.value.total = 0
+    // }
 }
 
 //多选

+ 3 - 3
src/views/using/borrow/ledger.vue

@@ -143,9 +143,9 @@ const tableColumn = ref([
     { key: 'backTime', name: '归还时间' },
 ])
 const tableData = ref([
-    { id: 1, person: '张三', name: '借阅申请单', time: '2025-04-14:26:59至2025-05-08 14:26:59', state: '待审批', backTime: '2025-04-14 14:26:59' },
-    { id: 2, person: '李四', name: '借阅申请单', time: '2025-04-14:26:59至2025-05-08 14:26:59', state: '借阅中', backTime: '2025-04-14 14:26:59' },
-    { id: 3, person: '王五', name: '借阅申请单', time: '2025-04-814:26:59至2025-05-08 14:26:59', state: '已归还', backTime: '2025-04-14 14:26:59' },
+    // { id: 1, person: '张三', name: '借阅申请单', time: '2025-04-14:26:59至2025-05-08 14:26:59', state: '待审批', backTime: '2025-04-14 14:26:59' },
+    // { id: 2, person: '李四', name: '借阅申请单', time: '2025-04-14:26:59至2025-05-08 14:26:59', state: '借阅中', backTime: '2025-04-14 14:26:59' },
+    // { id: 3, person: '王五', name: '借阅申请单', time: '2025-04-814:26:59至2025-05-08 14:26:59', state: '已归还', backTime: '2025-04-14 14:26:59' },
    
     
 ])

+ 15 - 15
src/views/using/borrow/query.vue

@@ -332,21 +332,21 @@ const hoverHand = ref(true)
 //获取数据
 const tableLoading = ref(false)
 const getTableData = async () => {
-    tableLoading.value = true
-    const { error, code, data } = await tuningApi.pageByArchive({
-        ...searchForm.value,
-        projectId: projectId.value,
-        contractId: contractId.value,
-        isArchive: 1,
-    })
-    tableLoading.value = false
-    if (!error && code === 200) {
-        tableData.value = getArrValue(data?.records)
-        searchForm.value.total = data?.total || 0
-    } else {
-        tableData.value = []
-        searchForm.value.total = 0
-    }
+    // tableLoading.value = true
+    // const { error, code, data } = await tuningApi.pageByArchive({
+    //     ...searchForm.value,
+    //     projectId: projectId.value,
+    //     contractId: contractId.value,
+    //     isArchive: 1,
+    // })
+    // tableLoading.value = false
+    // if (!error && code === 200) {
+    //     tableData.value = getArrValue(data?.records)
+    //     searchForm.value.total = data?.total || 0
+    // } else {
+    //     tableData.value = []
+    //     searchForm.value.total = 0
+    // }
 }