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
yangzhi
2 parents e1cd1e22 904199bf
Showing 6 changed files with 54 additions and 27 deletions
src/layout/components/Sidebar/index.vue
src/utils/request.js
src/views/QuestionBank/index.vue
src/views/TestPaper/ManualTestPaper.vue
src/views/user/picuserimport.vue
src/views/user/userlist.vue
@@ -34,8 +34,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'sidebar',
-      'permissions'
+      'sidebar' 
     ]),
     // routes() {
     //   return this.$router.options.routes
@@ -61,9 +60,9 @@ export default {
     }
   },
   created() { 
-    this.routes = getRoutes(this.permissions);
+    this.routes = getRoutes( );
     this.$bus.$on('relogin',()=>{
-      this.routes = getRoutes(this.permissions);
+      this.routes = getRoutes( );
     })
   },
 }
@@ -47,12 +47,10 @@ service.interceptors.response.use(
 	 * Here is just an example
 	 * You can also judge the status by HTTP Status Code
 	 */
-	response => {
-
+	response => { 
 		const res = response.data
 		// if the custom code is not 20000, it is judged as an error.
 		if (res.code < 0 || res.data.code<0) {
-
 			Message({
 				message: res.data.message || 'Error',
 				type: 'error',
@@ -15,11 +15,11 @@
             </el-tabs>
             <el-button type="button" size="mini" style="width:100%;margin-bottom:10px"
               @click="showClassDialog(null,0,activeTab == 'first' ? 0 : 2)">
-              添加顶级
-            </el-button> 
-            <el-tree :data="activeTab == 'first' ? firstTreeData : secondTreeData" :default-expanded-keys="currentExpend"
-              :props="activeTab == 'first' ? firstTreeData : secondTreeData" @node-click="handleNodeClick"
-              class="eltree" :expand-on-click-node="false" ref="tree">
+              添加顶级 
+            </el-button>
+            <el-tree :data="activeTab == 'first' ? firstTreeData : secondTreeData"
+              :default-expanded-keys="currentExpend" :props="activeTab == 'first' ? firstTreeData : secondTreeData"
+              @node-click="handleNodeClick" class="eltree" :expand-on-click-node="false" ref="tree">
               <span class="custom-tree-node" slot-scope="{ node, data }">
                 <span>{{ node.label }}</span>
                 <span style="">
@@ -153,6 +153,7 @@
           <el-input v-model="QuestionClassInfo.ClassificationName" placeholder="请输入分类名称"></el-input>
         </el-form-item>
       </el-form>
+      {{QuestionClassInfo}}
       <el-button @click="CreateQuestionClassHealder" style="margin: 10px 0 0 0; float: right" type="primary">确定
       </el-button>
       <div style="clear: both"></div>
@@ -350,7 +351,7 @@
         CreatClassId: 0,
         scoreRules: ['高', '中', '低'],
         currentEditNode: undefined,
-        currentExpend:[1]
+        currentExpend: [1]
       };
     },
     created() { },
@@ -370,7 +371,7 @@
       closeEditDim(data) {
       },
-      saveEditDim(data) {  
+      saveEditDim(data) {
         // if(this.currentEditNode && this.currentEditNode.parent)
         // this.currentExpend=[this.currentEditNode.parent.data.id];
         // {
@@ -537,13 +538,15 @@
           this.dialogsubjectlVisible = true;
         });
       },
-      showClassDialog(node, parent, type) {
+      showClassDialog(node, parent, type) { 
         this.dialogClassIVIsible = true;
         console.log(node);
         if (parent && parent == 0) this.QuestionClassInfo.ParentId = 0;
         if (node)
           this.QuestionClassInfo.ParentId = node.data.value;
-        if (type != undefined) this.QuestionClassInfo.ClassType = type;
+        if (type) this.QuestionClassInfo.ClassType = type;
+        else if (node.data.ClassType) this.QuestionClassInfo.ClassType = node.data.ClassType;
+
         //   alert(this.QuestionClassInfo.ParentId);
       },
       //关闭弹框的事件
@@ -702,11 +705,11 @@
           //     _this.$refs.tree.getNode(_this.currentEditNode.parent).expand();
           //     _this.$refs.tree.getNode(_this.currentEditNode.parent).expanded=true;
           //     _this.$forceUpdate()
-          
+
           // }
           // });
-         
+
           // this.firstTreeData = [firstClass];
           // this.secondTreeData = [secondClass];
         });
@@ -55,11 +55,11 @@
         <div class="grid-content bg-purple">
           <div class="areahead">组卷基本信息</div>
           <el-form ref="form" class="testPaper-manager" :rules="rules" :model="TestPaper" label-width="100px">
-            <el-form-item label="试卷名称:" class="el-form-item-custom">
+            <el-form-item label="试卷名称:"  prop="TestPaperTitle" required class="el-form-item-custom">
               <el-input   v-model="TestPaper.TestPaperTitle"></el-input>
             </el-form-item>
             <el-form-item label="题目数量:" class="el-form-item-custom">
-              {{arr2.length}}
+         
             </el-form-item>
             <el-form-item label="题型数量:" class="el-form-item-custom">
               <span style="margin-right: 10px;">单选题：{{TestPaper.SingleNumber}}</span>
@@ -283,6 +283,14 @@
               message: "请选择时间段", 
             },
           ],
+          TestPaperTitle: [
+            {
+              required: true,
+              message: "请填写试卷名称", 
+            },
+          ],
+
+          
         },
         QuestionClass: [],
         treeData: [
@@ -516,7 +524,7 @@
             GetQuestionClassByType({ ClassType: 2 }).then((res) => {
               var classarr = res.data.data || [];
               this.arr1 = classarr.map((rs) => {
-                rs.subject = rs.subjectName = rs.ClassificationName;
+                rs.subject = rs.subjectName = rs.ClassificationName+'('+(rs.subjectCount || 0)+')';
                 rs.type = "wd";
                 rs.subjectContent = "[]";
                 return rs;
@@ -292,11 +292,29 @@ import { formatTime } from &#39;@/utils/util&#39;
 				if (!row) {
 					this.table_data = [];
 				} else {
-					console.log(index, row);
-
+					console.log(index, row);  
 				}
 				UserInfo_BatchToUser(row.id).then(res => {
-					this.table_data.splice(index, 1);
+					var msg = [];
+					var data = res.data.data || {};
+					 if(data)
+					 {
+						if(data.success >0){
+							msg.push('成功'+data.success+'个');
+						}
+						if(data.error >0){
+							msg.push('失败'+data.error+'个');
+						}
+						if(data.has >0){
+							msg.push('已存在'+data.has+'个');
+						}
+					 }
+					 if(msg.length <1) 	this.table_data.splice(index, 1);
+					 else 
+							this.$message({
+							message: msg.join('\r\n'),
+							type: "info",
+						});
 				});
 			},
@@ -38,7 +38,8 @@
 					<el-form-item>
 						<el-button type="success" @click="search">搜索</el-button>
-						<el-button type="success" @click="resetSearch">重置</el-button>
+						<el-button type="success" @click="handleEdit({})">添加</el-button>	
+            		<el-button type="success" @click="resetSearch">重置</el-button>
 						<el-button type="primary" @click="handleInviteInterview()">邀请面试(线上)</el-button>
 						<el-button type="primary" @click="handleCompanyInterview()">邀请面试(现场)</el-button>
@@ -269,7 +270,7 @@
 			</div>
 		</el-dialog>
-		<el-dialog title="人才用户信息" :visible.sync="dialogClassIVIsible" width="450">
+		<el-dialog title="人才用户信息" :visible.sync="dialogClassIVIsible" width="80%">
 			<el-form ref="adminUserInfo" label-width="120px">
 				<el-form-item class="el-form-itemByWang" label="名称" prop="fullName">
 					<el-input v-model="adminUserInfo.fullName" placeholder="请输入姓名" style="width: 70%"></el-input>
@@ -812,7 +813,7 @@
 			},
 			handleEdit(data) {
 				this.dialogClassIVIsible = true;
-				console.log("超哥是傻逼：", data);
+				console.log(" -_- ", data);
 				this.adminUserInfo = data;
 			},
 			handleTestHitory(row) {