From 7e4eec5c76700be5f8393fcbb69f0fb642b338e4 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期一, 24 三月 2025 17:18:16 +0800
Subject: [PATCH] 修改bug
---
src/views/safetyReview/projectManage/components/chooseExpert.vue | 63 ++++++++++++++++++++++++++-----
.env.development | 2
src/views/safetyReview/projectManage/components/projectApproval.vue | 19 +++++++++
3 files changed, 73 insertions(+), 11 deletions(-)
diff --git a/.env.development b/.env.development
index 92f6d36..311839b 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,7 @@
# 专家管理系统/开发环境
#贺哥
-VITE_APP_BASE_API = 'http://192.168.2.9:8585'
+VITE_APP_BASE_API = 'http://192.168.2.11:8585'
#线上
#VITE_APP_BASE_API = 'http://8.137.115.153:85/api'
diff --git a/src/views/safetyReview/projectManage/components/chooseExpert.vue b/src/views/safetyReview/projectManage/components/chooseExpert.vue
index d966997..61dfcf2 100644
--- a/src/views/safetyReview/projectManage/components/chooseExpert.vue
+++ b/src/views/safetyReview/projectManage/components/chooseExpert.vue
@@ -9,13 +9,14 @@
placeholder="请输入专家总人数"
style="width: 150px;"
@input="queryParams.num = queryParams.num.replace(/[^1-9]/g,'')"
- :disabled="randomDataList.length != 0"
+ :disabled="!state.isAble || state.newProgress >=3"
+
>
</el-input>
</div>
<div class="fTop">
- <span style="font-size: 14px">专家组组长</span>
- <el-button type="primary" :disabled="state.info.step == 4 || state.isAdmin" style="width: 120px;margin-bottom: 10px" @click="chooseExpert('选取专家')">选取专家组组长</el-button>
+ <span style="font-size: 14px;">专家组组长</span>
+ <el-button type="primary" :disabled="state.info.step == 4 || state.isAdmin" style="width: 120px;margin-bottom: 10px" @click="chooseExpert('选取专家')">选取专家组组长</el-button>
</div>
<el-table v-loading="fLoading" :data="fixedDataList" :border="true" ref="fTableRef" style="width: 100%;">
<el-table-column label="姓名" prop="name" align="center" />
@@ -65,7 +66,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item style="float: right;" v-if="randomDataList.length == 0 && Number(queryParams.num) !=1 && queryParams.num!=''">
+ <el-form-item style="float: right;" v-if=" state.newProgress < 3 && state.isAble && Number(queryParams.num) !=1 && queryParams.num!=''">
<el-button style="width: 100px;margin-right: -32px;" :disabled="state.info.step == 4 || state.isAdmin" type="primary" @click="random">随机抽取</el-button>
</el-form-item>
</el-col>
@@ -159,21 +160,21 @@
],
isAdmin: false,
projectId: null,
- newProgress: null
-
+ newProgress: null,
+ randomNum:0,
+ isAble: true
})
-
const userInfo = ref()
onMounted(async () =>{
// localStorage.removeItem('numData')
// localStorage.removeItem('fixedDataList')
- // localStorage.removeItem('randomDataList')
+ // localStorage.removeItem('randomNum')
+
if(prop.projectId){
state.projectId = prop.projectId
await getProjectProcess()
}
-
const fixListData = localStorage.getItem('fixedDataList');
let fixDataArr = []
if(fixListData){
@@ -205,7 +206,19 @@
}
})
}
-
+ const randomNumData = localStorage.getItem('randomNum')
+ let randomNumArr = []
+ if(randomNumData){
+ randomNumArr = JSON.parse(randomNumData)
+ randomNumArr.forEach(item => {
+ if(item.projectId == state.projectId){
+ state.randomNum = Number(item.randomNum)
+ }
+ })
+ }
+ if(state.randomNum == 3){
+ state.isAble = false
+ }
userInfo.value = JSON.parse(Cookies.get('userInfo'))
state.isAdmin = userInfo.value.admin
await getDomain()
@@ -280,6 +293,8 @@
const riskOpen = async (type,val) => {
console.log("type",type,val)
+ state.projectId = val
+ await getProjectProcess()
if(type === 'add' || type === 'clickEdit'){
if (state.isAdmin) {
ElMessage.warning("当前用户暂无权限");
@@ -355,6 +370,10 @@
}
})
}
+ if(randomDataList.value && randomDataList.value.length > Number(queryParams.num) - 1){
+ ElMessage.warning(`仅可保留${Number(queryParams.num) - 1}名随机专家`);
+ return
+ }
if(randomDataList.value && randomDataList.value.length > 0){
rData = randomDataList.value.map(item => {
return {
@@ -404,9 +423,11 @@
const fData = localStorage.getItem('fixedDataList');
const rData = localStorage.getItem('randomDataList')
const nData = localStorage.getItem('numData')
+ const rnData = localStorage.getItem('randomNum')
let fDataArray = [];
let rDataArray = []
let nDataArray = []
+ let rnDataArray = []
if (fData) {
try {
fDataArray = JSON.parse(fData);
@@ -445,6 +466,19 @@
nDataArray.splice(indexN,1)
}
localStorage.setItem('numData', JSON.stringify(nDataArray));
+
+ // if (rnData) {
+ // try {
+ // rnDataArray = JSON.parse(rnData);
+ // } catch (e) {
+ // console.error('数据解析失败，重置为空数组');
+ // }
+ // }
+ // const indexRN = rnDataArray.findIndex(obj => obj.projectId == state.projectId)
+ // if(indexRN !== -1){
+ // rnDataArray.splice(indexRN,1)
+ // }
+ // localStorage.setItem('randomNum', JSON.stringify(rnDataArray));
}
const getSelected = (type,data)=>{
@@ -528,6 +562,15 @@
const res = await expertRound(param)
if(res.code == 200){
randomDataList.value = res.data
+ state.randomNum = state.randomNum + 1
+ const obj = {
+ projectId: state.projectId,
+ randomNum: state.randomNum
+ }
+ saveObjectToLocalStorage('randomNum',obj)
+ if(state.randomNum == 3){
+ state.isAble = false
+ }
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/safetyReview/projectManage/components/projectApproval.vue b/src/views/safetyReview/projectManage/components/projectApproval.vue
index 1dc4936..576829d 100644
--- a/src/views/safetyReview/projectManage/components/projectApproval.vue
+++ b/src/views/safetyReview/projectManage/components/projectApproval.vue
@@ -263,10 +263,29 @@
ElMessage.warning('审批不通过')
emit('backStatus', state.projectId);
dialogVisible.value = false
+ removeRandomNum()
+
+
}else{
ElMessage.warning(res.message)
}
}
+const removeRandomNum = () => {
+ const rnData = localStorage.getItem('randomNum')
+ let rnDataArray = []
+ if (rnData) {
+ try {
+ rnDataArray = JSON.parse(rnData);
+ } catch (e) {
+ console.error('数据解析失败，重置为空数组');
+ }
+ }
+ const indexRN = rnDataArray.findIndex(obj => obj.projectId == state.projectId)
+ if(indexRN !== -1){
+ rnDataArray.splice(indexRN,1)
+ }
+ localStorage.setItem('randomNum', JSON.stringify(rnDataArray));
+}
const getList = async () => {
state.loading = true;
--
Gitblit v1.9.2