Merge branch 'master' of http://42.193.1.25:9521/r/~qirong/qyksxt-admin

ZhangXianQiang

2024-05-28 2afa20426193868ab45e0357c428f85deb8ee564

Merge branch 'master' of http://42.193.1.25:9521/r/~qirong/qyksxt-admin

 src/router.js

@@ -494,13 +494,13 @@
        path: 'departmentExamine/list',
        component: () => import('@/views/user/departmentExamine/list'),
        name: 'departmentExamineList',
        meta: { title: '调动审核', noCache: true }
        meta: { title: '调动提审记录', noCache: true }
      },
      {
        path: 'UserConditionExamine/list',
        component: () => import('@/views/user/UserConditionExamine/list'),
        name: 'UserConditionExamineList',
        meta: { title: '状态审核', noCache: true }
        meta: { title: '状态提审记录', noCache: true }
      },
    ]
  },

 src/views/education/subject/edit.vue

@@ -2,14 +2,14 @@
  <div class="app-container">

    <el-form :model="form" ref="form" label-width="100px" v-loading="formLoading">
      <el-form-item label="课目：" required>
      <el-form-item label="所属部门：" prop="deptIds">
        <el-select v-model="form.deptIds" placeholder="所属部门" multiple filterable>
          <el-option v-for="item in depart" :key="item.id" :value="item.id" :label="item.name"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="课目名称：" required>
        <el-input v-model="form.name"></el-input>
      </el-form-item>
<!--      <el-form-item label="部门：" required>-->
<!--        <el-select  ref="departRef" v-model="form.level" placeholder="部门">-->
<!--          <el-option v-for="item in depart" :key="item.id" :value="item.id" :label="item.name"></el-option>-->
<!--        </el-select>-->
<!--      </el-form-item>-->
      <el-form-item>
        <el-button type="primary" @click="submitForm">提交</el-button>
        <el-button @click="resetForm">重置</el-button>
@@ -30,6 +30,7 @@
      form: {
        id: null,
        name: '',
        deptIds: [],
        level: null,
        levelName: ''
      },
@@ -57,7 +58,6 @@
    seachPageDepartMentList(){
      let that = this
      departmentApi.pageList(this.queryParam).then(res=>{
        console.log(res)
        if (res.code == 1){
          that.depart = res.response.list
        }

 src/views/education/subject/list.vue

@@ -16,8 +16,8 @@
    </el-form>

    <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
      <el-table-column prop="name" label="课目"/>
<!--      <el-table-column prop="levelName" label="部门" />-->
      <el-table-column prop="name" label="课目名称"/>
      <el-table-column prop="deptNames" label="所属部门" />
      <el-table-column width="220px" label="操作" align="center">
        <template slot-scope="{row}">
          <router-link :to="{path:'/education/subject/edit', query:{id:row.id}}" class="link-left">

 src/views/exam/paper/edit.vue

@@ -102,8 +102,8 @@
    </el-form>
    <el-dialog :visible.sync="questionPage.showDialog" width="70%">
      <el-form :model="questionPage.queryParam" ref="queryForm" :inline="true">
        <el-form-item label="ID：">
          <el-input v-model="questionPage.queryParam.id" clearable></el-input>
        <el-form-item label="题干：">
          <el-input v-model="questionPage.queryParam.titleContent" clearable></el-input>
        </el-form-item>
        <el-form-item label="题型：">
          <el-select v-model="questionPage.queryParam.questionType" clearable>
@@ -248,7 +248,7 @@
        multipleSelection: [],
        showDialog: false,
        queryParam: {
          id: null,
          titleContent: "",
          questionType: null,
          subjectId: 1,
          pageIndex: 1,

 src/views/exam/personalRandomTemplate/list.vue

@@ -25,7 +25,7 @@
      <el-button type="primary">添加</el-button>
    </router-link>
    <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
      <el-table-column prop="subjectId" label="课目" :formatter="subjectFormatter" width="120px" />
      <el-table-column prop="subjectNames" label="课目" width="120px" />
      <el-table-column prop="name" label="名称"  />
      <el-table-column  label="操作" align="center"  width="360px">
        <template slot-scope="{row}">

 src/views/exam/question/list.vue

@@ -39,7 +39,7 @@
              </el-select>
            </el-form-item>
            <el-form-item>
              <el-button type="primary" @click="exportQuestion">导出</el-button>
              <el-button type="primary" @click="exportQuestion" v-loading="exportLoading">导出</el-button>
            </el-form-item>
          </el-form>
          <el-button slot="reference" class="op-item" type="success">导出</el-button>
@@ -96,6 +96,7 @@
  components: { Pagination, QuestionShow },
  data () {
    return {
      exportLoading: false,
      subjectIdList: [],
      timeRange: [],
      exportForm: {
@@ -134,8 +135,10 @@
  methods: {
    // 导出题目
    exportQuestion () {
      this.exportLoading = true
      questionApi.exportQuestion(this.exportForm).then(res => {
        downloadExcel(res, '题目导出')
        this.exportLoading = false
      })
    },
    // 下载导入模板

 src/views/user/student/list.vue

@@ -39,7 +39,7 @@
          <el-tag :type="row.condition == '正常' || row.condition == null  ? 'success' : 'warning'">{{ row.condition ? row.condition : '正常' }}</el-tag>
        </template>
      </el-table-column>
      <el-table-column prop="sex" label="性别" width="60px;" :formatter="sexFormatter"/>
      <el-table-column prop="sex" label="性别" width="60px;" :formatter="sexFormatter" align="center"/>
      <el-table-column prop="phone" label="手机号" width="120"/>
      <el-table-column prop="createTime" label="创建时间" width="160px"/>
      <el-table-column label="状态" prop="status" width="70px">
@@ -60,7 +60,7 @@
          <router-link :to="{path:'/log/user/list', query:{userId:row.id}}" class="link-left">
            <el-button size="mini" >日志</el-button>
          </router-link>
          <el-button  size="mini" @click="status(row)" class="link-left">状态</el-button>
          <el-button type="primary" size="mini" @click="status(row)" class="link-left">状态</el-button>
          <el-button type="primary" size="mini" @click="transposition(row)" class="link-left">调动</el-button>
          <el-popconfirm title="确认删除吗" @confirm="deleteUser(row)">
            <el-button v-if="!deptAdmin()" slot="reference" size="mini" type="danger" class="link-left">删除</el-button>
@@ -197,6 +197,10 @@
      })
    },
    transposition(item) {
      if (item.conditionExamineResult) {
        this.$message.warning("该用户状态待审核");
        return
      }
      this.examine.userId = item.id
      this.examine.departmentId = item.deptIdList
      this.examine.nowDepartmentIds = item.deptIdList.join(',')
@@ -210,6 +214,10 @@
      })
    },
    status(user) {
      if (user.conditionExamineResult) {
        this.$message.warning("该用户状态待审核");
        return
      }
      this.statusVisible = true;
      this.conditionExamine.sourceCondition = user.condition ? user.condition : '0';
      this.conditionExamine.userId = user.id