修改bug

zhouwx

2025-03-21 63d315600f35200be81e78af7e30fc36cc62a051

修改bug

 .env.development

@@ -7,7 +7,7 @@
# 专家管理系统/开发环境

#贺哥
VITE_APP_BASE_API = 'http://192.168.2.11:8585'
VITE_APP_BASE_API = 'http://192.168.2.9:8585'

#线上
#VITE_APP_BASE_API = 'http://106.15.95.149:8088/api'
#VITE_APP_BASE_API = 'http://8.137.115.153:85/api'

 src/views/safetyReview/projectManage/components/chooseExpert.vue

@@ -1,9 +1,21 @@
<template>
  <div class="expertChoose">
    <div style="margin-bottom: 50px">
      <div style="display: flex;align-items: center">
        <span style="font-weight: 600">选用专家总人数：</span>
        <el-input
            clearable
            v-model.trim="queryParams.num"
            placeholder="请输入专家总人数"
            style="width: 150px;"
            @input="queryParams.num = queryParams.num.replace(/[^1-9]/g,'')"
            :disabled="randomDataList.length != 0"
        >
        </el-input>
      </div>
      <div class="fTop">
        <span style="font-weight: 600">固定选用部分</span>
        <el-button type="primary" :disabled="state.info.step == 4 || state.isAdmin" style="width: 100px" @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" />
@@ -47,30 +59,30 @@
          </el-col>
          <el-col :span="8">
            <el-form-item label="允许级别:">
              <el-checkbox-group v-model="queryParams.ratingLevel">
              <el-checkbox-group v-model="queryParams.ratingLevel" >
                <el-checkbox v-for="item in state.levelList" :label="item.id" :key="item.id">{{ item.name }}</el-checkbox>
              </el-checkbox-group>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item style="float: right;">
              <el-button style="width: 100px;margin-right: -32px;" :disabled="state.info.step == 4 || state.isAdmin" type="primary" @click="random">随机抽取</el-button>
            <el-form-item style="float: right;" v-if="randomDataList.length == 0 && 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>
        </el-row>
        <el-row :gutter="24">
          <el-col :span="24">
            <el-form-item label="拟选用人数:">
              <el-input
                  clearable
                  v-model.trim="queryParams.num"
                  placeholder="请输入拟选用人数"
                  @input="queryParams.num = queryParams.num.replace(/[^0-9]/g,' ')"
              >
              </el-input>
            </el-form-item>
          </el-col>
        </el-row>
<!--        <el-row :gutter="24">-->
<!--          <el-col :span="24">-->
<!--            <el-form-item label="拟选用人数:">-->
<!--              <el-input-->
<!--                  clearable-->
<!--                  v-model.trim="queryParams.num"-->
<!--                  placeholder="请输入拟选用人数"-->
<!--                  @input="queryParams.num = queryParams.num.replace(/[^0-9]/g,' ')"-->
<!--              >-->
<!--              </el-input>-->
<!--            </el-form-item>-->
<!--          </el-col>-->
<!--        </el-row>-->
      </el-form>
      <el-table v-loading="rLoading"  :data="randomDataList" :border="true" ref="rTableRef" style="width: 100%;">
        <el-table-column label="姓名" prop="name" align="center" />
@@ -98,11 +110,11 @@
</template>

<script setup>
import {onMounted, reactive, ref} from "vue";
import {onMounted, onUnmounted, reactive, ref, watch} from "vue";
import expertsList from './expertsList.vue'
import {getExpertTypes} from "@/api/form";
import {ElMessage} from "element-plus";
import {addProject, choose, expertRound, getCheckInfo} from "@/api/projectManage";
import {addProject, choose, expertRound, getCheckInfo, getProjectInfo} from "@/api/projectManage";
import Cookies from "js-cookie";

const emit = defineEmits(["getNextStatus"]);
@@ -113,12 +125,16 @@
const fixedDataList = ref([]);
const rTableRef  = ref(null);
const randomDataList = ref([]);
const queryParams = ref({
const queryParams = reactive({
  num: null,
  ratingLevel: [],
  domain: null

})
const expertType = ref([])
const checkList = ref([])
const domainList = ref([])
const prop = defineProps(['projectId','newProgress'])
const state = reactive({
  formData: {
    id:null,
@@ -141,16 +157,127 @@
      name: '三级'
    },
  ],
  isAdmin: false
  isAdmin: false,
  projectId: null,
  newProgress: null

})


const userInfo = ref()
onMounted(() =>{
onMounted(async () =>{
  // localStorage.removeItem('numData')
  // localStorage.removeItem('fixedDataList')
  // localStorage.removeItem('randomDataList')
  if(prop.projectId){
    state.projectId = prop.projectId
    await getProjectProcess()
  }

  const fixListData = localStorage.getItem('fixedDataList');
  let fixDataArr = []
  if(fixListData){
    fixDataArr = JSON.parse(fixListData)
    fixDataArr.forEach(item => {
      if(item.projectId == state.projectId){
        fixedDataList.value = [item.fixedData]
      }
    })
  }
  const rondomData = localStorage.getItem('randomDataList');
  let rondomDataArr = []
  if(rondomData){
    rondomDataArr = JSON.parse(rondomData)
    rondomDataArr.forEach(item => {
      if(item.projectId == state.projectId){
        randomDataList.value = item.rondomData

      }
    })
  }
  const numData = localStorage.getItem('numData')
  let numDataArr = []
  if(numData){
    numDataArr = JSON.parse(numData)
    numDataArr.forEach(item => {
      if(item.projectId == state.projectId){
        queryParams.num = item.num
      }
    })
  }

  userInfo.value = JSON.parse(Cookies.get('userInfo'))
  state.isAdmin = userInfo.value.admin
  getDomain()
  await getDomain()
})

const getProjectProcess  = async () => {
  const res = await getProjectInfo(state.projectId)
  if(res.code === 200) {
    state.newProgress = res.data.step
  }else {
    ElMessage.warning(res.message)
  }
}


watch(()=> fixedDataList.value,(newVal)=> {
  if(newVal && newVal.length>0){
    const data = {
      projectId :state.projectId,
      fixedData: newVal[0]
    }
    if(state.newProgress < 2){
      saveObjectToLocalStorage('fixedDataList',data)
    }
  }
})
watch(()=> randomDataList.value,(newVal)=> {
  if(newVal && newVal.length>0){
    const data = {
      projectId :state.projectId,
      rondomData: newVal
    }
    if(state.newProgress < 2){
      saveObjectToLocalStorage('randomDataList',data)
    }

  }
})
watch(()=> queryParams.num,(newVal)=> {
  if(newVal){
    const data = {
      projectId :state.projectId,
      num: newVal
    }
    if(state.newProgress < 2){
      saveObjectToLocalStorage('numData',data)
    }

  }
})

const saveObjectToLocalStorage = (key, newObj) => {
  const storedData = localStorage.getItem(key);
  let dataArray = [];
  if (storedData) {
    try {
      dataArray = JSON.parse(storedData);
    } catch (e) {
      console.error('数据解析失败，重置为空数组');
    }
  }
    const index = dataArray.findIndex(obj => obj.projectId == newObj.projectId)
    if(index !== -1){
      dataArray[index] = newObj
    }else {
      dataArray.push(newObj);
    }
  // 将数组转为字符串并存储到 localStorage
  localStorage.setItem(key, JSON.stringify(dataArray));
}


const riskOpen = async (type,val) => {
  console.log("type",type,val)
  if(type === 'add' || type === 'clickEdit'){
@@ -158,10 +285,14 @@
      ElMessage.warning("当前用户暂无权限");
      return;
    }
    if(fixedDataList.value.length === 0 && randomDataList.value.length === 0){
      ElMessage.warning('请选择专家')
    if(fixedDataList.value.length === 0){
      ElMessage.warning('请选择专家组组长')
      return;
    }
    // if(randomDataList.value.length < Number(queryParams.num)-1){
    //   ElMessage.warning('请随机抽取专家')
    //   return;
    // }
  }
  //保存按钮
  if(type === 'add'){
@@ -176,9 +307,16 @@
          expertId: item.id,
          expertName:item.name,
          selectionMode: 1,
          teamLeader: 0
          teamLeader: 1
        }
      })
    }



    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 => {
@@ -196,6 +334,7 @@
    if(res.code == 200){
      ElMessage.success('新增成功')
      emit('getNextStatus', val);
      removeLocal()
      // reset()
    }else{
      ElMessage.warning(res.message)
@@ -212,7 +351,7 @@
          expertId: item.expertId ? item.expertId : item.id,
          expertName:item.name,
          selectionMode: 1,
          teamLeader: 0
          teamLeader: 1
        }
      })
    }
@@ -245,6 +384,8 @@
      randomDataList.value = res.data.projectExpertCheckResp.filter(item => item.selectionMode === 2)
      state.info = res.data
      console.log('res',fixedDataList.value)
      queryParams.num = res.data.expertNum
      removeLocal()
    }else{
      ElMessage.warning(res.message)
    }
@@ -252,21 +393,77 @@
}

const chooseExpert = (type) => {
  // if(fixedDataList.value && fixedDataList.value.length >0){
  //   ElMessage.warning('只能选择一个组长')
  //   return
  // }
  expertsListRef.value.openDialog(type,fixedDataList.value,domainList.value)
}

const removeLocal = () => {
  const fData = localStorage.getItem('fixedDataList');
  const rData = localStorage.getItem('randomDataList')
  const nData = localStorage.getItem('numData')
  let fDataArray = [];
  let rDataArray = []
  let nDataArray = []
  if (fData) {
    try {
      fDataArray = JSON.parse(fData);
    } catch (e) {
      console.error('数据解析失败，重置为空数组');
    }
  }
  const index = fDataArray.findIndex(obj => obj.projectId == state.projectId)
  if(index !== -1){
    fDataArray.splice(index,1)
  }
  localStorage.setItem('fixedDataList', JSON.stringify(fDataArray));

  if (rData) {
    try {
      rDataArray = JSON.parse(rData);
    } catch (e) {
      console.error('数据解析失败，重置为空数组');
    }
  }
  const indexR = rDataArray.findIndex(obj => obj.projectId == state.projectId)
  if(indexR !== -1){
    rDataArray.splice(indexR,1)
  }
  localStorage.setItem('randomDataList', JSON.stringify(rDataArray));

  if (nData) {
    try {
      nDataArray = JSON.parse(nData);
    } catch (e) {
      console.error('数据解析失败，重置为空数组');
    }
  }
  const indexN = nDataArray.findIndex(obj => obj.projectId == state.projectId)
  if(indexN !== -1){
    nDataArray.splice(indexN,1)
  }
  localStorage.setItem('numData', JSON.stringify(nDataArray));
}

const getSelected = (type,data)=>{
  const selectData = JSON.parse(JSON.stringify(data))
  if(fixedDataList.value && fixedDataList.value.length > 0){
    fixedDataList.value.forEach(item => {
      if(item.expertId){
        selectData.forEach((i,index) => {
          if(i.id == item.expertId){
            selectData[index] = item
          }
        })
      }
    })
  // if(fixedDataList.value && fixedDataList.value.length > 0){
  //   fixedDataList.value.forEach(item => {
  //     if(item.expertId){
  //       selectData.forEach((i,index) => {
  //         if(i.id == item.expertId){
  //           selectData[index] = item
  //         }
  //       })
  //     }
  //   })
  // }
  if(fixedDataList.value && fixedDataList.value.length >0){
    state.formData.delData.push(fixedDataList.value[0].id)
  }

  fixedDataList.value = selectData
}
const delF = (val) => {
@@ -280,10 +477,18 @@
  if(val.expertId){
    state.formData.delData.push(val.id)
  }
  randomDataList.value = randomDataList.value.filter(item => item.id != val.id)
   const arr = randomDataList.value.filter(item => item.id != val.id)
  if(arr.length < queryParams.num-1){
    ElMessage.warning(`随机专家数不能低于${queryParams.num-1}人`)
    return
  }else {
    randomDataList.value = arr
  }


}
const professionChange=(value)=> {
  queryParams.value.domain = value.map(item => item[1])
  queryParams.domain = value.map(item => item[1])
}
const getDomain = async () => {
  const res = await getExpertTypes()
@@ -301,16 +506,26 @@
      state.formData.delData.push(item.id)
    }
  })
  if(queryParams.value.domain == undefined ||  (queryParams.value.domain && queryParams.value.domain.length == 0)){
  if(fixedDataList.value && fixedDataList.value.length <= 0){
    ElMessage.warning('请先选择专家组组长')
    return
  }
  if(queryParams.domain == undefined ||  (queryParams.domain && queryParams.domain.length == 0)){
    ElMessage.warning('专业领域不能为空')
    return
  }
  if(queryParams.value.num =='' || queryParams.value.num == undefined){
    ElMessage.warning('拟选用人数不能为空')
  if(queryParams.num =='' || queryParams.num == undefined){
    ElMessage.warning('选用专家总人数不能为空')
    return
  }
  rLoading.value = true
  const res = await expertRound(queryParams.value)
  const param = {
    num: (Number(queryParams.num)-1) * 5,
    selectedUserId: fixedDataList.value[0].id,
    domain: queryParams.domain,
    ratingLevel:queryParams.ratingLevel
  }
  const res = await expertRound(param)
  if(res.code == 200){
    randomDataList.value = res.data
  }else{
@@ -333,7 +548,7 @@
    display: flex;
    align-items: center;
    justify-content: space-between;
    margin-bottom: 15px;
    margin-bottom: 0px;
  }

}

 src/views/safetyReview/projectManage/components/expertsList.vue

@@ -140,7 +140,10 @@
const openDialog = (type,choosedData,domainList) => {
  research()
  nextTick(() => {
    tableRef.value.clearSelection()
    if(tableRef.value){
      tableRef.value.clearSelection()
    }

  })
  data.dialogVisible = true
  data.choosed = choosedData.map(item => {
@@ -234,15 +237,17 @@
  //   tableRef.value.toggleRowSelection(item, true)
  // })

  // tableRef.value.clearSelection()
  // if(selection.length == 0)  {
  //   return
  // }
  // tableRef.value.toggleRowSelection(row, true);
  tableRef.value.clearSelection()
  if(selection.length == 0)  {
    return
  }
  tableRef.value.toggleRowSelection(row, true);
  data.selected = [row]
})

const handleSelectionChange = (val) => {
  data.selected = val
  // debugger
  // data.selected = val
}

const search = ()=>{

 src/views/safetyReview/projectManage/components/projectApproval.vue

@@ -60,12 +60,12 @@
          <span v-else>否</span>
        </template>
      </el-table-column>
      <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="180">
        <template #default="scope">
          <el-button link type="primary" :disabled="state.dataForm.state >= 2 || state.isAdmin" v-if="scope.row.teamLeader === 1" @click="scope.row.teamLeader = 0">取消组长</el-button>
          <el-button link type="primary" :disabled="state.dataForm.state >= 2 || state.isAdmin" v-else @click="scope.row.teamLeader = 1">设为组长</el-button>
        </template>
      </el-table-column>
<!--      <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="180">-->
<!--        <template #default="scope">-->
<!--          <el-button link type="primary" :disabled="state.dataForm.state >= 2 || state.isAdmin" v-if="scope.row.teamLeader === 1" @click="scope.row.teamLeader = 0">取消组长</el-button>-->
<!--          <el-button link type="primary" :disabled="state.dataForm.state >= 2 || state.isAdmin" v-else @click="scope.row.teamLeader = 1">设为组长</el-button>-->
<!--        </template>-->
<!--      </el-table-column>-->
    </el-table>
    <el-dialog
        v-model="dialogVisible"

 src/views/safetyReview/projectManage/process.vue

@@ -26,7 +26,7 @@
        <div class="card-content">
          <div :style="'height:' + middleContentHeight + 'px'" style="overflow-y: scroll;">
            <basic-info ref="basicRef" v-if="selectedObj.id === 1" :projectId="projectId" @getNextStatus="getNextStatus"></basic-info>
            <expert ref="expertRef" v-if="selectedObj.id === 2" :projectId="projectId" @getNextStatus="getNextStatus"></expert>
            <expert ref="expertRef" v-if="selectedObj.id === 2" :projectId="projectId" :newProgress="newProgress" @getNextStatus="getNextStatus"></expert>
            <approval ref="approvalRef" v-if="selectedObj.id === 3" :projectId="projectId" @getNextStatus="getNextStatus" @back-status="backStatus" ></approval>
            <archive ref="archiveRef" v-if="selectedObj.id === 4" :projectId="projectId" @getNextStatus="getNextStatus"></archive>