马宇豪
2023-09-07 ae138d1851770b46a7496f0bdf960f2b49c456d0
修改跳转
已重命名1个文件
已修改4个文件
已复制3个文件
已删除1个文件
360 ■■■■ 文件已修改
src/router/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/coalMine/cPeopleManage/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/coalMine/cTeacherManage/cReviewer/index.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/coalMine/cTeacherManage/cTeacher/index.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/coalMine/cTeacherManage/index.vue 148 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/login.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/notCoalMine/nPeopleManage/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/notCoalMine/nTeacherManage/nReviewer/index.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/notCoalMine/nTeacherManage/nTeacher/index.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js
@@ -64,7 +64,7 @@
  {
    path: '',
    component: Layout,
    redirect: '/notCoalMine/nPeopleManage',
    // redirect: '/notCoalMine/nPeopleManage/index',
    hidden: true,
    children: [
      // {
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"
src/views/coalMine/cTeacherManage/cReviewer/index.vue
文件名从 src/views/notCoalMine/nTeacherManage/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() {
src/views/coalMine/cTeacherManage/cTeacher/index.vue
copy from src/views/notCoalMine/nTeacherManage/index.vue copy to src/views/coalMine/cTeacherManage/cTeacher/index.vue
文件从 src/views/notCoalMine/nTeacherManage/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() {
src/views/coalMine/cTeacherManage/index.vue
文件已删除
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
    }
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>
src/views/notCoalMine/nTeacherManage/nReviewer/index.vue
copy from src/views/notCoalMine/nTeacherManage/index.vue copy to src/views/notCoalMine/nTeacherManage/nReviewer/index.vue
文件从 src/views/notCoalMine/nTeacherManage/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() {
src/views/notCoalMine/nTeacherManage/nTeacher/index.vue
copy from src/views/notCoalMine/nTeacherManage/index.vue copy to src/views/notCoalMine/nTeacherManage/nTeacher/index.vue
文件从 src/views/notCoalMine/nTeacherManage/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() {