登录跳转&检验意见通知功能回收截至日期

yudao-ui-admin-vue3/src/permission.ts

@@ -196,7 +196,14 @@ router.beforeEach(async (to, from, next) => {
     if (whiteList.indexOf(to.path) !== -1) {
       next()
     } else {
-      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`)
+      // 跳转到统一登录平台（CAS）进行认证
+      const casLoginUrl = import.meta.env.VITE_CAS_LOGIN_URL
+      const serviceUrl = import.meta.env.VITE_CAS_SERVICE_URL
+      if (casLoginUrl && serviceUrl){
+        window.location.href = `${casLoginUrl}?service=${encodeURIComponent(serviceUrl)}`
+      }else{
+        next()
+      }
     }
   }
 })

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/indexBoilerTab.vue

@@ -237,7 +237,11 @@
         <div style="color: #015293; cursor: pointer; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;" @click="handleUnitCodeFn(row.unitCode)">{{row.unitName}}</div>
        </template>
       </el-table-column>
-      <el-table-column label="回收截止时间" align="center" prop="handleDate" min-width="135" />
+      <el-table-column label="回收截止时间" align="center" prop="recycleExpireDate" min-width="170">
+        <template #default="{ row }">
+          {{ formatDate(row.recycleExpireDate,'YYYY-MM-DD') }}
+        </template>
+      </el-table-column>
       <el-table-column label="接收人姓名" align="center" prop="recipient" min-width="150px">
         <template #default="scope">
           {{ scope.row.recipient || '-' }}

yudao-ui-admin-vue3/src/views/pressure2/inspectionOpinion/indexPipeTab.vue

@@ -237,7 +237,11 @@
         <div style="color: #015293; cursor: pointer; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;" @click="handleUnitCodeFn(row.unitCode)">{{row.unitName}}</div>
        </template>
       </el-table-column>
-      <el-table-column label="回收截止时间" align="center" prop="handleDate" min-width="135" />
+      <el-table-column label="回收截止时间" align="center" prop="recycleExpireDate" min-width="170">
+        <template #default="{ row }">
+          {{ formatDate(row.recycleExpireDate,'YYYY-MM-DD') }}
+        </template>
+      </el-table-column>
       <el-table-column label="接收人姓名" align="center" prop="recipient" min-width="150px">
         <template #default="scope">
           {{ scope.row.recipient || '-' }}