Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/InfoReview.vue

@@ -100,7 +100,7 @@
           <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
           <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="测试项目" align="center" prop="project" min-width="100" max-width="120"/>
+      <el-table-column label="报考岗位" align="center" prop="project" min-width="100" max-width="120"/>
       <el-table-column
       <el-table-column
         label="操作" align="center"
         label="操作" align="center"
         class-name="small-padding fixed-width"
         class-name="small-padding fixed-width"
@@ -189,7 +189,7 @@
             ></el-image>
             ></el-image>
           </div>
           </div>
           <el-descriptions border>
           <el-descriptions border>
-            <el-descriptions-item label="测试项目">{{ form.project }}</el-descriptions-item>
+            <el-descriptions-item label="报考岗位">{{ form.project }}</el-descriptions-item>
             <el-descriptions-item label="联系方式1">{{ form.telephone1 }}</el-descriptions-item>
             <el-descriptions-item label="联系方式1">{{ form.telephone1 }}</el-descriptions-item>
             <el-descriptions-item label="联系方式2">{{ form.telephone2 }}</el-descriptions-item>
             <el-descriptions-item label="联系方式2">{{ form.telephone2 }}</el-descriptions-item>
             <el-descriptions-item label="民族">{{ form.mz }}</el-descriptions-item>
             <el-descriptions-item label="民族">{{ form.mz }}</el-descriptions-item>

ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/examInfo.vue

@@ -59,22 +59,22 @@
         <el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择考试结束时间">
         <el-date-picker clearable v-model="form.endTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择考试结束时间">
         </el-date-picker>
         </el-date-picker>
       </el-form-item> -->
       </el-form-item> -->
-        <el-form-item label="测试项目" prop="projectName" v-if="!isHandle">
+        <el-form-item label="报考岗位" prop="projectName" v-if="!isHandle">
           <!-- <el-select v-model="form.projectIdList" multiple placeholder="请选择测试项目" style="width: 100%"
           <!-- <el-select v-model="form.projectIdList" multiple placeholder="请选择测试项目" style="width: 100%"
               :disabled="isHandle">
               :disabled="isHandle">
               <el-option v-for="item in projectList" :key="item.id" :label="item.project"
               <el-option v-for="item in projectList" :key="item.id" :label="item.project"
                   :value="item.id"></el-option>
                   :value="item.id"></el-option>
           </el-select> -->
           </el-select> -->
-          <el-input v-model="form.projectName" placeholder="请选择测试项目" @click.native="selectProjectList"/>
+          <el-input v-model="form.projectName" placeholder="请选择报考岗位" @click.native="selectProjectList"/>
 
 
         </el-form-item>
         </el-form-item>
-        <el-form-item label="测试项目" prop="projectName" v-if="isHandle">
+        <el-form-item label="报考岗位" prop="projectName" v-if="isHandle">
           <!-- <el-select v-model="form.projectIdList" multiple placeholder="请选择测试项目" style="width: 100%"
           <!-- <el-select v-model="form.projectIdList" multiple placeholder="请选择测试项目" style="width: 100%"
           :disabled="isHandle">
           :disabled="isHandle">
           <el-option v-for="item in projectList" :key="item.id" :label="item.project"
           <el-option v-for="item in projectList" :key="item.id" :label="item.project"
               :value="item.id"></el-option>
               :value="item.id"></el-option>
       </el-select> -->
       </el-select> -->
-          <el-input v-model="form.projectName" placeholder="请选择测试项目" readOnly/>
+          <el-input v-model="form.projectName" placeholder="请选择报考岗位" readOnly/>
 
 
         </el-form-item>
         </el-form-item>
         <!-- <el-form-item label="考试安排" prop="examArrange">
         <!-- <el-form-item label="考试安排" prop="examArrange">
@@ -101,7 +101,7 @@
         </div>
         </div>
       </el-form>
       </el-form>
 
 
-      <el-dialog title="测试项目" :visible.sync="openSelect" width="800px" append-to-body @close="DialogClose">
+      <el-dialog title="报考岗位" :visible.sync="openSelect" width="800px" append-to-body @close="DialogClose">
         <el-table ref="examInfo-table-project" key="b" @row-click="rowClick" size="small" height="400px"
         <el-table ref="examInfo-table-project" key="b" @row-click="rowClick" size="small" height="400px"
                   :data="projectList" @selection-change="handleSelectionChange" :row-key="getRowId">
                   :data="projectList" @selection-change="handleSelectionChange" :row-key="getRowId">
           <el-table-column type="selection" width="55" reserve-selection align="center"/>
           <el-table-column type="selection" width="55" reserve-selection align="center"/>
@@ -177,7 +177,7 @@ export default {
           {required: true, message: "结束时间不能为空", trigger: "blur"}
           {required: true, message: "结束时间不能为空", trigger: "blur"}
         ],
         ],
         type: [
         type: [
-          {required: true, message: "测试项目不能为空", trigger: "blur"}
+          {required: true, message: "报考岗位不能为空", trigger: "blur"}
         ],
         ],
         examArrange: [
         examArrange: [
           {required: true, message: "考试安排不能为空", trigger: "blur"}
           {required: true, message: "考试安排不能为空", trigger: "blur"}
@@ -186,7 +186,7 @@ export default {
           {required: true, message: "考试注意事项不能为空", trigger: "blur"}
           {required: true, message: "考试注意事项不能为空", trigger: "blur"}
         ],
         ],
         projectName: [
         projectName: [
-          {required: true, message: "测试项目不能为空", trigger: "blur"}
+          {required: true, message: "报考岗位不能为空", trigger: "blur"}
         ],
         ],
       }
       }
     };
     };

ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/examRoomAllocate.vue

@@ -9,8 +9,8 @@
         <el-input v-model="queryParams.idCard" placeholder="请输入身份证号码" clearable
         <el-input v-model="queryParams.idCard" placeholder="请输入身份证号码" clearable
                   @keyup.enter.native="handleQuery"/>
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
       </el-form-item>
-      <el-form-item label="测试项目" prop="project">
-        <el-input v-model="queryParams.project" placeholder="请输入测试项目" clearable
+      <el-form-item label="报考岗位" prop="project">
+        <el-input v-model="queryParams.project" placeholder="请输入报考岗位" clearable
                   @keyup.enter.native="handleQuery"/>
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
@@ -56,7 +56,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="身份证号码" align="center" prop="idCard" min-width="180"/>
       <el-table-column label="身份证号码" align="center" prop="idCard" min-width="180"/>
       <el-table-column label="姓名" align="center" min-width="88" prop="studentName"/>
       <el-table-column label="姓名" align="center" min-width="88" prop="studentName"/>
-      <el-table-column label="测试项目"  prop="project" min-width="100">
+      <el-table-column label="报考岗位"  prop="project" min-width="100">
       </el-table-column>
       </el-table-column>
       <el-table-column label="性别" align="center" prop="sex" min-width="80">
       <el-table-column label="性别" align="center" prop="sex" min-width="80">
         <template slot-scope="scope">
         <template slot-scope="scope">
@@ -101,7 +101,7 @@
                 <el-descriptions-item label="性别">
                 <el-descriptions-item label="性别">
                   <dict-tag :options="dict.type.sys_user_sex" :value="form.sex"/>
                   <dict-tag :options="dict.type.sys_user_sex" :value="form.sex"/>
                 </el-descriptions-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="测试项目">{{ form.project }}</el-descriptions-item>
+                <el-descriptions-item label="报考岗位">{{ form.project }}</el-descriptions-item>
                 <el-descriptions-item label="联系方式1">{{ form.telephone1 }}</el-descriptions-item>
                 <el-descriptions-item label="联系方式1">{{ form.telephone1 }}</el-descriptions-item>
                 <el-descriptions-item label="联系方式2">{{ form.telephone2 }}</el-descriptions-item>
                 <el-descriptions-item label="联系方式2">{{ form.telephone2 }}</el-descriptions-item>
               </el-descriptions>
               </el-descriptions>

ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/scoreManage.vue

@@ -9,8 +9,8 @@
         <el-input v-model="queryParams.idCard" placeholder="请输入身份证号码" clearable
         <el-input v-model="queryParams.idCard" placeholder="请输入身份证号码" clearable
                   @keyup.enter.native="handleQuery"/>
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
       </el-form-item>
-      <el-form-item label="测试项目" prop="project">
-        <el-input v-model="queryParams.project" placeholder="请输入测试项目" clearable
+      <el-form-item label="报考岗位" prop="project">
+        <el-input v-model="queryParams.project" placeholder="请输入报考岗位" clearable
                   @keyup.enter.native="handleQuery"/>
                   @keyup.enter.native="handleQuery"/>
 
 
         <!-- <el-select v-model="form.projectIdList" style="width: 100%" placeholder="请选择测试项目">
         <!-- <el-select v-model="form.projectIdList" style="width: 100%" placeholder="请选择测试项目">
@@ -61,7 +61,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="身份证号码" align="center" prop="idCard" width="165"/>
       <el-table-column label="身份证号码" align="center" prop="idCard" width="165"/>
       <el-table-column label="姓名" align="center" prop="studentName" min-width="80" max-width="120"/>
       <el-table-column label="姓名" align="center" prop="studentName" min-width="80" max-width="120"/>
-      <el-table-column label="测试项目"  prop="project" width="80">
+      <el-table-column label="报考岗位"  prop="project" width="80">
         <!-- <template slot-scope="scope">
         <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.professional_category" :value="scope.row.sex" />
           <dict-tag :options="dict.type.professional_category" :value="scope.row.sex" />
         </template> -->
         </template> -->
@@ -111,7 +111,7 @@
                 <el-descriptions-item label="性别">
                 <el-descriptions-item label="性别">
                   <dict-tag :options="dict.type.sys_user_sex" :value="form.sex"/>
                   <dict-tag :options="dict.type.sys_user_sex" :value="form.sex"/>
                 </el-descriptions-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="测试项目">{{ form.project }}</el-descriptions-item>
+                <el-descriptions-item label="报考岗位">{{ form.project }}</el-descriptions-item>
                 <el-descriptions-item label="联系方式1">{{ form.telephone1 }}</el-descriptions-item>
                 <el-descriptions-item label="联系方式1">{{ form.telephone1 }}</el-descriptions-item>
                 <el-descriptions-item label="联系方式2">{{ form.telephone2 }}</el-descriptions-item>
                 <el-descriptions-item label="联系方式2">{{ form.telephone2 }}</el-descriptions-item>
               </el-descriptions>
               </el-descriptions>

ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/index.vue

@@ -179,9 +179,9 @@
         <!--        <el-form-item label="测试项目" prop="projectName" v-if="isHandle">-->
         <!--        <el-form-item label="测试项目" prop="projectName" v-if="isHandle">-->
         <!--          <el-input v-model="form.projectName" placeholder="请选择测试项目" readOnly/>-->
         <!--          <el-input v-model="form.projectName" placeholder="请选择测试项目" readOnly/>-->
         <!--        </el-form-item>-->
         <!--        </el-form-item>-->
-        <el-form-item label="测试项目" prop="projectName">
+        <el-form-item label="报考岗位" prop="projectName">
           <el-input v-model="form.projectName" :readonly="isHandle" @click.native="selectProjectList"
           <el-input v-model="form.projectName" :readonly="isHandle" @click.native="selectProjectList"
-                    placeholder="请选择测试项目"/>
+                    placeholder="请选择报考岗位"/>
         </el-form-item>
         </el-form-item>
         <div v-if="!isHandle">
         <div v-if="!isHandle">
           <el-form-item label="考试安排" prop="examArrange">
           <el-form-item label="考试安排" prop="examArrange">
@@ -209,7 +209,7 @@
       </div>
       </div>
     </el-dialog>
     </el-dialog>
 
 
-    <el-dialog title="测试项目" :visible.sync="openSelect" width="800px" append-to-body>
+    <el-dialog title="报考岗位" :visible.sync="openSelect" width="800px" append-to-body>
       <el-table ref="table-project" @row-click="rowClick" size="small" height="400px" :data="projectList"
       <el-table ref="table-project" @row-click="rowClick" size="small" height="400px" :data="projectList"
                 @selection-change="handleSelectionChange" :row-key="getRowId">
                 @selection-change="handleSelectionChange" :row-key="getRowId">
         <el-table-column type="selection" width="55" reserve-selection align="center"/>
         <el-table-column type="selection" width="55" reserve-selection align="center"/>
@@ -311,11 +311,11 @@ export default {
         //   {required: true, message: "考试时间不能为空", trigger: "change"}
         //   {required: true, message: "考试时间不能为空", trigger: "change"}
         // ],
         // ],
         type: [
         type: [
-          {required: true, message: "测试项目不能为空", trigger: "blur"}
+          {required: true, message: "报考岗位不能为空", trigger: "blur"}
         ],
         ],
 
 
         projectName: [
         projectName: [
-          {required: true, message: "测试项目不能为空", trigger: "blur"}
+          {required: true, message: "报考岗位不能为空", trigger: "blur"}
         ],
         ],
         startTime: [
         startTime: [
           {required: true, message: "开始时间不能为空", trigger: "blur"}
           {required: true, message: "开始时间不能为空", trigger: "blur"}

ruoyi-ui/src/views/smartSchool/openRecruitment/testProject/index.vue

@@ -9,8 +9,8 @@
           @keyup.enter.native="handleQuery"
           @keyup.enter.native="handleQuery"
         />
         />
       </el-form-item> -->
       </el-form-item> -->
-      <el-form-item label="测试项目" prop="project">
-        <el-input v-model="queryParams.project" placeholder="请输入测试项目" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="报考岗位" prop="project">
+        <el-input v-model="queryParams.project" placeholder="请输入报考岗位" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       </el-form-item>
       <el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

ruoyi-ui/vue.config.js

@@ -48,7 +48,8 @@ module.exports = {
         //学校内网
         //学校内网
         // target: `http://10.20.100.201:57321`,
         // target: `http://10.20.100.201:57321`,
         // target: `http://47.105.176.202:5115`,
         // target: `http://47.105.176.202:5115`,
-        target: `http://172.16.100.114:5131`,
+        // target: `http://172.16.100.96:5131`,
+        target: 'http://192.168.31.14:5131',
         // target: `http://172.18.6.157:8848`,
         // target: `http://172.18.6.157:8848`,
         changeOrigin: true,
         changeOrigin: true,
         pathRewrite: {
         pathRewrite: {