From ae138d1851770b46a7496f0bdf960f2b49c456d0 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 07 九月 2023 16:19:29 +0800
Subject: [PATCH] 修改跳转
---
src/views/coalMine/cTeacherManage/cReviewer/index.vue | 48 ++-----
/dev/null | 148 ------------------------
src/views/login.vue | 2
src/views/notCoalMine/nTeacherManage/nReviewer/index.vue | 48 ++-----
src/views/notCoalMine/nTeacherManage/nTeacher/index.vue | 48 ++-----
src/views/notCoalMine/nPeopleManage/index.vue | 8 -
src/router/index.js | 2
src/views/coalMine/cPeopleManage/index.vue | 8 -
src/views/coalMine/cTeacherManage/cTeacher/index.vue | 48 ++-----
9 files changed, 66 insertions(+), 294 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 78fb171..a1c7386 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -64,7 +64,7 @@
{
path: '',
component: Layout,
- redirect: '/notCoalMine/nPeopleManage',
+ // redirect: '/notCoalMine/nPeopleManage/index',
hidden: true,
children: [
// {
diff --git a/src/views/coalMine/cPeopleManage/index.vue b/src/views/coalMine/cPeopleManage/index.vue
index 5b2a90f..b80b393 100644
--- a/src/views/coalMine/cPeopleManage/index.vue
+++ b/src/views/coalMine/cPeopleManage/index.vue
@@ -35,14 +35,6 @@
<el-button
type="primary"
plain
- icon="el-icon-refresh"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:experts:add']"
- >同步数据</el-button>
- <el-button
- type="primary"
- plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
diff --git a/src/views/notCoalMine/nTeacherManage/index.vue b/src/views/coalMine/cTeacherManage/cReviewer/index.vue
similarity index 69%
rename from src/views/notCoalMine/nTeacherManage/index.vue
rename to src/views/coalMine/cTeacherManage/cReviewer/index.vue
index 3b8dcca..ec5a418 100644
--- a/src/views/notCoalMine/nTeacherManage/index.vue
+++ b/src/views/coalMine/cTeacherManage/cReviewer/index.vue
@@ -17,13 +17,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="作业类型">
- <el-cascader
- v-model="classiFy"
- :options="expertTypes"
- :props="{ expandTrigger: 'hover', value: 'id',label: 'label'}"
- @change="handleChange"></el-cascader>
- </el-form-item>
<el-form-item>
<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>
@@ -32,14 +25,6 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-refresh"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:experts:add']"
- >同步数据</el-button>
<el-button
type="primary"
plain
@@ -56,15 +41,14 @@
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="性别" align="center" prop="name" />
<el-table-column label="身份证号" align="center" prop="name" />
- <el-table-column label="电话" align="center" prop="phone"/>
- <el-table-column label="民族" align="center" prop="phone"/>
- <el-table-column label="所属单位" align="center" prop="phone"/>
<el-table-column label="最高学历" align="center" prop="degree" />
- <el-table-column label="资格类型" align="center" prop="job" />
- <el-table-column label="作业证书" align="center" prop="speciality" />
- <el-table-column label="关联作业次数" align="center"/>
- <el-table-column label="违章次数" align="center"/>
- <el-table-column label="证件照片" align="center"/>
+ <el-table-column label="职称" align="center" prop="job" />
+ <el-table-column label="资质" align="center" prop="speciality" />
+ <el-table-column label="资质有效期" align="center"/>
+ <el-table-column label="描述" align="center"/>
+ <el-table-column label="证件照" align="center"/>
+ <el-table-column label="状态" align="center"/>
+ <el-table-column label="工种详情" align="center"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
@@ -78,14 +62,14 @@
type="text"
icon="el-icon-view"
@click="handleView(scope.row)"
- >查看</el-button>
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-delete"-->
-<!-- @click="handleDelete(scope.row)"-->
-<!-- v-hasPermi="['system:experts:remove']"-->
-<!-- >删除</el-button>-->
+ >停用</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:experts:remove']"
+ >删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -101,7 +85,7 @@
<script>
export default {
- name: "nTeacherManage",
+ name: "cTeacherManage",
dicts: [],
components: {},
data() {
diff --git a/src/views/notCoalMine/nTeacherManage/index.vue b/src/views/coalMine/cTeacherManage/cTeacher/index.vue
similarity index 69%
copy from src/views/notCoalMine/nTeacherManage/index.vue
copy to src/views/coalMine/cTeacherManage/cTeacher/index.vue
index 3b8dcca..ec5a418 100644
--- a/src/views/notCoalMine/nTeacherManage/index.vue
+++ b/src/views/coalMine/cTeacherManage/cTeacher/index.vue
@@ -17,13 +17,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="作业类型">
- <el-cascader
- v-model="classiFy"
- :options="expertTypes"
- :props="{ expandTrigger: 'hover', value: 'id',label: 'label'}"
- @change="handleChange"></el-cascader>
- </el-form-item>
<el-form-item>
<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>
@@ -32,14 +25,6 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-refresh"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:experts:add']"
- >同步数据</el-button>
<el-button
type="primary"
plain
@@ -56,15 +41,14 @@
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="性别" align="center" prop="name" />
<el-table-column label="身份证号" align="center" prop="name" />
- <el-table-column label="电话" align="center" prop="phone"/>
- <el-table-column label="民族" align="center" prop="phone"/>
- <el-table-column label="所属单位" align="center" prop="phone"/>
<el-table-column label="最高学历" align="center" prop="degree" />
- <el-table-column label="资格类型" align="center" prop="job" />
- <el-table-column label="作业证书" align="center" prop="speciality" />
- <el-table-column label="关联作业次数" align="center"/>
- <el-table-column label="违章次数" align="center"/>
- <el-table-column label="证件照片" align="center"/>
+ <el-table-column label="职称" align="center" prop="job" />
+ <el-table-column label="资质" align="center" prop="speciality" />
+ <el-table-column label="资质有效期" align="center"/>
+ <el-table-column label="描述" align="center"/>
+ <el-table-column label="证件照" align="center"/>
+ <el-table-column label="状态" align="center"/>
+ <el-table-column label="工种详情" align="center"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
@@ -78,14 +62,14 @@
type="text"
icon="el-icon-view"
@click="handleView(scope.row)"
- >查看</el-button>
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-delete"-->
-<!-- @click="handleDelete(scope.row)"-->
-<!-- v-hasPermi="['system:experts:remove']"-->
-<!-- >删除</el-button>-->
+ >停用</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:experts:remove']"
+ >删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -101,7 +85,7 @@
<script>
export default {
- name: "nTeacherManage",
+ name: "cTeacherManage",
dicts: [],
components: {},
data() {
diff --git a/src/views/coalMine/cTeacherManage/index.vue b/src/views/coalMine/cTeacherManage/index.vue
deleted file mode 100644
index 46b7ba8..0000000
--- a/src/views/coalMine/cTeacherManage/index.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="用户姓名" prop="userName">
- <el-input
- v-model="queryParams.userName"
- placeholder="请输入用户姓名"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="身份证号" prop="idCard">
- <el-input
- v-model="queryParams.idCard"
- placeholder="请输入身份证号"
- clearable
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="作业类型">
- <el-cascader
- v-model="classiFy"
- :options="expertTypes"
- :props="{ expandTrigger: 'hover', value: 'id',label: 'label'}"
- @change="handleChange"></el-cascader>
- </el-form-item>
- <el-form-item>
- <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>
-
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-refresh"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:experts:add']"
- >同步数据</el-button>
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:experts:add']"
- >新增</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
- <el-table v-loading="loading" :data="expertList">
- <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="name" />
- <el-table-column label="身份证号" align="center" prop="name" />
- <el-table-column label="电话" align="center" prop="phone"/>
- <el-table-column label="民族" align="center" prop="phone"/>
- <el-table-column label="所属单位" align="center" prop="phone"/>
- <el-table-column label="最高学历" align="center" prop="degree" />
- <el-table-column label="资格类型" align="center" prop="job" />
- <el-table-column label="作业证书" align="center" prop="speciality" />
- <el-table-column label="关联作业次数" align="center"/>
- <el-table-column label="违章次数" align="center"/>
- <el-table-column label="证件照片" align="center"/>
- <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"
- @click="handleUpdate(scope.row)"
- >编辑</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-view"
- @click="handleView(scope.row)"
- >查看</el-button>
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-delete"-->
-<!-- @click="handleDelete(scope.row)"-->
-<!-- v-hasPermi="['system:experts:remove']"-->
-<!-- >删除</el-button>-->
- </template>
- </el-table-column>
- </el-table>
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageIndex"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
- </div>
-</template>
-
-<script>
-export default {
- name: "cTeacherManage",
- dicts: [],
- components: {},
- data() {
- return {
- loading: false,
- single: true,
- multiple: true,
- showSearch: true,
- addForm: false,
- total: 0,
- expertTypes: [],
- expertList: [],
- queryParams: {},
- classiFy: [],
- form: {},
- rules: {
- classifyName: [
- { required: true, message: "分类名称不能为空", trigger: "blur" }
- ]
- }
- };
- },
- created() {
-
- },
- methods: {
- getList(){
-
- },
- handleChange(){
-
- },
- handleQuery(){
-
- },
- resetQuery(){
-
- },
- handleAdd(){
-
- }
- }
-};
-</script>
diff --git a/src/views/login.vue b/src/views/login.vue
index 7bfcdc4..d2cec1d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -99,7 +99,7 @@
$route: {
handler: function(route) {
// this.redirect = route.query && route.query.redirect;
- this.redirect = '/notCoalMine/nPeopleManage/index'
+ this.redirect = '/notCoalMine/nPeopleManage'
},
immediate: true
}
diff --git a/src/views/notCoalMine/nPeopleManage/index.vue b/src/views/notCoalMine/nPeopleManage/index.vue
index 6a79032..5fff864 100644
--- a/src/views/notCoalMine/nPeopleManage/index.vue
+++ b/src/views/notCoalMine/nPeopleManage/index.vue
@@ -40,14 +40,6 @@
@click="handleAdd"
v-hasPermi="['system:experts:add']"
>同步数据</el-button>
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:experts:add']"
- >新增</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
diff --git a/src/views/notCoalMine/nTeacherManage/index.vue b/src/views/notCoalMine/nTeacherManage/nReviewer/index.vue
similarity index 69%
copy from src/views/notCoalMine/nTeacherManage/index.vue
copy to src/views/notCoalMine/nTeacherManage/nReviewer/index.vue
index 3b8dcca..ec5a418 100644
--- a/src/views/notCoalMine/nTeacherManage/index.vue
+++ b/src/views/notCoalMine/nTeacherManage/nReviewer/index.vue
@@ -17,13 +17,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="作业类型">
- <el-cascader
- v-model="classiFy"
- :options="expertTypes"
- :props="{ expandTrigger: 'hover', value: 'id',label: 'label'}"
- @change="handleChange"></el-cascader>
- </el-form-item>
<el-form-item>
<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>
@@ -32,14 +25,6 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-refresh"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:experts:add']"
- >同步数据</el-button>
<el-button
type="primary"
plain
@@ -56,15 +41,14 @@
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="性别" align="center" prop="name" />
<el-table-column label="身份证号" align="center" prop="name" />
- <el-table-column label="电话" align="center" prop="phone"/>
- <el-table-column label="民族" align="center" prop="phone"/>
- <el-table-column label="所属单位" align="center" prop="phone"/>
<el-table-column label="最高学历" align="center" prop="degree" />
- <el-table-column label="资格类型" align="center" prop="job" />
- <el-table-column label="作业证书" align="center" prop="speciality" />
- <el-table-column label="关联作业次数" align="center"/>
- <el-table-column label="违章次数" align="center"/>
- <el-table-column label="证件照片" align="center"/>
+ <el-table-column label="职称" align="center" prop="job" />
+ <el-table-column label="资质" align="center" prop="speciality" />
+ <el-table-column label="资质有效期" align="center"/>
+ <el-table-column label="描述" align="center"/>
+ <el-table-column label="证件照" align="center"/>
+ <el-table-column label="状态" align="center"/>
+ <el-table-column label="工种详情" align="center"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
@@ -78,14 +62,14 @@
type="text"
icon="el-icon-view"
@click="handleView(scope.row)"
- >查看</el-button>
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-delete"-->
-<!-- @click="handleDelete(scope.row)"-->
-<!-- v-hasPermi="['system:experts:remove']"-->
-<!-- >删除</el-button>-->
+ >停用</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:experts:remove']"
+ >删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -101,7 +85,7 @@
<script>
export default {
- name: "nTeacherManage",
+ name: "cTeacherManage",
dicts: [],
components: {},
data() {
diff --git a/src/views/notCoalMine/nTeacherManage/index.vue b/src/views/notCoalMine/nTeacherManage/nTeacher/index.vue
similarity index 69%
copy from src/views/notCoalMine/nTeacherManage/index.vue
copy to src/views/notCoalMine/nTeacherManage/nTeacher/index.vue
index 3b8dcca..ec5a418 100644
--- a/src/views/notCoalMine/nTeacherManage/index.vue
+++ b/src/views/notCoalMine/nTeacherManage/nTeacher/index.vue
@@ -17,13 +17,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="作业类型">
- <el-cascader
- v-model="classiFy"
- :options="expertTypes"
- :props="{ expandTrigger: 'hover', value: 'id',label: 'label'}"
- @change="handleChange"></el-cascader>
- </el-form-item>
<el-form-item>
<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>
@@ -32,14 +25,6 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-refresh"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:experts:add']"
- >同步数据</el-button>
<el-button
type="primary"
plain
@@ -56,15 +41,14 @@
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="性别" align="center" prop="name" />
<el-table-column label="身份证号" align="center" prop="name" />
- <el-table-column label="电话" align="center" prop="phone"/>
- <el-table-column label="民族" align="center" prop="phone"/>
- <el-table-column label="所属单位" align="center" prop="phone"/>
<el-table-column label="最高学历" align="center" prop="degree" />
- <el-table-column label="资格类型" align="center" prop="job" />
- <el-table-column label="作业证书" align="center" prop="speciality" />
- <el-table-column label="关联作业次数" align="center"/>
- <el-table-column label="违章次数" align="center"/>
- <el-table-column label="证件照片" align="center"/>
+ <el-table-column label="职称" align="center" prop="job" />
+ <el-table-column label="资质" align="center" prop="speciality" />
+ <el-table-column label="资质有效期" align="center"/>
+ <el-table-column label="描述" align="center"/>
+ <el-table-column label="证件照" align="center"/>
+ <el-table-column label="状态" align="center"/>
+ <el-table-column label="工种详情" align="center"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
@@ -78,14 +62,14 @@
type="text"
icon="el-icon-view"
@click="handleView(scope.row)"
- >查看</el-button>
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-delete"-->
-<!-- @click="handleDelete(scope.row)"-->
-<!-- v-hasPermi="['system:experts:remove']"-->
-<!-- >删除</el-button>-->
+ >停用</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:experts:remove']"
+ >删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -101,7 +85,7 @@
<script>
export default {
- name: "nTeacherManage",
+ name: "cTeacherManage",
dicts: [],
components: {},
data() {
--
Gitblit v1.9.2