From dc839e3490c0a9769a518e42afc7285817a1abb3 Mon Sep 17 00:00:00 2001
From: 鲁班七号 <9159450+luban-71@user.noreply.gitee.com>
Date: 星期一, 04 三月 2024 23:52:43 +0800
Subject: [PATCH] 验收整改
---
.env.development | 4 +-
src/views/commonMod/examApply/index.vue | 29 +++++++++++---
package.json | 4 +-
src/views/commonMod/examApply/components/examApplyDialog.vue | 4 +-
src/views/notCoalMine/nCertificateList/index.vue | 20 ++++++---
5 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/.env.development b/.env.development
index cdae439..6d6134a 100644
--- a/.env.development
+++ b/.env.development
@@ -9,10 +9,10 @@
#VUE_APP_BASE_API = 'http://192.168.0.47:8085/api'
#张凤
-VUE_APP_BASE_API = 'http://192.168.0.70:8085/api'
+@VUE_APP_BASE_API = 'http://192.168.0.70:8085/api'
#线上
-#VUE_APP_BASE_API = 'http://121.239.169.30:8086/api'
+VUE_APP_BASE_API = 'http://121.239.169.30:8086/api'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/package.json b/package.json
index eccb0c5..076aa6c 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "ruoyi",
"version": "3.8.6",
"description": "新疆维吾尔自治区特种作业安全生产知识和管理能力考核系统",
- "author": "若依",
+ "author": "Little Ma",
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",
@@ -39,7 +39,7 @@
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.24.0",
"clipboard": "2.0.8",
- "core-js": "3.25.3",
+ "core-js": "^3.36.0",
"echarts": "5.4.0",
"element-ui": "2.15.13",
"file-saver": "2.0.5",
diff --git a/src/views/commonMod/examApply/components/examApplyDialog.vue b/src/views/commonMod/examApply/components/examApplyDialog.vue
index 290a5be..8c6addf 100644
--- a/src/views/commonMod/examApply/components/examApplyDialog.vue
+++ b/src/views/commonMod/examApply/components/examApplyDialog.vue
@@ -27,7 +27,7 @@
></el-option>
</el-select>
</el-form-item>
- <el-form-item label="考试点:" prop="siteId">
+ <el-form-item label="分配考试点:" prop="siteId">
<el-select v-model="form.siteId" placeholder="请选择考试点" style="width: 100%" :disabled="disable" @focus="getSites">
<el-option
v-for="item in siteOptions"
@@ -172,7 +172,7 @@
t.disable = false
}else{
if(type == 'edit'){
- t.title = '编辑'
+ t.title = '设定考试信息'
t.disable = false
}else{
t.title = '查看'
diff --git a/src/views/commonMod/examApply/index.vue b/src/views/commonMod/examApply/index.vue
index be2cf37..7e5194d 100644
--- a/src/views/commonMod/examApply/index.vue
+++ b/src/views/commonMod/examApply/index.vue
@@ -42,22 +42,22 @@
size="mini"
@click="openExamApply({},'add')"
v-hasPermi="['system:experts:add']"
- >新增考试计划</el-button>
+ >考试计划申请</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="dataList">
- <el-table-column label="序号" align="center" type="index"/>
+ <el-table-column label="归档序号" align="center" type="index"/>
<el-table-column label="机构名称" align="center" prop="institutionName" />
<el-table-column label="考试点名称" align="center" prop="siteName" />
<el-table-column label="考试批次全称" align="center" prop="examName" />
<el-table-column label="考试人数" align="center" prop="examNum" />
- <el-table-column label="计划正考时间" align="center">
+ <el-table-column label="正考时间安排" align="center">
<template #default="scope">
{{scope.row.examStartTime.substring(0,16) + '--' + scope.row.examEndTime.substring(0,16)}}
</template>
</el-table-column>
- <el-table-column label="计划补考时间" align="center">
+ <el-table-column label="补考时间安排" align="center">
<template #default="scope">
{{scope.row.resitStartTime.substring(0,16) + '--' + scope.row.resitEndTime.substring(0,16)}}
</template>
@@ -77,22 +77,34 @@
{{scope.row.siteContacts + '(' + scope.row.siteContactsPhone + ')'}}
</template>
</el-table-column>
- <el-table-column label="提交时间" align="center" prop="updateTime" />
+ <el-table-column label="申请提交时间" align="center" prop="updateTime" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
+ @click="alpop('机构暂未导入报名详单。')"
+ >报名详情</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-view"
+ @click="alpop('成绩信息暂未上传。')"
+ >成绩清单查询</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-view"
@click="openExamApply(scope.row,'view')"
- >查看详情</el-button>
+ >申请审批</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="openExamApply(scope.row,'edit')"
v-hasPermi="['system:experts:remove']"
- >编辑</el-button>
+ >信息设定分配</el-button>
<el-button
size="mini"
type="text"
@@ -231,6 +243,9 @@
},
openExamApply(data,type){
this.$refs.examApplyDialog.openDialog(data,type);
+ },
+ alpop(value){
+ alert(value)
}
}
};
diff --git a/src/views/notCoalMine/nCertificateList/index.vue b/src/views/notCoalMine/nCertificateList/index.vue
index 4bd47c9..1357b9d 100644
--- a/src/views/notCoalMine/nCertificateList/index.vue
+++ b/src/views/notCoalMine/nCertificateList/index.vue
@@ -18,7 +18,7 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">证书查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@@ -32,12 +32,12 @@
size="mini"
@click="getAsyncData"
v-hasPermi="['system:experts:add']"
- >同步数据</el-button>
+ >同步国家平台数据</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getPage"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="dataList">
- <el-table-column type="index" label="序号" width="55" align="center" />
+ <el-table-column type="index" label="归档序号" width="55" align="center" />
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="性别" align="center" prop="sex"/>
<el-table-column label="身份证号" align="center" prop="idcardNum">
@@ -51,8 +51,8 @@
<el-table-column label="资格类型" align="center" prop="personTypeName" />
<el-table-column label="作业类别" align="center" prop="jobTypeName" />
<el-table-column label="操作项目" align="center" prop="operItemName" />
- <el-table-column label="初领日期" align="center" prop="firstCertDate"/>
- <el-table-column label="发证日期" align="center" prop="createTime">
+ <el-table-column label="证书初申请" align="center" prop="firstCertDate"/>
+ <el-table-column label="证书发放" align="center" prop="createTime">
<template #default="scope">
{{scope.row.createTime.substring(0,7)}}
</template>
@@ -61,9 +61,15 @@
<el-table-column label="有效期到" align="center" prop="validEndDate"/>
<el-table-column label="复审期" align="center" prop="shouldReviewDate"/>
<!-- <el-table-column label="二次复审期" align="center" prop="operItemName"/>-->
-<!-- <el-table-column label="历史记录" align="center" prop="operItemName"/>-->
+ <el-table-column label="证书领取" align="center" > 机构代领 </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-check"
+ @click="openCert(scope.row,'view')"
+ >审核发证</el-button>
<el-button
size="mini"
type="text"
@@ -75,7 +81,7 @@
type="text"
icon="el-icon-edit"
@click="openSupplementary(scope.row,'view')"
- >证书补档</el-button>
+ >证书补打</el-button>
</template>
</el-table-column>
</el-table>
--
Gitblit v1.9.2