Merge branch 'develop_interview' of 39.98.150.180:antissoft/antissoft.dati.admin…

… into develop_interview

Merge branch 'develop_interview' of 39.98.150.180:antissoft/antissoft.dati.admin…
… into develop_interview
周超
2 parents 66014979 d35d8b3c
Showing 7 changed files with 121 additions and 98 deletions
.gitignore
src/api/TestPaper.js
src/views/TestPaper/ManualTestPaper.vue
src/views/TestPaper/TestPaperList.vue
src/views/user/picuserimport.vue
src/views/user/userlist.vue
vue.config.js
@@ -14,3 +14,4 @@ tests/**/coverage/
 *.ntvs*
 *.njsproj
 *.sln
+vue.config.js
 import request from '@/utils/request'
 //编辑试卷
 export function EditTestPaper(params) {
-	return request({
-		url: `/TestPaper/AddTestPaper`,
-		method: 'post',
-		data: params
-	})
+    return request({
+        url: `/TestPaper/AddTestPaper`,
+        method: 'post',
+        data: params
+    })
 }
 export function getTestPaperList(params) {
-	return request({
-		url: `/TestPaper/List`,
-		// url: `/TestPaper/List?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&sort=${params.sort}&sortOrder=${params.sortOrder}`,
-		method: 'get',
-		data: params
-	})
+    console.log('getTestPaperList', params);
+    return request({
+        url: `/TestPaper/List`,
+        // url: `/TestPaper/List?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&sort=${params.sort}&sortOrder=${params.sortOrder}`,
+        method: 'get',
+        data: params,
+        params: params
+    })
 }
 export function getTestPaperClassList(params) {
-	return request({
-		url: `/TestPaperClass/List?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}`,
-		method: 'get',
-		data: params
-	})
+    return request({
+        url: `/TestPaperClass/List?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}`,
+        method: 'get',
+        data: params
+    })
 }
 //获取分类信息
 export function GetTestPaperClassById(id) {
-	return request({
-		url: `/TestPaperClass/Get/${id}`,
-		method: 'get',
-	})
+    return request({
+        url: `/TestPaperClass/Get/${id}`,
+        method: 'get',
+    })
 }
 export function UpdateTestPaperClass(params) {
-	return request({
-		url: `/TestPaperClass/Update`,
-		method: 'post',
-		data: params
-	})
+    return request({
+        url: `/TestPaperClass/Update`,
+        method: 'post',
+        data: params
+    })
 }
 export function DeleteTestPaperClass(ids) {
-	return request({
-		url: `/TestPaperClass/Delete?ids=${ids}`,
-		method: 'post',
-	})
+    return request({
+        url: `/TestPaperClass/Delete?ids=${ids}`,
+        method: 'post',
+    })
 }
 export function CreateTestPaperClass(params) {
-	return request({
-		url: `/TestPaperClass/Create`,
-		method: 'post',
-		data: params
-	})
+    return request({
+        url: `/TestPaperClass/Create`,
+        method: 'post',
+        data: params
+    })
 }
 export function GetToplevel() {
-	return request({
-		url: `/TestPaperClass/GetToplevel`,
-		method: 'get',
-	})
+    return request({
+        url: `/TestPaperClass/GetToplevel`,
+        method: 'get',
+    })
 }
 export function GetTestManagerByAdmin(data) {
-	return request({
-		url: `/TestPaper/GetTestManagerByAdmin?TestPaperId=`+data.TestPaperId,
-		method: 'get',
-    data
-	})
+    return request({
+        url: `/TestPaper/GetTestManagerByAdmin?TestPaperId=` + data.TestPaperId,
+        method: 'get',
+        data
+    })
 }
 // POST /api/TestPaper/GetTestPaperListByPlateClass //获取模块下面的试卷列表
 export function GetTestPaperListByPlateClass(data) {
-	return request({
-		url: `/TestPaper/GetTestPaperListByPlateClass`,
-		method: 'post',
-    data
-	})
+    return request({
+        url: `/TestPaper/GetTestPaperListByPlateClass`,
+        method: 'post',
+        data
+    })
 }
 //POST /api/TestPaper/AddTestPaperInfo  往模块中添加试卷
 export function AddTestPaperInfo(data) {
-	return request({
-		url: `/TestPaper/AddTestPaperInfo`,
-		method: 'post',
-    data
-	})
+    return request({
+        url: `/TestPaper/AddTestPaperInfo`,
+        method: 'post',
+        data
+    })
 }
 //POST /api/TestPaper/Update  编辑
 export function TestPaperUpdate(data) {
-	return request({
-		url: `/TestPaper/Update`,
-		method: 'post',
-    data
-	})
+    return request({
+        url: `/TestPaper/Update`,
+        method: 'post',
+        data
+    })
 }
 // get /api/TestPaper/DeleteTestPaper  标记删除
 export function DeleteTestPaper(data) {
-	return request({
-		url: `/TestPaper/DeleteTestPaper?TestPaperId=`+data,
-		method: 'get',
-    data
-	})
+    return request({
+        url: `/TestPaper/DeleteTestPaper?TestPaperId=` + data,
+        method: 'get',
+        data
+    })
 }
 // POST /api/TestPaper/ReleaseTestPaper  上架试卷
 export function ReleaseTestPaper(data) {
-	return request({
-		url: `/TestPaper/ReleaseTestPaper?TestPaperId=`+data,
-		method: 'post',
-    data
-	})
+    return request({
+        url: `/TestPaper/ReleaseTestPaper?TestPaperId=` + data,
+        method: 'post',
+        data
+    })
 }
 //POST /api/TestPaperDetail/Delete
 export function DeleteTestPaperDetail(data) {
-	return request({
-		url: `/TestPaperDetail/DeleteTestPaperDetail`,
-		method: 'post',
-    params:data
-	})
-}
+    return request({
+        url: `/TestPaperDetail/DeleteTestPaperDetail`,
+        method: 'post',
+        params: data
+    })
+}
 \ No newline at end of file
@@ -64,6 +64,7 @@
               <span style="margin-right: 10px;">单选题：{{TestPaper.SingleNumber}}</span>
               <span style="margin-right: 10px;">多选题：{{TestPaper.MultipleNumber}}</span>
               <span style="margin-right: 10px;">主观题：{{TestPaper.SubjectiveNumber}}</span>
+              <span style="margin-right: 10px;">主观题：{{TestPaper.VoiceNumber}}</span>
             </el-form-item>
             <el-form-item label="题目总分:" class="el-form-item-custom">
               {{TestPaper.TotalScore || ''}}
@@ -231,6 +232,7 @@
           SingleNumber: 0,
           MultipleNumber: 0,
           SubjectiveNumber: 0,
+          VoiceNumber:0,
           OriginalPrice: "0",
           PresentPrice: "0",
           MembershipPrice: "0",
@@ -369,6 +371,11 @@
           this.dialogTableVisible = false;
           if (!list.length) {
             this.$message.warning('所选分类没有试题');
+          }else{
+            this.TestPaper.SingleNumber = list.filter(t=>t.subjectType == 1).length;
+            this.TestPaper.MultipleNumber = list.filter(t=>t.subjectType == 2).length;
+            this.TestPaper.SubjectiveNumber = list.filter(t=>t.subjectType == 3).length;
+            this.TestPaper.VoiceNumber = list.filter(t=>t.subjectType == 4).length;
           }
         });
       },
@@ -506,6 +513,10 @@
         if (e.item._underlying_vm_.subjectType == 3) {
           this.TestPaper.SubjectiveNumber -= 1;
         }
+        if (e.item._underlying_vm_.subjectType == 4) {
+          this.TestPaper.VoiceNumber -= 1;
+        }
+        
         this.TestPaper.TotalScore -= e.item._underlying_vm_.fraction;
         this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
       },
@@ -521,6 +532,9 @@
         if (e.item._underlying_vm_.subjectType == 3) {
           this.TestPaper.SubjectiveNumber += 1;
         }
+        if (e.item._underlying_vm_.subjectType == 4) {
+          this.TestPaper.VoiceNumber += 1;
+        }
         this.TestPaper.TotalScore += e.item._underlying_vm_.fraction;
         this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
@@ -548,6 +562,9 @@
               if (rs.subjectType == 3) {
                 this.TestPaper.SubjectiveNumber += 1;
               }
+              if (rs.subjectType == 4) {
+                this.TestPaper.VoiceNumber += 1;
+              }
             });
           });
         }
@@ -21,6 +21,7 @@
           <span>{{ scope.row.TotalScore }}</span>
         </template>
       </el-table-column>
+      
       <el-table-column prop="date" label="单选题数量" width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.SingleNumber }}</span>
@@ -36,6 +37,16 @@
           <span>{{ scope.row.SubjectiveNumber }}</span>
         </template>
       </el-table-column>
+      <el-table-column prop="date" label="语音题数量" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.VoiceNumber }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="date" label="工种" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.UserTypeOfWorkName }}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="TestPaperClassId" label="分类" width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.TestPaperClassId | typeFilters}}</span>
@@ -168,7 +179,8 @@
   import {  GetTypeSetting
   } from '@/api/user'
   import { formatTime } from '@/utils/util'
-  let that
+  let that={};
+  let list = [];
   export default {
     data() {
       return {
@@ -219,8 +231,10 @@
         // sortOrder: 1,
         keyword: ""
       }
-      getTestPaperClassList(parameter).then(res => {
-        this.list = res.data.data;
+      GetToplevel(parameter).then(res => {
+        console.log('gettoplevel',res);
+        list = res.data.data;
+        this.$forceUpdate();
       });
       GetTypeSetting({}).then(res=>{
@@ -231,16 +245,10 @@
     },
     filters: {
       typeFilters(val) {
-        var that = this;
         try {
-          if (!that.list) return '未知';
-          const data = that.list.filter(t => t.id == val)[0]
-          if (data) {
-            return data.ClassTitle
-          } else {
-            return '未知'
-          }
+          return list.find(t=>t.id == val).ClassTitle || '未知';
         } catch (e) {
+          console.log(e);
           return '未知'
         }
       }
@@ -339,12 +339,10 @@ export default {
         this.table_data = [];
       } else {
         console.log(index, row);
-        this.table_data.splice(index, 1);
+        
       }
-      UserInfo_BatchToUser(row.id);
-      this.$message({
-        message: "入库成功！",
-        type: "success",
+      UserInfo_BatchToUser(row.id).then(res=>{
+        this.table_data.splice(index, 1);
       });
     },
@@ -191,12 +191,9 @@
     <el-dialog title="邀请面试-试卷选择" :visible.sync="dialogFormVisible">
       <el-form :model="form">
-        <!-- <el-form-item label="活动名称" :label-width="formLabelWidth">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
-        </el-form-item> -->
         <el-form-item label="试卷">
           <el-select v-model="form.TestPaperId" placeholder="请选择试卷" style="width: 80%">
-            <el-option :value="item.id" v-for="item in testpaperlist">{{
+            <el-option :value="item.id" :label="'['+item.id+']'+item.TestPaperTitle"  v-for="item in testpaperlist">{{
               "[" + item.id + "] " + (item.TestPaperTitle || "未命名")
               }}</el-option>
           </el-select>
@@ -38,16 +38,16 @@ module.exports = {
         },
         proxy: {
             '/development': {
-                // target: `http://inteview.t1j2.com/`, //后台服务地址
-                target:'http://localhost:8877',
+                target: `http://inteview.t1j2.com/`, //后台服务地址
+                // target:'http://localhost:8877',
                 changeOrigin: true,
                 pathRewrite: {
                     '^/development': ''
                 }
             },
             '/api': {
-                // target: `http://inteview.t1j2.com/`, //后台服务地址
-                target: 'http://localhost:8877',
+                target: `http://inteview.t1j2.com/`, //后台服务地址
+                // target: 'http://localhost:8877',
                 changeOrigin: true,
                 pathRewrite: {}
             }