From a1727c7ff318a1e9bcc48904a84a76aaa1fba92b Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 05 三月 2024 08:36:42 +0800
Subject: [PATCH] 修改跳转
---
src/views/cardPlatform/markCard/index.vue | 22 +++++++++++
src/views/coalMine/cViolationRegistration/index.vue | 41 ++++++++++++++++----
src/views/notCoalMine/nCertificateList/index.vue | 4 +-
3 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/src/views/cardPlatform/markCard/index.vue b/src/views/cardPlatform/markCard/index.vue
new file mode 100644
index 0000000..95d2b5a
--- /dev/null
+++ b/src/views/cardPlatform/markCard/index.vue
@@ -0,0 +1,22 @@
+<template>
+ <div class="app-container" style="width: 100%;height: calc(100vh - 84px)">
+ <iframe style="width: 100%;height: 100%" src="http://47.109.31.73:81/"></iframe>
+ </div>
+</template>
+
+<script>
+export default {
+ name: "cardPlatform",
+ dicts: [],
+ components: { },
+ data() {
+ return {}
+ },
+ created() {
+
+ },
+ methods: {
+
+ }
+};
+</script>
diff --git a/src/views/coalMine/cViolationRegistration/index.vue b/src/views/coalMine/cViolationRegistration/index.vue
index 8ac3806..74cff3d 100644
--- a/src/views/coalMine/cViolationRegistration/index.vue
+++ b/src/views/coalMine/cViolationRegistration/index.vue
@@ -68,16 +68,24 @@
<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']"
+ >核准</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"-->
-<!-- icon="el-icon-edit"-->
-<!-- @click="openViolation(scope.row,'edit')"-->
-<!-- v-hasPermi="['system:experts:remove']"-->
-<!-- >编辑</el-button>-->
<el-button
size="mini"
type="text"
@@ -105,6 +113,9 @@
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: [],
@@ -207,7 +218,21 @@
},
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/notCoalMine/nCertificateList/index.vue b/src/views/notCoalMine/nCertificateList/index.vue
index 4bd47c9..e981bf1 100644
--- a/src/views/notCoalMine/nCertificateList/index.vue
+++ b/src/views/notCoalMine/nCertificateList/index.vue
@@ -75,7 +75,7 @@
type="text"
icon="el-icon-edit"
@click="openSupplementary(scope.row,'view')"
- >证书补档</el-button>
+ >证书补打</el-button>
</template>
</el-table-column>
</el-table>
@@ -87,7 +87,7 @@
@pagination="getPage"
/>
<certificate-dialog ref="certificate" @getList="getPage"></certificate-dialog>
- <el-dialog title="证书补档" :visible.sync="supplementaryVisible" width="50%" append-to-body>
+ <el-dialog title="证书补打" :visible.sync="supplementaryVisible" width="50%" append-to-body>
<div style="display: flex;flex-direction: column;align-items: center">
<el-image
style="width: 100px; height: 100px"
--
Gitblit v1.9.2