3

周超
1 parent 57b2d5ec
Showing 8 changed files with 203 additions and 51 deletions
src/layout/components/Navbar.vue
src/utils/request.js
src/views/QuestionBank/components/EditDimension.vue
src/views/QuestionBank/index.vue
src/views/TestPaper/ManualTestPaper.vue
src/views/TestPaper/TestPaperList.vue
src/views/user/userlist.vue
vue.config.js
@@ -7,10 +7,12 @@
     <div class="right-menu">
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
-		<span>您好</span>
+		<span v-if="name">您好、({{name}})</span>
+		<span v-else>您好</span>
           <i class="el-icon-caret-bottom" style="margin-top: -7px;" />
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
+          
           <el-dropdown-item  @click.native="logout">
             <span style="display:block;">退出</span>
           </el-dropdown-item>
@@ -33,7 +35,8 @@ export default {
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'name'
     ])
   },
   methods: {
@@ -12,7 +12,7 @@ import {
 const service = axios.create({
 	baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
 	// withCredentials: true, // send cookies when cross-domain requests
-	timeout: 5000 // request timeout
+	timeout: 9000 // request timeout
 })
 // request interceptor
 <template>
-  <el-dialog title="编辑" :visible.sync="dialogFormVisible" @closed="handleclose" width="75%">
+  <el-dialog title="编辑" :visible.sync="dialogFormVisible" @closed="handleclose" width="650px">
     <el-form :model="data">
       <el-form-item label="上级分类" style="padding-top: 5px">
@@ -148,9 +148,9 @@
         </div>
       </el-col>
     </el-row>
-    <el-dialog title="分类维护" :visible.sync="dialogClassIVIsible" @close="closeClassDialog" width="400px"
+    <el-dialog title="分类维护" :visible.sync="dialogClassIVIsible" @close="closeClassDialog" width="450px"
       :close-on-click-modal="false">
-      <el-form ref="QuestionClassInfo" :model="QuestionClassInfo" label-width="70px">
+      <el-form ref="QuestionClassInfo" :model="QuestionClassInfo" label-width="80px">
         <el-form-item label="分类名称">
           <el-input v-model="QuestionClassInfo.ClassificationName" placeholder="请输入分类名称"></el-input>
@@ -181,7 +181,7 @@
             <template slot-scope="{ node, data }">
               <span>{{ data.label }}</span>
-              <span v-if="!node.isLeaf"> ({{ data.subjectCount || 0 }}) </span>
+              <span v-if="!node.isLeaf && data.id >0" >  ({{ data.subjectCount || 0 }}) </span>
             </template>
@@ -297,8 +297,7 @@
-      <el-upload class="upload-demo" style="width:80%" :headers="{Authorization:token}" drag
-      :on-success="handleSuccess"
+      <el-upload class="upload-demo" style="width:80%" :headers="{Authorization:token}" drag :on-success="handleSuccess"
         action="/api/QuestionBank/import" :limit="1">
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
@@ -307,7 +306,7 @@
           <br>
           <br>
           <span style="color:red;line-height:20px;font-size:16px">
-            注意: 
+            注意:
             <br>
             1.导入每个选项格式 分为三段 用” @@ “ 隔开 选项内容@@选项分值@@选项权重（权重 分为三个 高 中 低） <br /> 例如:
             <p>选项A 今天感觉怎么样@@10@@高</p>
@@ -319,16 +318,16 @@
           <br>
           <span style="color:red;line-height:20px;font-size:16px">
-          2.分类编号  从后台题库管理左侧分类的名称前获取 [1] 只需填写中间的数字即可
+            2.分类编号 从后台题库管理左侧分类的名称前获取 [1] 只需填写中间的数字即可
           </span>
           <br>
           <span style="color:red;line-height:20px;font-size:16px">
-            3.多选题  多选题选项 多个用 英文,隔开  如： A,B,C
-            </span>
-  
-            <br>
+            3.多选题 多选题选项 多个用 英文,隔开 如： A,B,C
+          </span>
+
+          <br>
           <el-link :href="BASE_URL + '/temp/题目导入模板.xlsx'" target="_blank" type="primary">点击下载导入模板</el-link>
         </div>
@@ -464,12 +463,12 @@
       },
       handleSuccess(res) {
         var msg = '';
-        if(res.data.data){
+        if (res.data.data) {
           msg = `导入完成  共:${res.data.data.tableCount}个题目  成功 ${res.data.data.SuccessCount}个题目`;
-        } 
-				this.$message.success(msg);
-				this.GetList();
-			},
+        }
+        this.$message.success(msg);
+        this.GetList();
+      },
       saveEditDim(data) {
         // if(this.currentEditNode && this.currentEditNode.parent)
         // this.currentExpend=[this.currentEditNode.parent.data.id];
@@ -628,7 +627,14 @@
       CreateQuestionClassHealder() {
         if (this.loading) return;
         this.loading = true;
-
+        if (!this.QuestionClassInfo.ClassificationName) {
+          this.$notify({
+            title: '请填写名称后提交！',
+            type: 'warning'
+          });
+          this.loading = false;
+          return;
+        }
         this.QuestionClassInfo.Addtime = parseTime(new Date(), "");
         CreateQuestionClass(this.QuestionClassInfo).then((res) => {
           this.getQuestionClassListHeadler();
@@ -665,7 +671,10 @@
         }
         if (node)
           this.QuestionClassInfo.ParentId = node.data.value;
-        if (type) this.QuestionClassInfo.ClassType = type;
+        if (type) {
+          this.QuestionClassInfo.ClassType = type;
+          // this.FormClassType = type;
+        }
         else if (node.data.ClassType) this.QuestionClassInfo.ClassType = node.data.ClassType;
@@ -776,6 +785,9 @@
                   _this.dialogsubjectlVisible = false;
                 }, 10);
               }
+              else{
+                this.$message.warning(res.data.message);
+              }
             });
           } else {
             console.log('error submit!!');
@@ -820,7 +832,53 @@
           // firstClass.children = this.getSubTree(6, list);
           // let secondClass = list.find((t) => t.id == 1);
           // secondClass.children = this.getSubTree(1, list);
-          this.QuestionClass = list;
+          //之前用的
+          // this.QuestionClass = list;
+
+          {
+
+           let  zylist = [],cplist=[];
+          let  zylistSource = res.data.data.filter(o=>{ return o.ClassType == 0; });
+          let  cplistSource = res.data.data.filter(o=>{ return o.ClassType == 2; });
+ 
+          zylist = zylistSource.filter(t => !t.ParentId);
+          zylist = zylist.map((t) => {
+            t.value = t.id;
+            t.label = t.ClassificationName;
+            t.children = this.getSubTree(t.id, zylistSource);
+            if (!t.children || !t.children.length) {
+              delete t.children;
+            }
+            return t;
+          });
+
+          cplist = cplistSource.filter(t => !t.ParentId);
+          cplist = cplist.map((t) => {
+            t.value = t.id;
+            t.label = t.ClassificationName;
+            t.children = this.getSubTree(t.id, cplistSource);
+            if (!t.children || !t.children.length) {
+              delete t.children;
+            }
+            return t;
+          });
+          var questionclass_list = [{
+            value:'-1',
+            label:'专业类',
+            children:zylist ,
+            disabled: true
+          },
+          {
+            value:'-2',
+            label:'测评类',
+            children:cplist ,
+            disabled: true,
+          }
+        ];
+        this.QuestionClass = questionclass_list;
+          }
+
+
           var firstlist = list.filter(o => o.ClassType == 0 && o.ParentId == 0).map(o => {
             o.children = this.getSubTree(o.id, list);
@@ -26,11 +26,13 @@
         <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="试卷名称:" prop="TestPaperTitle" required class="el-form-item-custom"   style="margin-bottom: 20px !important;width:100%;">
+            <el-form-item label="试卷名称:" prop="TestPaperTitle" required class="el-form-item-custom"
+              style="margin-bottom: 20px !important;width:100%;">
               <el-input v-model="TestPaper.TestPaperTitle"></el-input>
             </el-form-item>
-            <el-form-item label="自定义名称:" prop="CustomName" required class="el-form-item-custom"    style="margin-bottom: 20px !important;width:100%;">
+            <el-form-item label="自定义名称:" prop="CustomName" required class="el-form-item-custom"
+              style="margin-bottom: 20px !important;width:100%;">
               <el-input v-model="TestPaper.CustomName"></el-input>
             </el-form-item>
             <!-- <el-form-item label="题目数量:" class="el-form-item-custom">
@@ -70,7 +72,7 @@
               <el-form-item prop="date">
                 <el-date-picker v-model="TestPaper.date" @change="changetimestartend" type="datetimerange"
                   format="yyyy-MM-dd hh:mm:ss" range-separator="至" start-placeholder="开始时间" style="width:100%"
-                  end-placeholder="结束时间"  :picker-options="pickerOptions">
+                  end-placeholder="结束时间" :picker-options="pickerOptions">
                 </el-date-picker>
               </el-form-item>
             </el-form-item>
@@ -110,7 +112,7 @@
         </div> -->
         <div class="grid-content bg-purple">
-          <el-tabs v-model="activeTab" style="padding: 0 20px" :stretch="true">
+          <el-tabs v-model="activeTab" style="padding: 0 20px" @tab-click="changeTab" :stretch="true">
             <el-tab-pane label="专业类" name="6"></el-tab-pane>
             <el-tab-pane label="测评类" name="1"></el-tab-pane>
           </el-tabs>
@@ -134,8 +136,8 @@
         </div>
       </el-col>
-      <el-col :span="10" :style="{'height':contentHeight+'px'}" class="jinyongtop"  v-show="active==2">
-         
+      <el-col :span="10" :style="{'height':contentHeight+'px'}" class="jinyongtop" v-show="active==2">
+
         <div class="grid-content bg-purple">
           <div class="areahead">
             <!-- <span v-show="!edit" style="font-weight: bold;">{{ TestPaper.TestPaperTitle }}</span> -->
@@ -252,8 +254,7 @@
       return {
         pickerOptions: {
           disabledDate(time) {
-            return  
-            time.getTime() > (Date.now() - 8.64e6)
+            return time.getTime() <= Date.now() - 1 * 24 * 3600 * 1000
           }
         },
         active: 1,
@@ -368,7 +369,7 @@
           ],
-          
+
           CustomName: [
             {
               required: true,
@@ -428,9 +429,20 @@
     mounted() {
       //计算页面内容区域的高度
       this.contentHeight = window.innerHeight - 90;
-      //this.GetList();
+      this.GetList();
     },
     methods: {
+      changeTab(a, b) {
+        if (a.index == "1") {
+          this.randomQuestionTypeList[0].disabled = true;
+          this.randomQuestionTypeList[1].disabled = false;
+        }
+        else {
+
+          this.randomQuestionTypeList[1].disabled = true;
+          this.randomQuestionTypeList[0].disabled = false;
+        }
+      },
       removeItem(item, index) {
         this.arr2.splice(index, 1);
       },
@@ -490,6 +502,54 @@
         getQuestionClassList().then((res) => {
           let alllist = res.data.data;
           this.typelist = alllist;
+
+          let zylist = [], cplist = [];
+          let zylistSource = alllist.filter(o => { return o.ClassType == 0; });
+          let cplistSource = alllist.filter(o => { return o.ClassType == 2; });
+
+          zylist = zylistSource.filter(t => !t.ParentId);
+          zylist = zylist.map((t) => {
+            t.value = t.id;
+            t.label = t.ClassificationName;
+            t.children = this.getSubTree(t.id, zylistSource);
+            if (!t.children || !t.children.length) {
+              delete t.children;
+            }
+            return t;
+          });
+
+          cplist = cplistSource.filter(t => !t.ParentId);
+          cplist = cplist.map((t) => {
+            t.value = t.id;
+            t.label = t.ClassificationName;
+            t.children = this.getSubTree(t.id, cplistSource);
+            if (!t.children || !t.children.length) {
+              delete t.children;
+            }
+            return t;
+          });
+          var list = [{
+            value: '-1',
+            label: '专业类',
+            children: zylist,
+            disabled: false
+          },
+          {
+            value: '-2',
+            label: '测评类',
+            children: cplist,
+            disabled: true,
+          }
+          ];
+          this.randomQuestionTypeList = list;
+        });
+      },
+
+      getQuestionClassListHeadler2bk() {
+        let _this = this;
+        getQuestionClassList().then((res) => {
+          let alllist = res.data.data;
+          this.typelist = alllist;
           let list = alllist.filter(t => !t.ParentId);
           list = list.map((t) => {
             t.value = t.id;
@@ -500,6 +560,7 @@
             }
             return t;
           });
+
           this.randomQuestionTypeList = list;
         });
       },
@@ -507,7 +568,6 @@
         this.dialogTableVisible = false;
       },
       randomSubmit() {
-
         var _this = this;
         if (_this.TestPaper.FLevelCount && _this.TestPaper.FLevelCount > 0 && _this.arr2.length >= _this.TestPaper.FLevelCount) {
           this.$notify({
@@ -517,7 +577,7 @@
           });
           return;
         }
-        
+
         var list = JSON.parse(JSON.stringify(this.randomSubjectList));
         if (list.findIndex((t) => !t.QuestionClassId || !t.QuestionClassId.length || !t.Count) > -1) {
           this.$message.warning("参数不完整");
@@ -529,7 +589,7 @@
           return t;
         });
         var count = 0;
-        list.forEach(o=>{ count+=o.Count;});
+        list.forEach(o => { count += o.Count; });
         if (_this.TestPaper.FLevelCount && _this.TestPaper.FLevelCount > 0 && (_this.arr2.length + count) > _this.TestPaper.FLevelCount) {
           this.$notify({
             title: '题目数量已经达到级别最大',
@@ -601,7 +661,7 @@
       },
       SubmitTestPaper() {
         var _this = this;
-        if (_this.TestPaper.FLevelCount && _this.TestPaper.FLevelCount > 0 && _this.arr2.length >= _this.TestPaper.FLevelCount) {
+        if (_this.TestPaper.FLevelCount && _this.TestPaper.FLevelCount > 0 && _this.arr2.length > _this.TestPaper.FLevelCount) {
           this.$notify({
             title: '题目数量已经达到级别最大',
             // message: res.data.message,
@@ -643,13 +703,10 @@
               this.$confirm("试题没有题目！", "消息");
             }
           } else {
-
             return false;
           }
         });
-
-
-
+ 
       },
       load() {
         this.loading = true;
@@ -670,7 +727,8 @@
               });
               this.loadingType = true;
             });
-        } else {
+        }
+        else { 
           getQuestionList(this.parameter).then((res) => {
             if (this.parameter.pageIndex == 1) {
               this.arr1 = [];
@@ -680,8 +738,10 @@
             });
             this.count = res.data.data.total;
             this.$forceUpdate();
+            this.loadingType=true;
           });
         }
+
       },
       end1(e) {
         var that = this;
@@ -723,6 +783,12 @@
       ComeHere(e) {
         var _this = this;
         if (_this.TestPaper.FLevelCount && _this.TestPaper.FLevelCount > 0 && _this.arr2.length >= _this.TestPaper.FLevelCount) {
+          this.$notify({
+            title: '题目数量已经达到级别最大',
+            // message: res.data.message,
+            type: 'warning'
+          });
+          return;
           return;
         }
         var d = e.item._underlying_vm_;
@@ -33,7 +33,7 @@
         </el-form-item>
 					<el-form-item>
 						<el-button type="success" @click="search">搜索</el-button>
-			      <el-button type="primary" @click="dialogAddTestPaperVIsible=true">添加试卷
+			      <!-- <el-button type="primary" @click="dialogAddTestPaperVIsible=true">添加试卷 -->
             </el-button>
 					</el-form-item>
 				</el-form>
@@ -121,6 +121,11 @@
           <span>{{ scope.row.Describe }}</span>
         </template>
       </el-table-column>
+      <el-table-column prop="name" label="有效期" :show-overflow-tooltip=true width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.EffectiveStartTime | timeF }} - {{ scope.row.EffectiveEndTime | timeF }}</span>
+        </template>
+      </el-table-column>
       <el-table-column fixed="right" label="操作" width="150">
         <template slot-scope="scope">
           <el-dropdown @command="(e)=>{handleCommand(e,scope.row)}">
@@ -361,6 +366,13 @@
           console.log(e);
           return '未知'
         }
+      },
+      timeF(val) {
+        try {
+          return  val.split('T')[0];
+        } catch (e) {
+          return val
+        }
       }
     },
     beforeCreate() {
@@ -8,20 +8,23 @@
 						<el-input placeholder="输入关键字搜索" v-model="query.keyword"></el-input>
 					</el-form-item>
 					<el-form-item label="最高学历">
-						<el-select v-model="query.xueli" placeholder="最高学历">
-							<el-option label="大专" value="shanghai"></el-option>
-							<el-option label="本科" value="beijing"></el-option>
+						<el-select v-model="query.xueli" placeholder="最高学历" clearable>
+							<el-option label="大专" value="大专"></el-option>
+							<el-option label="本科" value="本科"></el-option>
+							<el-option label="硕士" value="硕士"></el-option>
+							<el-option label="博士" value="博士"></el-option>
+							<el-option label="博士后" value="博士后"></el-option>	
 						</el-select>
 					</el-form-item>
 					<el-form-item label="性别">
-						<el-select v-model="query.sex" placeholder="性别">
+						<el-select v-model="query.sex" placeholder="性别" clearable>
 							<el-option label="男" value="1"></el-option>
 							<el-option label="女" value="0"></el-option>
 						</el-select>
 					</el-form-item>
 					<el-form-item label="面试进度">
-						<el-select v-model="query.process" placeholder="进度">
+						<el-select v-model="query.process" placeholder="进度" clearable>
 							<el-option label="全部" value="-1"></el-option>
 							<el-option v-for="item in processlist" :key="item.value" :label="item.label"
 								:value="item.value">
@@ -31,7 +34,7 @@
 					<el-form-item label="推荐指数">
 						<el-rate v-model="query.stars" text-color="#ff9900" style="margin-top:10px;" show-score
-							:allow-half="true" :max="7" :score-template="query.stars <0?'无':query.stars+' 星' ">
+							:allow-half="true" :max="7" :score-template="(!query.stars || query.stars<1) ?'无':query.stars+' 星' ">
 						</el-rate>
 					</el-form-item>
@@ -289,6 +292,7 @@
 					<el-select v-model="adminUserInfo.xueli" placeholder="最高学历">
 						<el-option label="大专" value="大专"></el-option>
 						<el-option label="本科" value="本科"></el-option>
+						<el-option label="硕士" value="硕士"></el-option>
 						<el-option label="博士" value="博士"></el-option>
 						<el-option label="博士后" value="博士后"></el-option>
 					</el-select>
@@ -1157,6 +1161,13 @@
 				// this.$loading({lock:true,text:'保存中...'});
 				if (this.loading) {
 					return;
+				} 
+				if(!this.temp.ClassTitle){
+					this.$message({
+							message: "请填写分类名称！",
+							type: "warning",
+						});
+					return;
 				}
 				this.loading = true;
 				var postData = this.temp;
@@ -39,7 +39,7 @@ module.exports = {
         proxy: {
             '/development': {
                 // target: `http://admin.7-stars.com.cn/`, //后台服务地址
-                target:'http://localhost:8877',
+                target:'https://localhost:44399/',
                 // target:'http://localhost:8009',
                 changeOrigin: true,
                 pathRewrite: {
@@ -47,7 +47,9 @@ module.exports = {
                 }
             },
             '/api': {
-                target: `http://admin.7-stars.com.cn/`, //后台服务地址
+                target:'https://localhost:44399/',
+
+                // target: `http://admin.7-stars.com.cn/`, //后台服务地址
                 // target: 'http://localhost:8877',
                 changeOrigin: true,
                 pathRewrite: {}