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 8b8d289b 33c82f21
Showing 5 changed files with 204 additions and 70 deletions
beifen20221105.zip
src/views/TestPaper/ManualTestPaper.vue
src/views/TestPaper/TestPaperList.vue
src/views/login/index.vue
src/views/user/userlist.vue
 <template>
   <div class="app-container">
     <div id="id_test_video" style="width:100%; height:auto;"></div>
-  <div style="width: 100%;text-align: right;background: #efefef;height: 60px;vertical-align: middle;line-height: 60px;padding-right: 10px;">
- 
-    <el-button style="margin-top: 12px;" @click="next" v-if="active==1">下一步</el-button>
-    <el-button style="margin-top: 12px;z-index:888888888" @click="next" v-if="active==2">编辑基本信息</el-button>
-    <el-button type="primary" style=""  v-if="active==2" @click="SubmitTestPaper">保存
-    </el-button>
-  </div>
+    <div
+      style="width: 100%;text-align: right;background: #efefef;height: 60px;vertical-align: middle;line-height: 60px;padding-right: 10px;">
+
+      <el-button style="margin-top: 12px;" @click="next" v-if="active==1">下一步</el-button>
+      <el-button style="margin-top: 12px;z-index:888888888" @click="next" v-if="active==2">编辑基本信息</el-button>
+      <el-button type="primary" style="" v-if="active==2" @click="SubmitTestPaper">保存
+      </el-button>
+    </div>
     <el-row :gutter="20">
@@ -25,9 +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">
+            <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-input v-model="TestPaper.CustomName"></el-input>
+            </el-form-item>
             <!-- <el-form-item label="题目数量:" class="el-form-item-custom">
             </el-form-item> -->
@@ -65,7 +70,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="结束时间">
+                  end-placeholder="结束时间"  :picker-options="pickerOptions">
                 </el-date-picker>
               </el-form-item>
             </el-form-item>
@@ -100,10 +105,10 @@
           </el-form>
         </div>
       </el-col>
-      <el-col :span="6" :style="{'height':contentHeight+'px'}" class="jinyongtop">
-        <div class="jinyong" v-if="active==1">
+      <el-col :span="6" :style="{'height':contentHeight+'px'}" class="jinyongtop" v-show="active==2">
+        <!-- <div class="jinyong" v-if="active==1">
-        </div>
+        </div> -->
         <div class="grid-content bg-purple">
           <el-tabs v-model="activeTab" style="padding: 0 20px" :stretch="true">
             <el-tab-pane label="专业类" name="6"></el-tab-pane>
@@ -117,8 +122,9 @@
           </div>
           <draggable :options="{animation:380,filter:'.unmover'}" group="itxst" v-model="arr1" @end="end1"
-            @add="RemoveHere" :move="onMove" class="infinite-list" :style="{'height':contentHeight-80+'px'}"
-            infinite-scroll-disabled="disabled" v-infinite-scroll="load" style="overflow:auto">
+            :disabled="TestPaper.FLevelCount && arr2.length >= TestPaper.FLevelCount" @add="RemoveHere" :move="onMove"
+            class="infinite-list" :style="{'height':contentHeight-80+'px'}" infinite-scroll-disabled="disabled"
+            v-infinite-scroll="load" style="overflow:auto">
             <li v-for="i in arr1" class="infinite-list-item" :key="i.id" v-if="!classarr.some(o=>o == i.id)">{{
               i.subject }}</li>
@@ -128,10 +134,8 @@
         </div>
       </el-col>
-      <el-col :span="10" :style="{'height':contentHeight+'px'}" class="jinyongtop">
-        <div class="jinyong" v-if="active==1">
-
-        </div>
+      <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> -->
@@ -142,9 +146,13 @@
           </div>
           <draggable :options="{animation:380}" group="itxst" v-model="arr2" class="infinite-list" @end="end2"
-            @add="ComeHere" :style="{'height':contentHeight-60+'px'}" style="overflow:auto;padding-top: 10px;">
+            :disable="TestPaper.FLevelCount && arr2.length >= TestPaper.FLevelCount" @add="ComeHere"
+            :style="{'height':contentHeight-60+'px'}" style="overflow:auto;padding-top: 10px;">
             <li v-for="(i,index) in arr2" class="infinite-list-item">
               <label> {{index+1}}. [{{i.subjectName}}]{{ i.subject }}</label>
+
+              <el-button @click="removeItem(i,index)" type="danger" icon="el-icon-delete" circle size="mini"
+                style="float:right"></el-button>
               <div v-for="item in JSON.parse(i.subjectContent)">
                 <p class="option-p">{{item.option}}:{{item.optionContent}}</p>
               </div>
@@ -220,7 +228,7 @@
     bottom: 0;
     z-index: 9;
     opacity: 0.1;
-    background:black;
+    background: black;
   }
 </style>
 <script>
@@ -242,6 +250,12 @@
     },
     data() {
       return {
+        pickerOptions: {
+          disabledDate(time) {
+            return  
+            time.getTime() > (Date.now() - 8.64e6)
+          }
+        },
         active: 1,
         randomSubjectList: [
           {
@@ -277,6 +291,7 @@
         },
         contentHeight: 0,
         count: 0,
+        totalCount: 0,
         edit: false,
         arr1: [],
         arr2: [],
@@ -351,7 +366,14 @@
               message: "请填写试总时长控制",
             },
+
           ],
+          
+          CustomName: [
+            {
+              required: true,
+              message: "自定义名称必填",
+            }]
         },
         QuestionClass: [],
         treeData: [
@@ -409,22 +431,24 @@
       //this.GetList();
     },
     methods: {
+      removeItem(item, index) {
+        this.arr2.splice(index, 1);
+      },
       next() {
         var _this = this;
         console.log(this.active);
-        if(this.active == 1)
-        {
+        if (this.active == 1) {
           _this.$refs['form'].validate((valid) => {
-            if(valid){
-               this.active = 2;
-            }     
+            if (valid) {
+              this.active = 2;
+            }
           });
-        } 
-        else{
-          if (this.active++ >=2) this.active = 1;
+        }
+        else {
+          if (this.active++ >= 2) this.active = 1;
         }
-    
+
       },
       changetype(a, item) {
         var type = this.typelist.find(o => o.id == item.QuestionClassId[item.QuestionClassId.length - 1]);
@@ -483,6 +507,17 @@
         this.dialogTableVisible = false;
       },
       randomSubmit() {
+
+        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;
+        }
+        
         var list = JSON.parse(JSON.stringify(this.randomSubjectList));
         if (list.findIndex((t) => !t.QuestionClassId || !t.QuestionClassId.length || !t.Count) > -1) {
           this.$message.warning("参数不完整");
@@ -493,9 +528,19 @@
           t.QuestionClassId = t.QuestionClassId.pop();
           return t;
         });
+        var count = 0;
+        list.forEach(o=>{ count+=o.Count;});
+        if (_this.TestPaper.FLevelCount && _this.TestPaper.FLevelCount > 0 && (_this.arr2.length + count) > _this.TestPaper.FLevelCount) {
+          this.$notify({
+            title: '题目数量已经达到级别最大',
+            // message: res.data.message,
+            type: 'warning'
+          });
+          return;
+        }
         PostRandomGetQuestion(list).then((res) => {
           let list = res.data.data;
-          this.arr2 = list;
+          this.arr2.push(...list);
           this.dialogTableVisible = false;
           if (!list.length) {
             this.$message.warning('所选分类没有试题');
@@ -555,7 +600,15 @@
         this.GetList();
       },
       SubmitTestPaper() {
-
+        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;
+        }
         this.$refs['form'].validate((valid) => {
           if (!this.TestPaper.TestPaperTitle) {
@@ -668,6 +721,10 @@
       },
       //从左边添加到右边
       ComeHere(e) {
+        var _this = this;
+        if (_this.TestPaper.FLevelCount && _this.TestPaper.FLevelCount > 0 && _this.arr2.length >= _this.TestPaper.FLevelCount) {
+          return;
+        }
         var d = e.item._underlying_vm_;
         if (e.item._underlying_vm_.subjectType == 1) {
           this.TestPaper.SingleNumber += 1;
@@ -689,29 +746,37 @@
           getQuestionList({
             QuestionClassId: d.id,
             PageIndex: 1,
-            PageSize: this.TestPaper.FLevelCount || 1000,
+            PageSize: _this.TestPaper.FLevelCount || 1000,
           }).then((res) => {
             var data = res.data.data.rows || [];
-            data = data.filter(o => !this.arr2.find(d => d.id == o.id));
-            this.arr2 = this.arr2.filter((o) => o.type != "wd");
+            data = data.filter(o => !_this.arr2.find(d => d.id == o.id));
+            _this.arr2 = _this.arr2.filter((o) => o.type != "wd");
             // this.arr1.splice(this.arr1.findIndex(o=>o.id == d.id),1)
-            this.classarr.push(d.id);
+            _this.classarr.push(d.id);
             // var  test = this.arr2;
-            this.arr2.push(...data);
+            // this.arr2.push(...data);
             data.forEach((rs) => {
-              if (rs.subjectType == 1) {
-                this.TestPaper.SingleNumber += 1;
-              }
-              if (rs.subjectType == 2) {
-                this.TestPaper.MultipleNumber += 1;
+              if (_this.TestPaper.FLevelCount && _this.TestPaper.FLevelCount > 0 && _this.arr2.length >= _this.TestPaper.FLevelCount) {
+                // _this.arr2 = _this.arr2.filter((o) => o.type != "wd"); 
               }
-              if (rs.subjectType == 3) {
-                this.TestPaper.SubjectiveNumber += 1;
-              }
-              if (rs.subjectType == 4) {
-                this.TestPaper.VoiceNumber += 1;
+              else {
+                _this.arr2.push(rs);
+                if (rs.subjectType == 1) {
+                  _this.TestPaper.SingleNumber += 1;
+                }
+                if (rs.subjectType == 2) {
+                  _this.TestPaper.MultipleNumber += 1;
+                }
+                if (rs.subjectType == 3) {
+                  _this.TestPaper.SubjectiveNumber += 1;
+                }
+                if (rs.subjectType == 4) {
+                  _this.TestPaper.VoiceNumber += 1;
+                }
               }
+
             });
+            console.log(_this.arr2)
           });
         }
       },
 <template>
   <div class="app-container">
     <div class="seetingsDiv" style="">
-      <el-button type="primary" @click="dialogAddTestPaperVIsible=true">添加试卷
-      </el-button>
+      <div class="flex" style="width: 85%">
+				<el-form :inline="true" class="demo-form-inline">
+
+          <el-form-item label="试卷名称:" class="el-form-item-custom"   >
+            <el-input v-model="parameter.TestPaperTitle" placeholder="请输入试卷名称"></el-input>
+          </el-form-item>
+
+          <el-form-item label="自定义名称:" class="el-form-item-custom"   >
+            <el-input v-model="parameter.CustomName" placeholder="请输入自定义名称"></el-input>
+          </el-form-item>
+          <el-form-item label="分类" class="el-form-item-custom"  >
+            <el-cascader class="testpaper-input" v-model="parameter.TestPaperClassId"
+              :props="{emitPath:false}" :clearable=true :options="QuestionClass">
+            </el-cascader>
+          </el-form-item> 
+
+
+          <el-form-item label="工种" class="el-form-item-custom"  >
+            <el-select v-model="parameter.UserTypeOfWork" placeholder="请选择工种">
+              <el-option value="0">全部</el-option>
+              <el-option v-for="item in usertypelist" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="级别"  class="el-form-item-custom" >
+          <el-select v-model="parameter.FLevelCount" placeholder="请选择级别"   style="width:100%">
+            <el-option value="-1">全部</el-option>
+            <el-option v-for="item in levellist" :label="item.title" :value="item.f_count"></el-option>
+          </el-select>
+        </el-form-item>
+					<el-form-item>
+						<el-button type="success" @click="search">搜索</el-button>
+			      <el-button type="primary" @click="dialogAddTestPaperVIsible=true">添加试卷
+            </el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+
     </div>
     <el-table :data="testpaperlist" id="QuestionTable" border
       style="width: 100%;border-radius: 5px;box-shadow: 0 0 10px #efefef;margin-top: 10px;" :stripe='true'>
@@ -16,6 +52,13 @@
           <span>{{ scope.row.TestPaperTitle }}</span>
         </template>
       </el-table-column>
+
+      <el-table-column prop="date" label="自定义名称" width="300">
+        <template slot-scope="scope">
+          <span>{{ scope.row.CustomName }}</span>
+        </template>
+      </el-table-column>
+
       <el-table-column prop="date" label="试卷总分" width="80">
         <template slot-scope="scope">
           <span>{{ scope.row.TotalScore }}</span>
@@ -107,6 +150,10 @@
           <el-form-item label="试卷名称:" class="el-form-item-custom"  prop="TestPaperTitle">
             <el-input v-model="TestPaper.TestPaperTitle" placeholder="请输入试卷标题"></el-input>
           </el-form-item>
+
+          <el-form-item label="自定义名称:" class="el-form-item-custom"  prop="CustomName">
+            <el-input v-model="TestPaper.CustomName" placeholder="请输入自定义名称"></el-input>
+          </el-form-item>
           <el-form-item label="分类" class="el-form-item-custom" prop="TestPaperClassId">
             <el-cascader class="testpaper-input" v-model="TestPaper.TestPaperClassId" style="width:400px;"
               :props="{emitPath:false}" :clearable=true :options="QuestionClass">
@@ -160,7 +207,7 @@
             <el-input class="testpaper-input" :rows="10" type="textarea" v-model="TestPaper.Describe">
             </el-input>
           </el-form-item>
-          <el-button type="primary" style="float: right;" @click="SubmitTestPaper">保存1
+          <el-button type="primary" style="float: right;" @click="SubmitTestPaper">保存
           </el-button>
           <div style="clear: both;"></div>
         </el-form>
@@ -186,6 +233,10 @@
     GetTypeSetting
   } from '@/api/user'
   import { formatTime } from '@/utils/util'
+
+  import { GetpaperLevelList } from "@/api/paperLevel";
+
+
   let that = {};
   let list = [];
   export default {
@@ -201,6 +252,7 @@
           status: 1
         },
         Count: 0,
+        levellist:[],
         testpaperlist: [],
         dialogAddTestPaperVIsible: false,
         dialogQuestionVlsible: false,
@@ -319,8 +371,19 @@
       this.parameter.pageSize = Math.floor(lineNumber / 49)
       this.getTestPaperListHeadler();
       this.getQuestionClassListHeadler();
+
+      GetpaperLevelList({ pageSize: 1000, sortOrder: 'asc' }).then(res => {
+        if (res.data) {
+          this.levellist = res.data.data || [];
+        }
+      });
+
+
     },
     methods: {
+      search(){ 
+        this.getTestPaperListHeadler();
+      },
       changetimestartend(val, aa) {
         this.TestPaper.EffectiveStartTime = formatTime(val[0])
         this.TestPaper.EffectiveEndTime = formatTime(val[1])
@@ -470,22 +533,27 @@
 </script>
 <style scoped>
-  .seetingsDiv {
-    width: 100%;
-    height: 60px;
-    background: #efefef;
-    line-height: 60px;
-    border-radius: 5px;
-    box-shadow: 0 0 5px #cdcdcd;
-  }
+.seetingsDiv {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		padding-top: 10px;
+		padding-left: 10px;
+		height: 126px;
+		background: #efefef;
+		line-height: initial !important;
+		border-radius: 5px;
+		box-shadow: 0 0 5px #cdcdcd;
+		justify-content: space-between;
+	}
-  .seetingsDiv button {
-    background-color: #304156;
-    border: 0px;
-    margin-left: 10px;
-    box-shadow: 0 0 5px #cdcdcd;
-    float: right;
-    margin-top: 12px;
-    margin-right: 10px;
-  }
+	.seetingsDiv button {
+		height: 40px;
+		background-color: #304156;
+		border: 0px;
+		margin-left: 10px;
+		box-shadow: 0 0 5px #cdcdcd;
+		float: none;
+		margin-right: 10px;
+	}
 </style>
 \ No newline at end of file
@@ -29,7 +29,7 @@
 			<el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;"
 				@click.native.prevent="handleLogin">登录</el-button>
-			<div style="text-align: center;color: #FFF;">技术支持：成都安第斯信息技术有限公司</div>
+			<!-- <div style="text-align: center;color: #FFF;">技术支持：成都安第斯信息技术有限公司</div> -->
 			<!-- 	<div class="tips">
 				<span style="margin-right:20px;">username: admin</span>
@@ -50,14 +50,14 @@
 		data() {
 			const validateUsername = (rule, value, callback) => {
 				if (!validUsername(value)) {
-					callback(new Error('Please enter the correct user name'))
+					callback(new Error('请输入登录的用户名'))
 				} else {
 					callback()
 				}
 			}
 			const validatePassword = (rule, value, callback) => {
 				if (value.length < 6) {
-					callback(new Error('The password can not be less than 6 digits'))
+					callback(new Error('密码长度最低6位'))
 				} else {
 					callback()
 				}
@@ -114,7 +114,7 @@
 						this.$store.dispatch('user/login', this.loginForm).then(() => {
 							this.$router.push({
 								path: this.redirect || '/'
-							})
+							}) 
 							this.loading = false
 						}).catch((ret) => {
 							console.log();
@@ -526,6 +526,7 @@
 		SelectPhoneBool,
 		ChangeClass
 	} from "@/api/user";
+	import BASE_URL from '@/common/config.js'
 	import {
 		GetUserClassList,
 		UserClassCreate,