Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/mk_system into dhr

.env.development

@@ -5,14 +5,15 @@ VITE_APP_TITLE = 煤科建管平台
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.149:8899'
+VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 李陈杰 209
+# VITE_APP_BASE_API = 'http://192.168.110.209:8899'
 # 曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # 罗成
 # VITE_APP_BASE_API = 'http://192.168.110.188:8899'
 # 朱银
-# VITE_APP_BASE_API = 'http://192.168.110.180:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.149:8899'
 #曾涛
 # VITE_APP_BASE_API = 'http://192.168.110.171:8899'
 

src/api/progress/progressCategory/index.ts

@@ -8,10 +8,11 @@ import { ProgressCategoryVO, ProgressCategoryForm, ProgressCategoryQuery } from
  * @returns {*}
  */
 
-export const listProgressCategory = (id?: string | number): AxiosPromise<any[]> => {
+export const listProgressCategory = (parentId?: string | number,name?:string): AxiosPromise<any[]> => {
   return request({
-    url: '/progress/progressCategory/listByParent/' + id,
+    url: '/progress/progressCategory/listByParent',
-    method: 'get'
+    method: 'get',
+    params:{parentId,name}
   });
 };
 

src/api/progress/progressCategoryTemplate/index.ts

@@ -78,9 +78,10 @@ export const getTabList = (id: string) => {
  * @param parentId
  * @returns {*}
  */
-export const listProgressCategoryTemplateByParent = (parentId: string | number): AxiosPromise<ProgressCategoryTemplateVO[]> => {
+export const listProgressCategoryTemplateByParent = (parentId: string | number,name:string): AxiosPromise<ProgressCategoryTemplateVO[]> => {
   return request({
-    url: '/progress/progressCategoryTemplate/listByParent/' + parentId,
+    url: '/progress/progressCategoryTemplate/listByParent' ,
-    method: 'get'
+    method: 'get',
+    params:{parentId,name}
   });
 };

src/api/project/constructionUser/index.ts

@@ -164,7 +164,7 @@ export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) =
  */
 export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
   return request({
-    url: '/contractor/constructionUserExit/list',
+    url: '/project/constructionUserExit/list',
     method: 'get',
     params: query
   });
@@ -204,7 +204,6 @@ export const importConstructionUserInfo = (file: string) => {
   });
 };
 
-
 // 获取项目列表
 export const ProjectList = (query) => {
   return request({
@@ -216,7 +215,7 @@ export const ProjectList = (query) => {
 
 // 获取班组列表
 export const TeamList = (query) => {
-  return request({    
+  return request({
     url: '/contractor/constructionUser/teamList',
     method: 'get',
     params: query
@@ -230,4 +229,4 @@ export const TeamDistribution = (data) => {
     method: 'post',
     data: data
   });
-};
+};

src/api/project/constructionUserFile/index.ts

@@ -10,7 +10,7 @@ import { ConstructionUserFileVO, ConstructionUserFileForm, ConstructionUserFileQ
 
 export const listConstructionUserFile = (query?: ConstructionUserFileQuery): AxiosPromise<ConstructionUserFileVO[]> => {
   return request({
-    url: '/project/constructionUserFile/list',
+    url: '/contractor/constructionUserFile/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listConstructionUserFile = (query?: ConstructionUserFileQuery): Axi
  */
 export const setConstructionUserFile = (data: ConstructionUserFileForm): AxiosPromise<string | number> => {
   return request({
-    url: '/project/constructionUserFile/save',
+    url: '/contractor/constructionUserFile/save',
     method: 'post',
     data
   });
@@ -34,7 +34,7 @@ export const setConstructionUserFile = (data: ConstructionUserFileForm): AxiosPr
  */
 export const delConstructionUserFile = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/project/constructionUserFile/' + id,
+    url: '/contractor/constructionUserFile/' + id,
     method: 'delete'
   });
 };

src/api/safety/questionBank/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { QuestionBankVO, QuestionBankForm, QuestionBankQuery } from '@/api/safety/questionBank/types';
+import { QuestionBankVO, QuestionBankForm, QuestionBankQuery } from '@/api/safety/wgzQuestionBank/types';
 
 /**
  * 查询题库列表
@@ -10,7 +10,7 @@ import { QuestionBankVO, QuestionBankForm, QuestionBankQuery } from '@/api/safet
 
 export const listQuestionBank = (query?: QuestionBankQuery): AxiosPromise<QuestionBankVO[]> => {
   return request({
-    url: '/safety/questionBank/list',
+    url: '/safety/wgzQuestionBank/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listQuestionBank = (query?: QuestionBankQuery): AxiosPromise<Questi
  */
 export const getQuestionBank = (id: string | number): AxiosPromise<QuestionBankVO> => {
   return request({
-    url: '/safety/questionBank/' + id,
+    url: '/safety/wgzQuestionBank/' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getQuestionBank = (id: string | number): AxiosPromise<QuestionBankV
  */
 export const addQuestionBank = (data: QuestionBankForm) => {
   return request({
-    url: '/safety/questionBank',
+    url: '/safety/wgzQuestionBank',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addQuestionBank = (data: QuestionBankForm) => {
  */
 export const updateQuestionBank = (data: QuestionBankForm) => {
   return request({
-    url: '/safety/questionBank',
+    url: '/safety/wgzQuestionBank',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateQuestionBank = (data: QuestionBankForm) => {
  */
 export const delQuestionBank = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/safety/questionBank/' + id,
+    url: '/safety/wgzQuestionBank/' + id,
     method: 'delete'
   });
 };

src/api/safety/questionUserAnswer/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { QuestionUserAnswerVO, QuestionUserAnswerForm, QuestionUserAnswerQuery } from '@/api/safety/questionUserAnswer/types';
+import { QuestionUserAnswerVO, QuestionUserAnswerForm, QuestionUserAnswerQuery } from '@/api/safety/wgzQuestionSave/types';
 
 /**
  * 查询用户试卷存储列表
@@ -10,7 +10,7 @@ import { QuestionUserAnswerVO, QuestionUserAnswerForm, QuestionUserAnswerQuery }
 
 export const listQuestionUserAnswer = (query?: QuestionUserAnswerQuery): AxiosPromise<QuestionUserAnswerVO[]> => {
   return request({
-    url: '/safety/questionUserAnswer/list',
+    url: '/safety/wgzQuestionSave/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listQuestionUserAnswer = (query?: QuestionUserAnswerQuery): AxiosPr
  */
 export const getQuestionUserAnswer = (id: string | number): AxiosPromise<QuestionUserAnswerVO> => {
   return request({
-    url: '/safety/questionUserAnswer/' + id,
+    url: '/safety/wgzQuestionSave/' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getQuestionUserAnswer = (id: string | number): AxiosPromise<Questio
  */
 export const addQuestionUserAnswer = (data: QuestionUserAnswerForm) => {
   return request({
-    url: '/safety/questionUserAnswer',
+    url: '/safety/wgzQuestionSave',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addQuestionUserAnswer = (data: QuestionUserAnswerForm) => {
  */
 export const updateQuestionUserAnswer = (data: QuestionUserAnswerForm) => {
   return request({
-    url: '/safety/questionUserAnswer',
+    url: '/safety/wgzQuestionSave',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateQuestionUserAnswer = (data: QuestionUserAnswerForm) => {
  */
 export const delQuestionUserAnswer = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/safety/questionUserAnswer/' + id,
+    url: '/safety/wgzQuestionSave/' + id,
     method: 'delete'
   });
 };
@@ -68,7 +68,7 @@ export const delQuestionUserAnswer = (id: string | number | Array<string | numbe
  */
 export const uploadQuestionUserAnswer = (data: any) => {
   return request({
-    url: '/safety/questionUserAnswer/upload/zip',
+    url: '/safety/wgzQuestionSave/upload/zip',
     method: 'post',
     data: data
   });

src/api/safety/questionsCategory/index.ts

@@ -10,7 +10,7 @@ import { QuestionsCategoryVO, QuestionsCategoryForm, QuestionsCategoryQuery } fr
 
 export const listQuestionsCategory = (query?: QuestionsCategoryQuery): AxiosPromise<QuestionsCategoryVO[]> => {
   return request({
-    url: '/safety/questionsCategory/list',
+    url: '/safety/wzgQuestionCategory/list',
     method: 'get',
     params: query
   });
@@ -22,7 +22,7 @@ export const listQuestionsCategory = (query?: QuestionsCategoryQuery): AxiosProm
  */
 export const getQuestionsCategory = (id: string | number): AxiosPromise<QuestionsCategoryVO> => {
   return request({
-    url: '/safety/questionsCategory/' + id,
+    url: '/safety/wzgQuestionCategory' + id,
     method: 'get'
   });
 };
@@ -33,7 +33,7 @@ export const getQuestionsCategory = (id: string | number): AxiosPromise<Question
  */
 export const addQuestionsCategory = (data: QuestionsCategoryForm) => {
   return request({
-    url: '/safety/questionsCategory',
+    url: '/safety/wzgQuestionCategory',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addQuestionsCategory = (data: QuestionsCategoryForm) => {
  */
 export const updateQuestionsCategory = (data: QuestionsCategoryForm) => {
   return request({
-    url: '/safety/questionsCategory',
+    url: '/safety/wzgQuestionCategory',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateQuestionsCategory = (data: QuestionsCategoryForm) => {
  */
 export const delQuestionsCategory = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/safety/questionsCategory/' + id,
+    url: '/safety/wzgQuestionCategory' + id,
     method: 'delete'
   });
 };

src/api/safety/questionsConfig/index.ts

@@ -22,7 +22,7 @@ export const listQuestionsConfig = (query?: QuestionsConfigQuery): AxiosPromise<
  */
 export const getQuestionsConfig = (id: string | number): AxiosPromise<QuestionsConfigVO> => {
   return request({
-    url: '/safety/questionsConfig/' + id,
+    url: '/safety/wzgQuestionsConfiguration/' + id,
     method: 'get'
   });
 };
@@ -45,7 +45,7 @@ export const addQuestionsConfig = (data: QuestionsConfigForm) => {
  */
 export const updateQuestionsConfig = (data: QuestionsConfigForm) => {
   return request({
-    url: '/safety/questionsConfig',
+    url: '/safety/wzgQuestionsConfiguration',
     method: 'put',
     data: data
   });

src/components/FileUpload/index.vue

@@ -203,6 +203,7 @@ watch(
       });
     } else {
       fileList.value = [];
+
       return [];
     }
   },
@@ -293,7 +294,7 @@ const handleChange = (file: any, filelist: any) => {
     }
   }
   // 记录 status = 'ready' 的文件
-  if (file.status === 'ready') {
+  if (file.status === 'ready' && !props.isConstruction) {
     pendingFiles.value.push(file);
     fileList.value = pendingFiles.value;
   }

src/components/ImageUpload/index.vue

@@ -201,6 +201,8 @@ const uploadedSuccessfully = () => {
     fileList.value = fileList.value.filter((f) => f.url !== undefined).concat(uploadList.value);
     uploadList.value = [];
     number.value = 0;
+    console.log(fileList.value);
+
     emit('update:modelValue', listToString(fileList.value));
     proxy?.$modal.closeLoading();
   }

src/components/TopNav/index.vue

@@ -170,8 +170,6 @@ onMounted(() => {
 //分页
 const getWaitingList = () => {
   pageByTaskWait({ pageNum: 1, pageSize: 10 }).then((resp) => {
-    console.log(resp);
-
     total.value = resp.total;
   });
 };

src/layout/components/Sidebar/SidebarItem.vue

@@ -17,7 +17,7 @@
       <template v-if="item.meta" #title>
         <svg-icon :icon-class="item.meta ? item.meta.icon : ''" />
         <span class="menu-title" :title="hasTitle(item.meta?.title)">{{ item.meta?.title }}</span>
-        <!-- <span class="bage" v-if="item.meta?.title == '我的任务' && total >= 0">{{ total }}</span> -->
+        <span class="bage" v-if="item.meta?.title == '我的任务' && total > 0">{{ total }}</span>
       </template>
 
       <sidebar-item
@@ -59,10 +59,10 @@ const props = defineProps({
 const total = ref(0);
 const totalChao = ref(0);
 onMounted(() => {
-  if (onlyOneChild.value.meta?.title == '我的待办') {
+  if (onlyOneChild.value.meta?.title == '我的待办' || props.item.meta?.title == '我的任务') {
     getWaitingList();
   }
-   if (onlyOneChild.value.meta?.title == '我的抄送') {
+  if (onlyOneChild.value.meta?.title == '我的抄送') {
     getChaoList();
   }
 });
@@ -130,9 +130,7 @@ const hasTitle = (title: string | undefined): string => {
 watch(
   () => noticeStore.state.value.notices,
   (newVal) => {
-    if (onlyOneChild.value.meta?.title == '我的待办') {
+    if (onlyOneChild.value.meta?.title == '我的待办' || props.item.meta?.title == '我的任务') {
-      console.log(121212121);
-
       let time = setTimeout(() => {
         getWaitingList();
         clearTimeout(time);

src/views/contract/bidCost/index.vue

@@ -57,10 +57,10 @@
     </transition>
     <el-card shadow="never" class="mb8">
       <el-table ref="tableRef" v-loading="loading" :data="tableData" row-key="id" border lazy default-expand-all>
-        <el-table-column prop="num" label="编号" />
+        <el-table-column prop="num" label="编号" align="center" />
-        <el-table-column prop="name" label="工程或费用名称" />
+        <el-table-column prop="name" label="工程或费用名称" align="center" />
         <el-table-column prop="unit" label="单位" align="center" />
-        <el-table-column prop="specification" label="规格"  align="center"/>
+        <el-table-column prop="specification" label="规格" align="center" />
         <el-table-column prop="quantity" label="数量" align="center">
           <template #default="scope">
             {{ scope.row.children.length > 0 ? '' : scope.row.quantity }}
@@ -262,7 +262,7 @@ const importExcel = (options: any): any => {
   let formData = new FormData();
   formData.append('file', options.file);
   loading.value = true;
-  BiddingImportExcelFile({ projectId: currentProject.value?.id }, formData)
+  BiddingImportExcelFile({ projectId: currentProject.value?.id, versions: queryForm.value.versions }, formData)
     .then((res) => {
       const { code } = res;
       if (code == 200) {

src/views/contract/division/index.vue

@@ -23,9 +23,9 @@
               {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="名称" />
+          <el-table-column prop="name" label="名称" align="center" />
-          <el-table-column prop="content" label="内容" />
+          <el-table-column prop="content" label="内容" align="center" />
-          <el-table-column prop="price" label="限价" />
+          <el-table-column prop="price" label="限价" align="center" />
           <el-table-column prop="plannedBiddingTime" align="center">
             <template #header> <span style="color: red">*</span>计划招标时间 </template>
             <template #default="scope">

src/views/design/appointment/index.vue

@@ -47,9 +47,9 @@
             <el-row :gutter="8" class="mb-3 font-medium text-gray-700 whitespace-nowrap">
               <el-col :span="4">专业</el-col>
               <el-col :span="5">设计人员（可多选）</el-col>
-              <el-col :span="5">校审人员</el-col>
+              <el-col :span="5">校审人员</el-col> <el-col :span="4">审核人员</el-col>
               <el-col :span="5">审定人员</el-col>
-              <el-col :span="4">审核人员</el-col>
+             
               <el-col :span="3"></el-col>
             </el-row>
 
@@ -209,61 +209,7 @@
                 </el-col>
 
                 <!-- 4. 审定人员 -->
-                <el-col :span="5" class="mb-4 sm:mb-0">
+                
-                  <div class="pl-2 border-l-2 border-orange-200 py-2">
-                    <div class="space-y-3">
-                      <div
-                        v-for="(person, personIndex) in majorConfig.approvedPersons"
-                        :key="`approved-${configIndex}-${personIndex}`"
-                        class="flex items-center"
-                      >
-                        <el-form-item
-                          :prop="`approved.${configIndex}.persons.${personIndex}.userId`"
-                          :rules="{ required: true, message: '请选择审定人员', trigger: 'change' }"
-                          class="flex-1 mr-2 mb-0"
-                          label="审定"
-                          label-width="50px"
-                        >
-                          <el-select
-                            filterable
-                            v-model="person.userId"
-                            placeholder="选择人员"
-                            class="w-full transition-all duration-300 border-gray-300"
-                            @change="() => checkDuplicate(person, 'approved', configIndex, personIndex)"
-                          >
-                            <el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
-                          </el-select>
-                        </el-form-item>
-                        <!-- <div class="flex gap-1">
-                          <el-button
-                            type="danger"
-                            size="small"
-                            @click="removePerson('approved', configIndex, personIndex)"
-                            class="transition-all duration-300 hover:bg-red-600"
-                            :disabled="majorConfig.approvedPersons.length <= 1 || disabledForm"
-                          >
-                            <el-icon :size="14"><Delete /></el-icon>
-                          </el-button>
-                          <el-button
-                            type="success"
-                            size="small"
-                            @click="addPerson('approved', configIndex)"
-                            class="transition-all duration-300 transform hover:scale-105"
-                            :disabled="!form.designers[configIndex].userMajor || disabledForm"
-                          >
-                            <el-icon :size="14"><Plus /></el-icon>
-                          </el-button>
-                        </div> -->
-                      </div>
-                    </div>
-                    <div
-                      v-if="majorConfig.approvedPersons.length == 0"
-                      class="text-gray-500 text-xs py-2 bg-gray-100 rounded border border-dashed border-gray-200"
-                    >
-                      点击"添加"
-                    </div>
-                  </div>
-                </el-col>
 
                 <!-- 5. 审核人员 -->
                 <el-col :span="5" class="mb-4 sm:mb-0">
@@ -321,6 +267,61 @@
                     </div>
                   </div>
                 </el-col>
+<el-col :span="5" class="mb-4 sm:mb-0">
+                  <div class="pl-2 border-l-2 border-orange-200 py-2">
+                    <div class="space-y-3">
+                      <div
+                        v-for="(person, personIndex) in majorConfig.approvedPersons"
+                        :key="`approved-${configIndex}-${personIndex}`"
+                        class="flex items-center"
+                      >
+                        <el-form-item
+                          :prop="`approved.${configIndex}.persons.${personIndex}.userId`"
+                          :rules="{ required: true, message: '请选择审定人员', trigger: 'change' }"
+                          class="flex-1 mr-2 mb-0"
+                          label="审定"
+                          label-width="50px"
+                        >
+                          <el-select
+                            filterable
+                            v-model="person.userId"
+                            placeholder="选择人员"
+                            class="w-full transition-all duration-300 border-gray-300"
+                            @change="() => checkDuplicate(person, 'approved', configIndex, personIndex)"
+                          >
+                            <el-option v-for="item in userList" :key="`user-${item.userId}`" :label="item.nickName" :value="item.userId" />
+                          </el-select>
+                        </el-form-item>
+                        <!-- <div class="flex gap-1">
+                          <el-button
+                            type="danger"
+                            size="small"
+                            @click="removePerson('approved', configIndex, personIndex)"
+                            class="transition-all duration-300 hover:bg-red-600"
+                            :disabled="majorConfig.approvedPersons.length <= 1 || disabledForm"
+                          >
+                            <el-icon :size="14"><Delete /></el-icon>
+                          </el-button>
+                          <el-button
+                            type="success"
+                            size="small"
+                            @click="addPerson('approved', configIndex)"
+                            class="transition-all duration-300 transform hover:scale-105"
+                            :disabled="!form.designers[configIndex].userMajor || disabledForm"
+                          >
+                            <el-icon :size="14"><Plus /></el-icon>
+                          </el-button>
+                        </div> -->
+                      </div>
+                    </div>
+                    <div
+                      v-if="majorConfig.approvedPersons.length == 0"
+                      class="text-gray-500 text-xs py-2 bg-gray-100 rounded border border-dashed border-gray-200"
+                    >
+                      点击"添加"
+                    </div>
+                  </div>
+                </el-col>
 
                 <!-- 操作列 -->
                 <el-col :span="2" class="pr-4 mt-2 text-right">
@@ -343,13 +344,17 @@
               type="primary"
               size="large"
               v-hasPermi="['design:user:batch']"
+              icon="Check"
               @click="submitForm"
               class="px-8 py-2.5 transition-all duration-300 transform hover:scale-105 bg-blue-500 hover:bg-blue-600 text-white font-medium"
-            >
+              >确认提交
-              <i class="el-icon-check mr-2"></i>确认提交
             </el-button>
-            <el-button size="large" @click="resetForm" class="px-8 py-2.5 transition-all duration-300 border-gray-300 hover:bg-gray-100 font-medium">
+            <el-button
-              <i class="el-icon-refresh mr-2"></i>重置
+              size="large"
+              icon="Refresh"
+              @click="resetForm"
+              class="px-8 py-2.5 transition-all duration-300 border-gray-300 hover:bg-gray-100 font-medium"
+              >重置
             </el-button>
           </div>
         </el-form>

src/views/design/received/index.vue

@@ -62,13 +62,13 @@
                 :accept="'.xlsx,.xls'"
                 :limit="1"
               >
-                <el-button type="primary" icon="Upload">导入文件</el-button>
+                <el-button type="primary" icon="Download">导入文件</el-button>
               </el-upload>
               <el-button
                 v-if="!form.id || form.status == 'draft'"
                 type="primary"
                 style="margin-left: 20px"
-                icon="Download"
+                icon="Upload"
                 @click="exportTemplate"
                 class="transition-all hover:bg-blue-600"
               >

src/views/formalities/listOfFormalities/index.vue

@@ -1,9 +1,7 @@
 <template>
-  <formalitiesAreConsolidated ref="formalitiesAreConsolidatedRef" class="overlay"
+  <formalitiesAreConsolidated ref="formalitiesAreConsolidatedRef" class="overlay" v-if="showFormalitiesAreConsolidated" />
-    v-if="showFormalitiesAreConsolidated" />
   <div class="p-2" v-else>
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -23,12 +21,12 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['formalities:listOfFormalities:add']">新增</el-button>
-              v-hasPermi="['formalities:listOfFormalities:add']">新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="primary" :disabled="multiple" plain icon="Plus" @click="handleOk"
+            <el-button type="primary" :disabled="multiple" plain icon="Plus" @click="handleOk" v-hasPermi="['formalities:listOfFormalities:add']"
-              v-hasPermi="['formalities:listOfFormalities:add']">确认</el-button>
+              >确认</el-button
+            >
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -44,8 +42,7 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="名称" prop="name" />
       </el-table>
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
 
     <!-- 添加或修改手续办理清单模板对话框 -->

src/views/out/outTable/index.vue

@@ -85,7 +85,7 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryParams.value.month = '';
+  resetMonth();
   handleQuery();
 };
 // 获取列表
@@ -102,14 +102,17 @@ const getList = async () => {
     total.value = res.total;
   }
 };
-onMounted(() => {
+const resetMonth=()=>{
-  const currentDate = new Date();
+	const currentDate = new Date();
   const year = currentDate.getFullYear();
   const month = currentDate.getMonth() + 1; // 月份从0开始，所以需要加1
 
   // 形成"YYYY-M"格式
   const formattedDate = `${year}-${String(month).padStart(2, '0')}`;
   queryParams.value.month = formattedDate;
+}
+onMounted(() => {
+  resetMonth();
 
   getList();
 });

src/views/progress/constructionSchedulePlan/index.vue

@@ -120,17 +120,17 @@
           <!-- <el-input v-model="form.projectStructure" placeholder="请输入对应项目结构" /> -->
         </el-form-item>
         <el-form-item label="预计开始时间" prop="planStartDate">
-          <el-date-picker clearable v-model="form.planStartDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择预计开始时间" />
+          <el-date-picker clearable v-model="form.planStartDate" type="date" value-format="YYYY-MM-DD" placeholder="选择预计开始时间" />
         </el-form-item>
         <el-form-item label="预计结束时间" prop="planEndDate">
-          <el-date-picker clearable v-model="form.planEndDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择预计结束时间" />
+          <el-date-picker clearable v-model="form.planEndDate" type="date" value-format="YYYY-MM-DD" placeholder="选择预计结束时间" />
         </el-form-item>
         <el-form-item label="实际开始时间" prop="practicalStartDate">
           <el-date-picker
             clearable
             v-model="form.practicalStartDate"
-            type="datetime"
+            type="date"
-            value-format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD"
             placeholder="选择实际开始时间"
           />
         </el-form-item>
@@ -138,8 +138,8 @@
           <el-date-picker
             clearable
             v-model="form.practicalEndDate"
-            type="datetime"
+            type="date"
-            value-format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD"
             placeholder="选择实际结束时间"
           />
         </el-form-item>

src/views/progress/progressCategoryTemplate/index.vue

@@ -216,7 +216,7 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询进度类别模版列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listProgressCategoryTemplateByParent(activeTab.value);
+  const res = await listProgressCategoryTemplateByParent(activeTab.value,queryParams.value.name);
   const data = proxy?.handleTree<ProgressCategoryTemplateVO>(res.data, 'id', 'parentId');
   if (data) {
     progressCategoryTemplateList.value = data;

src/views/project/constructionUser/component/ConstructionUserDetail.vue

@@ -44,11 +44,11 @@
               {{ userDetail?.sfzNumber }}
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="身份证号码">
               {{ userDetail?.sfzNumber }}
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="身份证有效开始期">
               {{ dayjs(userDetail?.sfzStart).format('YYYY 年 MM 月 DD 日') }}
@@ -59,7 +59,7 @@
               {{ dayjs(userDetail?.sfzEnd).format('YYYY 年 MM 月 DD 日') }}
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="身份证地址">
               {{ userDetail?.sfzSite }}
             </el-form-item>

src/views/project/projectUser/component/ConstructionUserDetail.vue

@@ -44,14 +44,14 @@
               {{ userDetail?.sfzNumber }}
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="身份证号码">
               {{ userDetail?.sfzNumber }}
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="身份证有效开始期">
-              {{ dayjs(userDetail?.sfzStart).format('YYYY 年 MM 月 DD 日') }}
+              {{ dayjs(userDetail?.sfzStart).format('YYYY年 MM 月 DD 日') }}
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/project/projectUser/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -46,43 +45,59 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['contractor:constructionUser:add']">新增 </el-button>
-              v-hasPermi="['contractor:constructionUser:add']">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+            <el-button
-              v-hasPermi="['contractor:constructionUser:remove']">
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="handleDelete()"
+              v-hasPermi="['contractor:constructionUser:remove']"
+            >
               删除
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport"
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['contractor:constructionUser:export']"
-              v-hasPermi="['contractor:constructionUser:export']">导出
+              >导出
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑
+            <el-button type="warning" plain icon="Edit" :disabled="multiple" @click="statusDialog = true">用户状态编辑 </el-button>
-            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-switch v-model="playCardStatus" class="ml-2" inline-prompt
+            <el-switch
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" :loading="playCardLoding"
+              v-model="playCardStatus"
-              @change="handlePlayCardStatus" inactive-text="一键关闭打卡" active-text="一键开启打卡" />
+              class="ml-2"
+              inline-prompt
+              style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
+              :loading="playCardLoding"
+              @change="handlePlayCardStatus"
+              inactive-text="一键关闭打卡"
+              active-text="一键开启打卡"
+            />
           </el-col>
           <el-row @mouseover="informationStatus = true" :gutter="10" @mouseout="informationStatus = false">
             <el-col :span="1.5">
               <el-button type="success" plain>员工资料 </el-button>
             </el-col>
             <el-col :span="1.5" v-show="informationStatus">
-              <el-button type="primary" plain icon="Edit" @click="downloadTemplate"
+              <el-button type="primary" plain icon="Edit" @click="downloadTemplate" v-hasPermi="['contractor:constructionUserFile:download']"
-                v-hasPermi="['contractor:constructionUserFile:download']">下载资料模板
+                >下载资料模板
               </el-button>
             </el-col>
             <el-col :span="1.5" v-show="informationStatus">
-              <file-upload v-model="filePath" isImportInfo :isShowTip="false"
+              <file-upload
-                uploadUrl="/project/constructionUserFile/upload/zip" :limit="1" :file-size="50">
+                v-model="filePath"
-                <el-button type="warning" plain icon="Edit"
+                isImportInfo
-                  v-hasPermi="['contractor:constructionUserFile:upload']">导入员工资料 </el-button>
+                :isShowTip="false"
+                uploadUrl="/project/constructionUserFile/upload/zip"
+                :limit="1"
+                :file-size="50"
+              >
+                <el-button type="warning" plain icon="Edit" v-hasPermi="['contractor:constructionUserFile:upload']">导入员工资料 </el-button>
               </file-upload>
             </el-col>
           </el-row>
@@ -120,9 +135,18 @@
         </el-table-column>
         <el-table-column label="打卡状态" align="center" prop="clock">
           <template #default="scope">
-            <el-switch v-model="scope.row.clock" class="ml-2" inline-prompt
+            <el-switch
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949" active-text="开启" inactive-text="禁用"
+              v-model="scope.row.clock"
-              :loading="playCardLoding" active-value="0" inactive-value="1" @change="handleClockStatus(scope.row)" />
+              class="ml-2"
+              inline-prompt
+              style="--el-switch-on-color: #13ce66; --el-switch-off-color: #ff4949"
+              active-text="开启"
+              inactive-text="禁用"
+              :loading="playCardLoding"
+              active-value="0"
+              inactive-value="1"
+              @change="handleClockStatus(scope.row)"
+            />
           </template>
         </el-table-column>
         <el-table-column label="薪水" align="center" min-width="180">
@@ -131,8 +155,7 @@
               {{ scope.row.salary ? scope.row.salary : scope.row.standardSalary }}
               (<dict-tag :options="wage_measure_unit_type" :value="scope.row.wageMeasureUnit"></dict-tag>)
             </span>
-            <div class="text-blue text-sm cursor-pointer" @click="openSalaryDialog(scope.row)">{{ scope.row.salary ?
+            <div class="text-blue text-sm cursor-pointer" @click="openSalaryDialog(scope.row)">{{ scope.row.salary ? '取消变更' : '变更' }}</div>
-              '取消变更' : '变更' }}</div>
           </template>
         </el-table-column>
         <el-table-column label="入场时间" align="center" prop="entryDate" min-width="180" />
@@ -146,30 +169,31 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="300">
           <template #default="scope">
             <el-space wrap>
-              <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)"
+              <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['contractor:constructionUser:query']">
-                v-hasPermi="['contractor:constructionUser:query']">
                 详情
               </el-button>
-              <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)"
+              <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['contractor:constructionUser:edit']">
-                v-hasPermi="['contractor:constructionUser:edit']">
                 修改
               </el-button>
               <el-button link type="warning" icon="Female" @click="handlePlayCard(scope.row)"> 打卡 </el-button>
-              <el-button link type="danger" icon="Avatar" @click="handleJoinBlacklist(scope.row)"
+              <el-button
-                v-hasPermi="['contractor:constructionBlacklist:add']">
+                link
+                type="danger"
+                icon="Avatar"
+                @click="handleJoinBlacklist(scope.row)"
+                v-hasPermi="['contractor:constructionBlacklist:add']"
+              >
                 黑名单
               </el-button>
               <!-- <el-button link type="primary" icon="Switch" @click="handleToggle(scope.row)"> 切换人脸 </el-button> -->
               <el-button link type="primary" icon="Switch" @click="handleChange(scope.row)"> 人员迁移 </el-button>
               <el-button link type="primary" icon="Switch" @click="handleAssign(scope.row)"> 分配班组 </el-button>
               <el-button link type="primary" icon="ChatLineSquare" @click="handleExit(scope.row)"> 入退场记录 </el-button>
-              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['contractor:constructionUser:remove']">
-                v-hasPermi="['contractor:constructionUser:remove']">
                 删除
               </el-button>
               <el-tooltip content="红点：部分上传，绿点：已上传，无点：未上传" placement="right" effect="dark">
-                <el-badge :is-dot="scope.row.fileUploadStatus != '1'"
+                <el-badge :is-dot="scope.row.fileUploadStatus != '1'" :type="uploadStatusColor(scope.row.fileUploadStatus)">
-                  :type="uploadStatusColor(scope.row.fileUploadStatus)">
                   <el-button link type="primary" icon="FolderAdd" @click="handleUpload(scope.row)">文件上传 </el-button>
                 </el-badge>
               </el-tooltip>
@@ -178,8 +202,7 @@
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改施工人员对话框 -->
     <el-dialog draggable :title="dialog.title" v-model="dialog.visible" width="930px" append-to-body>
@@ -231,14 +254,12 @@
             </div>
             <div class="el-col el-col-12">
               <el-form-item label="身份证有效开始期" prop="sfzStart">
-                <el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD"
+                <el-date-picker clearable v-model="form.sfzStart" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效开始期" />
-                  placeholder="请输入身份证有效开始期" />
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
               <el-form-item label="身份证有效结束期" prop="sfzEnd">
-                <el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD"
+                <el-date-picker clearable v-model="form.sfzEnd" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证有效结束期" />
-                  placeholder="请输入身份证有效结束期" />
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
@@ -248,8 +269,7 @@
             </div>
             <div class="el-col el-col-12">
               <el-form-item label="身份证出生日期" prop="sfzBirth">
-                <el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD"
+                <el-date-picker clearable v-model="form.sfzBirth" type="date" value-format="YYYY-MM-DD" placeholder="请输入身份证出生日期" />
-                  placeholder="请输入身份证出生日期" />
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
@@ -302,16 +322,14 @@
             <div class="el-col el-col-12">
               <el-form-item label="打卡" prop="clock">
                 <el-select v-model="form.clock" clearable placeholder="请选择打卡状态">
-                  <el-option v-for="item in user_clock_type" :key="item.value" :label="item.label"
+                  <el-option v-for="item in user_clock_type" :key="item.value" :label="item.label" :value="item.value" />
-                    :value="item.value" />
                 </el-select>
               </el-form-item>
             </div>
             <div class="el-col el-col-12">
               <el-form-item label="结算方式" prop="wageMeasureUnit">
                 <el-select v-model="form.wageMeasureUnit" clearable placeholder="请选择结算方式">
-                  <el-option v-for="item in wage_measure_unit_type" :key="item.value" :label="item.label"
+                  <el-option v-for="item in wage_measure_unit_type" :key="item.value" :label="item.label" :value="item.value" />
-                    :value="item.value" />
                 </el-select>
               </el-form-item>
             </div>
@@ -340,8 +358,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="分包单位" label-width="130px">
-        <el-select v-model="skipObject.contractorId" :disabled="!skipObject.projectId" placeholder="请选择分包单位"
+        <el-select v-model="skipObject.contractorId" :disabled="!skipObject.projectId" placeholder="请选择分包单位" style="width: 240px">
-          style="width: 240px">
           <el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -356,8 +373,7 @@
       <div class="image_upload" v-for="(item, index) in uploadPath" :key="item.value">
         <div class="title">{{ item.label }}</div>
         <div class="file_upload_all" v-if="item.value != 7">
-          <file-upload v-model="item.path" isConstruction :isShowTip="false" :limit="10" :file-type="['pdf']"
+          <file-upload v-model="item.path" isConstruction show-file-list :isShowTip="false" :limit="10" :file-type="['pdf']" :file-size="50" />
-            :file-size="50" />
         </div>
       </div>
       <template #footer>
@@ -376,7 +392,8 @@
         </el-form>
       </div>
       <template #footer>
-        <span><el-button type="primary" @click="submitForm">保存</el-button>
+        <span
+          ><el-button type="primary" @click="submitForm">保存</el-button>
           <el-button @click="showFaceDrawer = false">取消</el-button>
         </span>
       </template>
@@ -388,7 +405,8 @@
         </el-select>
       </el-form-item>
       <template #footer>
-        <span><el-button type="primary" @click="handleEdit">保存</el-button>
+        <span
+          ><el-button type="primary" @click="handleEdit">保存</el-button>
           <el-button @click="statusDialog = false">取消</el-button>
         </span>
       </template>
@@ -412,8 +430,8 @@
           <el-timeline-item color="rgb(255, 73, 73)">
             <div class="mb">{{ '退场时间：' + item.entryDate }}</div>
             <div class="pl-xl">
-              <span class="text-coolgray font-bold">退场文件：<image-preview v-for="itm in item.pathUrl" :src="itm"
+              <span class="text-coolgray font-bold">退场文件：<image-preview v-for="itm in item.pathUrl" :src="itm" width="100px" class="mr" /></span
-                  width="100px" class="mr" /></span><br />
+              ><br />
               <p class="mt text-coolgray">
                 备注：<span class="text-blue">{{ item.remark }}</span>
               </p>
@@ -441,8 +459,11 @@
           <el-date-picker v-model="monthValue" type="month" placeholder="请选择月份" @change="handleMonth" />
         </template>
         <template #date-cell="{ data }">
-          <div class="w100% h100% position-relative m-0 monthDay" :class="data.isSelected ? 'is-selected' : ''"
+          <div
-            @click="handleViewPlayCard(playCardIdx(data), data)">
+            class="w100% h100% position-relative m-0 monthDay"
+            :class="data.isSelected ? 'is-selected' : ''"
+            @click="handleViewPlayCard(playCardIdx(data), data)"
+          >
             {{ data.day.split('-').slice(1).join('-') }}
             <div :style="{ background: playCardColor(data) }" v-if="playCardIdx(data) != -1"></div>
           </div>
@@ -461,8 +482,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="班组" label-width="130px">
-        <el-select v-model="personnelAllocationObject.teamId" :disabled="!personnelAllocationObject.projectId" placeholder="请选择分包单位"
+        <el-select
-          style="width: 240px">
+          v-model="personnelAllocationObject.teamId"
+          :disabled="!personnelAllocationObject.projectId"
+          placeholder="请选择班组"
+          style="width: 240px"
+        >
           <el-option v-for="item in teamList" :key="item.id" :label="item.teamName" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -527,8 +552,8 @@ import { parseTime } from '@/utils/ruoyi';
 
 const calendar = ref<CalendarInstance>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type,user_post_type } = toRefs<any>(
+const { type_of_work, user_sex_type, user_clock_type, user_file_type, user_status_type, wage_measure_unit_type, user_post_type } = toRefs<any>(
-  proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type','user_post_type')
+  proxy?.useDict('type_of_work', 'user_sex_type', 'user_clock_type', 'user_file_type', 'user_status_type', 'wage_measure_unit_type', 'user_post_type')
 );
 // 获取用户 store
 const userStore = useUserStoreHook();
@@ -586,7 +611,7 @@ const personnelAllocationObject = reactive({
   memberId: null,
   projectId: '',
   teamId: '',
-  postId: '',
+  postId: ''
 });
 
 const contractorList = ref<Array<skipTeamType>>([]);
@@ -942,7 +967,7 @@ const downloadTemplate = async () => {
 };
 
 //导入资料
-const importInformation = async () => { };
+const importInformation = async () => {};
 
 /** 人员迁移 */
 const handleChange = async (row: ConstructionUserVO) => {
@@ -974,7 +999,7 @@ const handleExit = async (row: ConstructionUserVO) => {
 
 //上传按钮
 const handleUpload = async (row: ConstructionUserVO) => {
-  const _id = row?.id || ids.value[0];
+  const _id = row?.sysUserId;
   currentUserId.value = _id;
   const res = await listConstructionUserFile({ userId: _id });
   fileList.value = res.data;
@@ -1110,14 +1135,17 @@ const listeningProject = watch(
 const handleAssign = async (row: ConstructionUserVO) => {
   const _id = row?.id || ids.value[0];
   currentUserId.value = _id;
+  personnelAllocationObject.projectId = '';
+  personnelAllocationObject.postId = '';
+  personnelAllocationObject.teamId = '';
   personnelAllocationObject.memberId = row?.sysUserId;
+  skipName.value = row?.userName;
   personnelAllocation.value = true;
 };
 // 选择项目1
 const selectProject1 = (e: any) => {
   // 请求班组
   getTeamList(personnelAllocationObject.projectId);
-  
 };
 const getTeamList = async (projectId) => {
   const res = await TeamList({
@@ -1152,7 +1180,7 @@ onMounted(() => {
   position: relative;
   font-size: 12px;
 
-  >div {
+  > div {
     margin: 0 15px;
     position: relative;
     font-size: 12px;
@@ -1197,7 +1225,7 @@ onMounted(() => {
 .monthDay {
   padding: 8px;
 
-  >div {
+  > div {
     position: absolute;
     width: 20px;
     height: 20px;

src/views/safety/questionBank/index.vue

@@ -14,15 +14,6 @@
                 <el-option v-for="dict in safety_question_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="题目内容" prop="questionContent">
-              <el-input v-model="queryParams.questionContent" placeholder="请输入题目内容" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="选项" prop="options">
-              <el-input v-model="queryParams.options" placeholder="请输入选项" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="正确答案" prop="correctAnswer">
-              <el-input v-model="queryParams.correctAnswer" placeholder="请输入正确答案" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -38,32 +29,18 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:questionBank:add']"> 新增 </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['safety:questionBank:edit']"
-              >修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['safety:questionBank:remove']"
-              >删除
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['safety:questionBank:export']">导出 </el-button>
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="questionBankList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="questionBankList">
-        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="序号" align="center" type="index" width="80" />
-        <el-table-column label="主键id" align="center" prop="id" v-if="true" />
+        <el-table-column label="题目类别" align="center" width="100" prop="categoryType">
-        <el-table-column label="题目类别" align="center" prop="categoryType">
           <template #default="scope">
             <dict-tag :options="safety_question_category_type" :value="scope.row.categoryType" />
           </template>
         </el-table-column>
-        <el-table-column label="题目类型" align="center" prop="questionType">
+        <el-table-column label="题目类型" align="center" width="100" prop="questionType">
           <template #default="scope">
             <dict-tag :options="safety_question_type" :value="scope.row.questionType" />
           </template>
@@ -73,16 +50,11 @@
         <el-table-column label="正确答案" align="center" prop="correctAnswer" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:questionBank:edit']">修改</el-button>
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:questionBank:edit']"></el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:questionBank:remove']">删除</el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:questionBank:remove']"></el-button>
-            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
-
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改题库对话框 -->

src/views/safety/questionUserAnswer/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -31,23 +30,27 @@
                 注:上传压缩包内的文件夹名称需设置为【姓名-身份证-满分-得分-及格分】， <br />
                 例如:小明-5130112333654X-100-59-60
               </template>
-              <file-upload :limit="1" v-model:model-value="filePath" isImportInfo :fileType="['zip']"
+              <file-upload
-                uploadUrl="/safety/questionUserAnswer/upload/zip" :file-size="5000"
+                :limit="1"
-                :data="{ projectId: currentProject.id }"><el-button type="success" plain
+                v-model:model-value="filePath"
-                  icon="Upload">上传线下安全考试</el-button></file-upload>
+                isImportInfo
+                :fileType="['zip']"
+                uploadUrl="/safety/wgzQuestionSave/upload/zip"
+                :file-size="5000"
+                :data="{ projectId: currentProject.id }"
+                ><el-button type="success" plain icon="Upload">上传线下安全考试</el-button></file-upload
+              >
             </el-tooltip>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Download" :disabled="single"
+            <el-button type="primary" plain icon="Download" :disabled="single" @click="handleDownload()">批量下载试卷</el-button>
-              @click="handleDownload()">批量下载试卷</el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
       <el-table v-loading="loading" :data="questionUserAnswerList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="index" label="序号" width="80" align="center" />
-        <el-table-column label="主键id" align="center" prop="id" v-if="false" />
         <el-table-column label="姓名" align="center" prop="userName" />
         <el-table-column label="及格线/总分" align="center" prop="pass" />
         <el-table-column label="得分" align="center" prop="score" />
@@ -59,21 +62,19 @@
             <dict-tag :options="user_exam_type" :value="scope.row.examType" />
           </template>
         </el-table-column>
-
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-link type="primary" :underline="false" :href="scope.row.fileUrl[0]" target="_blank">
+            <!-- <el-link type="primary" :underline="false" :href="scope.row.path[0]" target="_blank">
               <el-button link type="primary" icon="View">预览试卷</el-button>
-            </el-link>
+            </el-link> -->
-
+            <el-button link type="primary" icon="Download" @click="downloadOssOne(scope.row)" v-hasPermi="['system:oss:download']"
-            <el-button link type="primary" icon="Download" @click="downloadOssOne(scope.row)"
+              >下载试卷</el-button
-              v-hasPermi="['system:oss:download']">下载试卷</el-button>
+            >
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
   </div>
 </template>
@@ -196,35 +197,15 @@ const handleSelectionChange = (selection: QuestionUserAnswerVO[]) => {
   multiple.value = !selection.length;
 };
 
-/** 修改按钮操作 */
-// const handleUpdate = async (row?: QuestionUserAnswerVO) => {
-//   reset();
-//   const _id = row?.id || ids.value[0];
-//   const res = await getQuestionUserAnswer(_id);
-//   Object.assign(form.value, res.data);
-//   dialog.visible = true;
-//   dialog.title = '修改用户试卷存储';
-// };
-
 /** 批量下载按钮操作 */
 const handleDownload = async () => {
   const _ids = ids.value;
-  await downLoadOss({ idList: _ids }, '/safety/questionUserAnswer/exportFile', '安全考试.zip');
+  await downLoadOss({ idList: _ids }, '/safety/wgzQuestionSave/exportFile', '安全考试.zip');
 };
 /** 下载单个按钮操作 */
 const downloadOssOne = async (row?: QuestionUserAnswerVO) => {
   await download.oss(row?.file);
 };
-
-// const fileWatch = watch(
-//   () => filePath.value,
-//   (nid, oid) => {
-//     uploadQuestionUserAnswer({ file: filePath.value, projectId: currentProject.value?.id }).then((res) => {
-//       console.log(res);
-//     });
-//   }
-// );
-
 //监听项目id刷新数据
 const listeningProject = watch(
   () => currentProject.value?.id,

src/views/safety/questionsCategory/index.vue

@@ -22,38 +22,21 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:questionsCategory:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['safety:questionsCategory:edit']"
-              >修改</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['safety:questionsCategory:remove']"
-              >删除</el-button
-            >
-          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="questionsCategoryList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="questionsCategoryList">
-        <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" type="index" width="100" />
         <el-table-column label="题库类别" align="center" prop="categoryName" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:questionsCategory:edit']"
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:questionsCategory:edit']"></el-button>
+              >修改</el-button
-            </el-tooltip>
+            >
-            <el-tooltip content="删除" placement="top">
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:questionsCategory:remove']"
-              <el-button
+              >删除</el-button
-                link
+            >
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['safety:questionsCategory:remove']"
-              ></el-button>
-            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>

src/views/safety/questionsConfig/index.vue

@@ -1,309 +1,220 @@
 <template>
-  <div class="p-2">
+  <div class="container p-4 md:p-6">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <el-card shadow="hover" class="config-card transition-all duration-300 hover:shadow-lg">
-      <div v-show="showSearch" class="mb-[10px]">
+      <div class="card-header mb-4">
-        <el-card shadow="hover">
+        <h2 class="text-xl font-semibold text-gray-800">题库配置</h2>
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+        <p class="text-gray-500 text-sm">设置各类题型数量、分值及考试参数</p>
-            <el-form-item label="单选题" prop="singleChoice">
-              <el-input v-model="queryParams.singleChoice" placeholder="请输入单选题" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="单选分数" prop="singleScore">
-              <el-input v-model="queryParams.singleScore" placeholder="请输入单选分数" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="多选题" prop="multipleChoice">
-              <el-input v-model="queryParams.multipleChoice" placeholder="请输入多选题" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="多选分数" prop="multipleScore">
-              <el-input v-model="queryParams.multipleScore" placeholder="请输入多选分数" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="判断题" prop="estimate">
-              <el-input v-model="queryParams.estimate" placeholder="请输入判断题" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="判断分数" prop="estimateScore">
-              <el-input v-model="queryParams.estimateScore" placeholder="请输入判断分数" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="满分" prop="fullMark">
-              <el-input v-model="queryParams.fullMark" placeholder="请输入满分" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="及格线" prop="passScore">
-              <el-input v-model="queryParams.passScore" placeholder="请输入及格线" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="答题最大时间" prop="answerTime">
-              <el-input v-model="queryParams.answerTime" placeholder="请输入答题最大时间" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
       </div>
-    </transition>
 
-    <el-card shadow="never">
+      <el-form :model="form" label-width="120px" ref="formRef" class="config-form">
-      <template #header>
+        <el-row :gutter="20">
-        <el-row :gutter="10" class="mb8">
+          <!-- 单选题设置 -->
-          <el-col :span="1.5">
+          <el-col :span="12" class="form-item-col">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:questionsConfig:add']"> 新增 </el-button>
+            <el-form-item label="单选题(道)" :rules="[{ required: true, message: '单选题数量不能为空', trigger: 'blur' }]">
+              <el-input type="number" v-model="form.singleChoice" min="0" class="transition-all" placeholder="请输入数量" />
+            </el-form-item>
           </el-col>
-          <el-col :span="1.5">
+
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['safety:questionsConfig:edit']"
+          <el-col :span="12" class="form-item-col">
-              >修改
+            <el-form-item label="单选分数" :rules="[{ required: true, message: '单选分数不能为空', trigger: 'blur' }]">
-            </el-button>
+              <el-input type="number" v-model="form.singleScore" min="0" class="transition-all" placeholder="每题分数" />
+            </el-form-item>
           </el-col>
-          <el-col :span="1.5">
+
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['safety:questionsConfig:remove']"
+          <!-- 多选题设置 -->
-              >删除
+          <el-col :span="12" class="form-item-col">
-            </el-button>
+            <el-form-item label="多选题(道)" :rules="[{ required: true, message: '多选题数量不能为空', trigger: 'blur' }]">
+              <el-input type="number" v-model="form.multipleChoice" min="0" class="transition-all" placeholder="请输入数量" />
+            </el-form-item>
           </el-col>
-          <el-col :span="1.5">
+
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['safety:questionsConfig:export']">导出 </el-button>
+          <el-col :span="12" class="form-item-col">
+            <el-form-item label="多选分数" :rules="[{ required: true, message: '多选分数不能为空', trigger: 'blur' }]">
+              <el-input type="number" v-model="form.multipleScore" min="0" class="transition-all" placeholder="每题分数" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 判断题设置 -->
+          <el-col :span="12" class="form-item-col">
+            <el-form-item label="判断题(道)" :rules="[{ required: true, message: '判断题数量不能为空', trigger: 'blur' }]">
+              <el-input type="number" v-model="form.estimate" min="0" class="transition-all" placeholder="请输入数量" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12" class="form-item-col">
+            <el-form-item label="判断分数" :rules="[{ required: true, message: '判断分数不能为空', trigger: 'blur' }]">
+              <el-input type="number" v-model="form.estimateScore" min="0" class="transition-all" placeholder="每题分数" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 分数设置 -->
+          <el-col :span="12" class="form-item-col">
+            <el-form-item label="及格分数" :rules="[{ required: true, message: '及格分数不能为空', trigger: 'blur' }]">
+              <el-input
+                type="number"
+                v-model="form.passingScore"
+                min="0"
+                :max="form.fullMark"
+                @change="handlePassingScoreChange"
+                class="transition-all"
+                placeholder="请输入及格分数"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12" class="form-item-col">
+            <el-form-item label="满分">
+              <el-input type="number" v-model="form.fullMark" disabled class="bg-gray-50" />
+            </el-form-item>
+          </el-col>
+
+          <!-- 时间设置 -->
+          <el-col :span="12" class="form-item-col">
+            <el-form-item label="答题时间(分钟)" :rules="[{ required: true, message: '答题时间不能为空', trigger: 'blur' }]">
+              <el-input type="number" v-model="form.answerTime" min="0" class="transition-all" placeholder="请输入时间" />
+            </el-form-item>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-      </template>
-
-      <el-table v-loading="loading" :data="questionsConfigList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="主键id" align="center" prop="id" v-if="true" />
-        <el-table-column label="单选题" align="center" prop="singleChoice" />
-        <el-table-column label="单选分数" align="center" prop="singleScore" />
-        <el-table-column label="多选题" align="center" prop="multipleChoice" />
-        <el-table-column label="多选分数" align="center" prop="multipleScore" />
-        <el-table-column label="判断题" align="center" prop="estimate" />
-        <el-table-column label="判断分数" align="center" prop="estimateScore" />
-        <el-table-column label="满分" align="center" prop="fullMark" />
-        <el-table-column label="及格线" align="center" prop="passScore" />
-        <el-table-column label="答题最大时间" align="center" prop="answerTime" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:questionsConfig:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button
-                link
-                type="primary"
-                icon="Delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['safety:questionsConfig:remove']"
-              ></el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-    </el-card>
-    <!-- 添加或修改题库配置对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="questionsConfigFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="单选题" prop="singleChoice">
-          <el-input v-model="form.singleChoice" placeholder="请输入单选题" />
-        </el-form-item>
-        <el-form-item label="单选分数" prop="singleScore">
-          <el-input v-model="form.singleScore" placeholder="请输入单选分数" />
-        </el-form-item>
-        <el-form-item label="多选题" prop="multipleChoice">
-          <el-input v-model="form.multipleChoice" placeholder="请输入多选题" />
-        </el-form-item>
-        <el-form-item label="多选分数" prop="multipleScore">
-          <el-input v-model="form.multipleScore" placeholder="请输入多选分数" />
-        </el-form-item>
-        <el-form-item label="判断题" prop="estimate">
-          <el-input v-model="form.estimate" placeholder="请输入判断题" />
-        </el-form-item>
-        <el-form-item label="判断分数" prop="estimateScore">
-          <el-input v-model="form.estimateScore" placeholder="请输入判断分数" />
-        </el-form-item>
-        <el-form-item label="满分" prop="fullMark">
-          <el-input v-model="form.fullMark" placeholder="请输入满分" />
-        </el-form-item>
-        <el-form-item label="及格线" prop="passScore">
-          <el-input v-model="form.passScore" placeholder="请输入及格线" />
-        </el-form-item>
-        <el-form-item label="答题最大时间" prop="answerTime">
-          <el-input v-model="form.answerTime" placeholder="请输入答题最大时间" />
-        </el-form-item>
       </el-form>
-      <template #footer>
+
-        <div class="dialog-footer">
+      <div class="form-actions flex justify-center mt-6">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="onSubmit" :loading="buttonLoading" class="px-8 transition-all hover:scale-105"> 保存配置 </el-button>
-          <el-button @click="cancel">取 消</el-button>
+      </div>
-        </div>
+    </el-card>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
 <script setup name="QuestionsConfig" lang="ts">
-import { addQuestionsConfig, delQuestionsConfig, getQuestionsConfig, listQuestionsConfig, updateQuestionsConfig } from '@/api/safety/questionsConfig';
+import { ref, reactive, computed, onMounted, getCurrentInstance } from 'vue';
-import { QuestionsConfigForm, QuestionsConfigQuery, QuestionsConfigVO } from '@/api/safety/questionsConfig/types';
+import { ElFormInstance, ComponentInternalInstance } from 'element-plus';
+import { getQuestionsConfig, updateQuestionsConfig } from '@/api/safety/questionsConfig';
+import { QuestionsConfigForm} from '@/api/safety/questionsConfig/types';
 import { useUserStoreHook } from '@/store/modules/user';
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+// 获取用户信息
-// 获取用户 store
 const userStore = useUserStoreHook();
-// 从 store 中获取项目列表和当前选中的项目
 const currentProject = computed(() => userStore.selectedProject);
-const questionsConfigList = ref<QuestionsConfigVO[]>([]);
+
+// 表单相关
+const formRef = ref<ElFormInstance>();
 const buttonLoading = ref(false);
-const loading = ref(true);
+const form = reactive<QuestionsConfigForm>({
-const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-
-const queryFormRef = ref<ElFormInstance>();
-const questionsConfigFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
-const initFormData: QuestionsConfigForm = {
   id: undefined,
   projectId: currentProject.value?.id,
-  singleChoice: undefined,
+  singleChoice: 0,
-  singleScore: undefined,
+  singleScore: 0,
-  multipleChoice: undefined,
+  multipleChoice: 0,
-  multipleScore: undefined,
+  multipleScore: 0,
-  estimate: undefined,
+  estimate: 0,
-  estimateScore: undefined,
+  estimateScore: 0,
-  fullMark: undefined,
+  fullMark: 0,
-  passScore: undefined,
+  passScore: 0,
-  answerTime: undefined
+  answerTime: 0,
-};
+  passingScore: 0
-const data = reactive<PageData<QuestionsConfigForm, QuestionsConfigQuery>>({
-  form: { ...initFormData },
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    projectId: currentProject.value?.id,
-    singleChoice: undefined,
-    singleScore: undefined,
-    multipleChoice: undefined,
-    multipleScore: undefined,
-    estimate: undefined,
-    estimateScore: undefined,
-    fullMark: undefined,
-    passScore: undefined,
-    answerTime: undefined,
-    params: {}
-  },
-  rules: {
-    id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
-    singleChoice: [{ required: true, message: '单选题不能为空', trigger: 'blur' }],
-    singleScore: [{ required: true, message: '单选分数不能为空', trigger: 'blur' }],
-    multipleChoice: [{ required: true, message: '多选题不能为空', trigger: 'blur' }],
-    multipleScore: [{ required: true, message: '多选分数不能为空', trigger: 'blur' }],
-    estimate: [{ required: true, message: '判断题不能为空', trigger: 'blur' }],
-    estimateScore: [{ required: true, message: '判断分数不能为空', trigger: 'blur' }],
-    fullMark: [{ required: true, message: '满分不能为空', trigger: 'blur' }],
-    passScore: [{ required: true, message: '及格线不能为空', trigger: 'blur' }],
-    answerTime: [{ required: true, message: '答题最大时间不能为空', trigger: 'blur' }]
-  }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+// 计算满分
+const calculateFullMark = () => {
+  form.fullMark =
+    (form.singleChoice || 0) * (form.singleScore || 0) +
+    (form.multipleChoice || 0) * (form.multipleScore || 0) +
+    (form.estimate || 0) * (form.estimateScore || 0);
 
-/** 查询题库配置列表 */
+  // 确保及格分不超过满分
-const getList = async () => {
+  if (form.passingScore > form.fullMark) {
-  loading.value = true;
+    form.passingScore = form.fullMark;
-  const res = await listQuestionsConfig(queryParams.value);
+  }
-  questionsConfigList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
 };
 
-/** 取消按钮 */
+// 监听分数变化，自动计算满分
-const cancel = () => {
+['singleChoice', 'singleScore', 'multipleChoice', 'multipleScore', 'estimate', 'estimateScore'].forEach((field) => {
-  reset();
+  watch(() => form[field], calculateFullMark);
-  dialog.visible = false;
+});
+
+// 处理及格分变化
+const handlePassingScoreChange = (val: number) => {
+  if (val >= form.fullMark) {
+    form.passingScore = form.fullMark;
+  }
 };
 
-/** 表单重置 */
+// 获取配置详情
-const reset = () => {
+const getDetail = () => {
-  form.value = { ...initFormData };
+  getQuestionsConfig(1).then((res: any) => {
-  questionsConfigFormRef.value?.resetFields();
+    if (res.code == 200 && res.data) {
-};
+      Object.assign(form, res.data);
-
+      calculateFullMark(); // 确保满分计算正确
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNum = 1;
-  getList();
-};
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields();
-  handleQuery();
-};
-
-/** 多选框选中数据 */
-const handleSelectionChange = (selection: QuestionsConfigVO[]) => {
-  ids.value = selection.map((item) => item.id);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-};
-
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = '添加题库配置';
-};
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: QuestionsConfigVO) => {
-  reset();
-  const _id = row?.id || ids.value[0];
-  const res = await getQuestionsConfig(_id);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改题库配置';
-};
-
-/** 提交按钮 */
-const submitForm = () => {
-  questionsConfigFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.id) {
-        await updateQuestionsConfig(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addQuestionsConfig(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
     }
   });
 };
 
-/** 删除按钮操作 */
+// 提交表单
-const handleDelete = async (row?: QuestionsConfigVO) => {
+const onSubmit = () => {
-  const _ids = row?.id || ids.value;
+  formRef.value?.validate(async (valid: boolean) => {
-  await proxy?.$modal.confirm('是否确认删除题库配置编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+    if (valid) {
-  await delQuestionsConfig(_ids);
+      buttonLoading.value = true;
-  proxy?.$modal.msgSuccess('删除成功');
+      try {
-  await getList();
+        await updateQuestionsConfig(form);
-};
+        // 显示成功消息（假设使用element-plus的message组件）
-
+        ElMessage.success('配置保存成功');
-/** 导出按钮操作 */
+        getDetail(); // 重新获取最新配置
-const handleExport = () => {
+      } catch (error) {
-  proxy?.download(
+        ElMessage.error('保存失败，请重试');
-    'safety/questionsConfig/export',
+      } finally {
-    {
+        buttonLoading.value = false;
-      ...queryParams.value
+      }
-    },
+    }
-    `questionsConfig_${new Date().getTime()}.xlsx`
+  });
-  );
 };
 
+// 页面加载时获取数据
 onMounted(() => {
-  getList();
+  getDetail();
 });
 </script>
+
+<style lang="scss" scoped>
+.container {
+  max-width: 800px;
+  margin: 0 auto;
+  padding-top: 20px;
+}
+
+.config-card {
+  border-radius: 12px;
+  overflow: hidden;
+}
+
+.card-header {
+  border-bottom: 1px solid #f0f0f0;
+  padding-bottom: 12px;
+}
+
+.form-item-col {
+  margin-bottom: 16px;
+}
+
+.form-actions {
+  padding: 16px;
+  border-top: 1px solid #f0f0f0;
+  margin-top: 20px;
+}
+
+// 输入框聚焦效果
+::v-deep .el-input__wrapper:focus-within {
+  box-shadow: 0 0 0 2px rgba(48, 163, 255, 0.2);
+}
+
+// 响应式调整
+@media (max-width: 768px) {
+  .el-col {
+    &:span-12 {
+      width: 100% !important;
+    }
+  }
+
+  .card-header {
+    text-align: center;
+  }
+}
+</style>

src/views/system/user/comm/editInfo.vue

@@ -192,12 +192,12 @@ async function handleDeptChange(value: number | string) {
   ];
 }
 
-const submitForm = () => {
+const submitForm = (cb) => {
   userFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
-      form.value.userId ? await api.updateUser(form.value) : await api.addUser(form.value);
+      // form.value.userId ? await api.updateUser(form.value) : await api.addUser(form.value);
-      proxy?.$modal.msgSuccess('操作成功');
+      // proxy?.$modal.msgSuccess('操作成功');
-      proxy?.$emit('submit', false);
+      cb();
     }
   });
 };
@@ -243,7 +243,7 @@ const getInfoForm = () => {
 onMounted(() => {
   getDeptTree();
 });
-defineExpose({ open, getInfoForm });
+defineExpose({ open, getInfoForm, submitForm });
 </script>
 <style lang="scss" scoped>
 .editInfo {

src/views/system/user/comm/roleInfo.vue

@@ -219,10 +219,22 @@ const removeProject = (projectId: number | string) => {
 // 提交表单
 const submitForm = async () => {
   // 整理项目角色数据
+  console.log(selectedProjects.value);
+
   if (selectedProjects.value.length == 0) {
     proxy?.$modal.msgWarning('请选择项目角色');
     return;
   }
+  let flag = false;
+  selectedProjects.value.forEach((project) => {
+    if (project.appRoles.length > 0 || project.webRoles.length > 0) {
+      flag = true;
+    }
+  });
+  if (!flag) {
+    proxy?.$modal.msgWarning('请选择项目角色');
+    return;
+  }
   form.value.projectRoles = selectedProjects.value.map((project) => ({
     projectId: project.id,
     roleIds: [...new Set(project.webRoles), ...new Set(project.appRoles)]

src/views/system/user/index.vue

@@ -154,15 +154,24 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog draggable ref="formDialogRef" style="background: rgb(249,250,251);" v-model="dialog.visible" :title="dialog.title" width="1300px" append-to-body @close="closeDialog">
+    <el-dialog
+      draggable
+      ref="formDialogRef"
+      style="background: rgb(249, 250, 251)"
+      v-model="dialog.visible"
+      :title="dialog.title"
+      width="1300px"
+      append-to-body
+      @close="closeDialog"
+    >
       <div class="boxDetial">
         <div class="tab_info">
           <div class="tab_item" @click="onTab(1)" :class="{ active: type == 1 }">
-            <Avatar style="width: 1em; height: 1em; margin-right: 8px" :style="{color: type == 1 ? '#1890ff' : '#000'}" />
+            <Avatar style="width: 1em; height: 1em; margin-right: 8px" :style="{ color: type == 1 ? '#1890ff' : '#000' }" />
             <span>基本资料</span>
           </div>
           <div class="tab_item" @click="onTab(2)" :class="{ active: type == 2 }">
-            <Key style="width: 1em; height: 1em; margin-right: 8px" :style="{color: type == 2 ? '#1890ff' : '#000'}" />
+            <Key style="width: 1em; height: 1em; margin-right: 8px" :style="{ color: type == 2 ? '#1890ff' : '#000' }" />
             <span>角色信息</span>
           </div>
         </div>
@@ -698,13 +707,20 @@ const uploadCert = async () => {
   proxy?.$modal.msgSuccess('上传证书目录成功');
 };
 const onTab = (val: number) => {
-  type.value = val;
   if (val == 2) {
-    let obj = editInfoRef.value?.getInfoForm();
+    // 查看基本信息
-    form.value = obj;
+    editInfoRef.value?.submitForm((res) => {
-    nextTick(() => {
+      type.value = val;
-      roleInfoRef.value?.open(form.value, deptIdRole.value);
+      let obj = editInfoRef.value?.getInfoForm();
+      form.value = obj;
+      console.log(obj);
+
+      nextTick(() => {
+        roleInfoRef.value?.open(form.value, deptIdRole.value);
+      });
     });
+  } else {
+    type.value = val;
   }
 };
 </script>

src/views/tender/bidd/index.vue

@@ -63,6 +63,8 @@
             <el-table-column prop="name" label="工程或费用名称" align="center" />
             <el-table-column prop="unit" label="单位" align="center" />
 
+            <el-table-column prop="supplier" label="供货单位" align="center" v-if="activeTab == '3'" />
+            <el-table-column prop="contractNumber" label="合同编号" align="center" v-if="activeTab == '3'" />
             <el-table-column prop="specification" label="规格" align="center" />
             <el-table-column prop="quantity" label="数量" align="center">
               <template #default="scope">

src/views/tender/plan/index.vue

@@ -23,22 +23,24 @@
               {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column prop="name" label="名称" />
+          <el-table-column prop="name" label="名称" align="center" />
-          <el-table-column prop="content" label="内容" />
+          <el-table-column prop="content" label="内容" align="center" />
-          <el-table-column prop="price" label="限价" />
+          <el-table-column prop="price" label="限价" align="center" />
-          <el-table-column prop="bidd">
+          <el-table-column prop="bidd" align="center">
             <template #header> <span style="color: red">*</span>招标文件 </template>
             <template #default="scope">
-              <el-button type="primary" link v-hasPermi="['tender:biddingPlan:getAnnex']" @click="biddView(scope.row)">查看文件</el-button>
+              <el-button type="primary" link v-hasPermi="['tender:biddingPlan:getAnnex']" @click="biddView(scope.row)" v-if="scope.row.annexCount > 0"
+                >查看文件({{ scope.row.annexCount }})</el-button
+              >
             </template>
           </el-table-column>
-          <el-table-column prop="winningBidder">
+          <el-table-column prop="winningBidder" align="center">
             <template #header> <span style="color: red">*</span>中标单位 </template>
             <template #default="scope">
               {{ scope.row.winningBidder }}
             </template>
           </el-table-column>
-          <el-table-column prop="bidFileName">
+          <el-table-column prop="bidFileName" align="center">
             <template #header> <span style="color: red">*</span>中标文件 </template>
             <template #default="scope">
               <el-button type="primary" link @click="openPdf(scope.row.bidFile)">{{ scope.row.bidFileName }} </el-button>