From a7a1a10bcda202b3e2aef9dd0ab176cc7ff70359 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 05 三月 2024 13:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
.env.development | 2
src/views/commonMod/examApply/index.vue | 2
src/views/notCoalMine/nViolationRegistration/components/violationDialog.vue | 14 ++++
.env.production | 2
src/views/notCoalMine/nBatchManage/index.vue | 2
src/views/coalMine/cViolationRegistration/index.vue | 60 ++++++++++----------
src/views/notCoalMine/nViolationRegistration/index.vue | 45 +++++++++++---
7 files changed, 81 insertions(+), 46 deletions(-)
diff --git a/.env.development b/.env.development
index 6d6134a..9cad27f 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 特种作业考核系统
+VUE_APP_TITLE = 安全生产考试管理
# 开发环境配置
ENV = 'development'
diff --git a/.env.production b/.env.production
index d56ef8c..3b94372 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
# 页面标题
-VUE_APP_TITLE = 特种作业考核系统
+VUE_APP_TITLE = 安全生产考试管理
# 生产环境配置
ENV = 'production'
diff --git a/src/views/coalMine/cViolationRegistration/index.vue b/src/views/coalMine/cViolationRegistration/index.vue
index 1f046f4..e6a78ee 100644
--- a/src/views/coalMine/cViolationRegistration/index.vue
+++ b/src/views/coalMine/cViolationRegistration/index.vue
@@ -55,7 +55,7 @@
size="mini"
@click="openViolation({},'add')"
v-hasPermi="['system:experts:add']"
- >新增填报</el-button>
+ >新增处罚登记</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -73,30 +73,30 @@
<el-table-column label="作业种类" align="center" prop="jobCategory"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
+
<el-button
size="mini"
type="text"
icon="el-icon-edit"
- style="color: #f56c6c"
- @click="openCancle(scope.row,'edit')"
- v-hasPermi="['system:experts:remove']"
- >撤销</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="openCheck(scope.row,'edit')"
- v-hasPermi="['system:experts:remove']"
+ @click="open('核准')"
>核准</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="open('撤销')"
+ >撤销</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="openViolation(scope.row,'view')"
- >查看违规详情</el-button>
+ >查看详情</el-button>
+
<el-button
size="mini"
type="text"
+ style="color: red;"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:experts:remove']"
@@ -121,9 +121,6 @@
import {delViolation, getViolationPage} from "@/api/coalMine/violation";
import {getOperatePage} from "@/api/coalMine/operateType";
import {delPeople} from "@/api/coalMine/people";
-import {MessageBox} from "element-ui";
-import store from "@/store";
-import {isRelogin} from "@/utils/request";
export default {
name: "cViolationRegistration",
dicts: [],
@@ -185,6 +182,23 @@
handleChange(){
},
+ open(val) {
+ this.$confirm('确认'+val+'该项处罚?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.$message({
+ type: 'success',
+ message: val+'成功!'
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消'+val
+ });
+ });
+ },
handleDelete(row){
this.$confirm('此操作将永久删除该条数据, 是否继续?', '提示', {
confirmButtonText: '确定',
@@ -226,21 +240,7 @@
},
openViolation(data,type){
this.$refs.violationDialog.openDialog(data,type);
- },
- openCancle(data,type){
- MessageBox.confirm('撤销登记信息，是否继续？', '系统提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
- this.$message.success('撤销成功')
- }).catch(() => {
- console.log('取消')
- });
- },
- openCheck(data,type){
- MessageBox.confirm('核准登记信息，是否继续？', '系统提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
- this.$message.success('核准成功')
- }).catch(() => {
- console.log('取消')
- });
- },
+ }
}
};
</script>
diff --git a/src/views/commonMod/examApply/index.vue b/src/views/commonMod/examApply/index.vue
index 7e5194d..6cc345d 100644
--- a/src/views/commonMod/examApply/index.vue
+++ b/src/views/commonMod/examApply/index.vue
@@ -77,7 +77,7 @@
{{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
diff --git a/src/views/notCoalMine/nBatchManage/index.vue b/src/views/notCoalMine/nBatchManage/index.vue
index 2ded24a..e9ef221 100644
--- a/src/views/notCoalMine/nBatchManage/index.vue
+++ b/src/views/notCoalMine/nBatchManage/index.vue
@@ -132,7 +132,7 @@
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>
diff --git a/src/views/notCoalMine/nViolationRegistration/components/violationDialog.vue b/src/views/notCoalMine/nViolationRegistration/components/violationDialog.vue
index 686f76b..a1f572f 100644
--- a/src/views/notCoalMine/nViolationRegistration/components/violationDialog.vue
+++ b/src/views/notCoalMine/nViolationRegistration/components/violationDialog.vue
@@ -13,6 +13,14 @@
<el-form-item label="身份证号:" prop="idCard">
<el-input v-model.trim="form.idCard" :readonly="disable"/>
</el-form-item>
+ <el-form-item label="处罚人员类别:">
+ <el-radio-group v-model="radio">
+ <el-radio :label="1">学员</el-radio>
+ <el-radio :label="2">培训机构</el-radio>
+ <el-radio :label="3">考点</el-radio>
+ <el-radio :label="4">监考老师</el-radio>
+ </el-radio-group>
+ </el-form-item>
<el-form-item label="IC卡编号:" prop="icNum">
<el-input v-model.trim="form.icNum" :readonly="disable"/>
</el-form-item>
@@ -58,7 +66,10 @@
<i class="el-icon-plus"></i>
</el-upload>
</el-form-item>
- <el-form-item label="违章描述:" prop="remark">
+ <el-form-item label="违章描述与处罚情况:" prop="remark">
+ <el-input type="textarea" v-model.trim="form.remark" :readonly="disable"/>
+ </el-form-item>
+ <el-form-item label="核准建议:" prop="remark">
<el-input type="textarea" v-model.trim="form.remark" :readonly="disable"/>
</el-form-item>
</el-form>
@@ -104,6 +115,7 @@
return {
disable: false,
title: '新增填报',
+ radio: 1,
open: false,
form:{
id: null,
diff --git a/src/views/notCoalMine/nViolationRegistration/index.vue b/src/views/notCoalMine/nViolationRegistration/index.vue
index 3c5de80..594d92c 100644
--- a/src/views/notCoalMine/nViolationRegistration/index.vue
+++ b/src/views/notCoalMine/nViolationRegistration/index.vue
@@ -47,7 +47,7 @@
size="mini"
@click="openViolation({},'add')"
v-hasPermi="['system:experts:add']"
- >新增填报</el-button>
+ >处罚记录填报</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -68,19 +68,25 @@
<el-button
size="mini"
type="text"
- icon="el-icon-view"
- @click="openViolation(scope.row,'view')"
- >查看违规详情</el-button>
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-edit"-->
-<!-- @click="openViolation(scope.row,'edit')"-->
-<!-- v-hasPermi="['system:experts:remove']"-->
-<!-- >编辑</el-button>-->
+ icon="el-icon-edit"
+ @click="open('核准')"
+ >核准</el-button>
<el-button
size="mini"
type="text"
+ icon="el-icon-edit"
+ @click="open('撤销')"
+ >撤销</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-view"
+ @click="openViolation(scope.row,'view')"
+ >查看详情</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ style="color: red;"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:experts:remove']"
@@ -135,6 +141,23 @@
this.getTypeList()
},
methods: {
+ open(val) {
+ this.$confirm('确认'+val+'该项处罚?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.$message({
+ type: 'success',
+ message: val+'成功!'
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消'+val
+ });
+ });
+ },
async getList(){
const t = this
t.loading = true
--
Gitblit v1.9.2