给大志哥

周超
1 parent e011bf15
Showing 4 changed files with 136 additions and 42 deletions
src/views/QuestionBank/components/EditDimension.vue
src/views/QuestionBank/index.vue
src/views/TestPaper/ManualTestPaper.vue
src/views/TestPaper/TestPaperList.vue
@@ -122,6 +122,7 @@
         activeName: '',
         dialogFormVisible: false,
         form: {},
+     
         ruleOptions: [
           { label: '大于', value: '>' },
           { label: '小于', value: '<' },
@@ -6,6 +6,7 @@
           <div class="TreeHeader">
             <label style="font-size: 18px">题目分类</label>
           </div>
+
           <div :style="{ height: TableColHeight + 'px' }" class="areadiv"
             style="margin: 10px 0 0 0; padding: 5px 0 0 0">
             <el-tabs v-model="activeTab" @tab-click="handleTabsClick" style="padding: 0 20px" :stretch="true">
@@ -18,7 +19,8 @@
               <span class="custom-tree-node" slot-scope="{ node, data }">
                 <span>{{ node.label }}</span>
                 <span style="">
-                  <el-button type="text" size="mini" @click="showClassDialog(node)" v-if="activeTab == 'first'?true:node.level<2?true:false">
+                  <el-button type="text" size="mini" @click="showClassDialog(node)"
+                    v-if="activeTab == 'first'?true:node.level<2?true:false">
                     添加下级
                   </el-button>
                   <el-button type="text" v-if="activeTab == 'second'" @click="handleEditDimension(node, data)">编辑
@@ -45,7 +47,7 @@
                 box-shadow: 0 0 10px #efefef;
                 margin-top: 10px;
               " :header-cell-class-name="headerStyle" :stripe="true">
-              <el-table-column prop="date" label="ID" width="50">
+              <el-table-column prop="date" label="ID" width="80">
                 <template slot-scope="scope">
                   <span>{{ scope.row.id }}</span>
                 </template>
@@ -144,12 +146,17 @@
     <el-dialog title="编辑题目" :visible.sync="dialogsubjectlVisible" @close="closeDialog" width="800px"
       :close-on-click-modal="false">
       <el-form ref="Dataform" :model="Dataform" label-width="60px">
+        <div style="padding:10px">
+          <el-alert v-if="FormClassType==2"
+          title="选项的维度分值如不设置将按照分值规则自动计算"
+          type="warning"></el-alert>
+        </div>
         <el-form-item label="题目">
           <el-input v-model="Dataform.subject" placeholder="请输入题目名称"></el-input>
         </el-form-item>
         <el-form-item label="分类" style="padding-top: 5px">
-          <el-cascader @change="changequestionclass" v-model="Dataform.QuestionClassId" style="width: 400px" :props="{ emitPath: false ,checkStrictly:true}"
-            :clearable="true" :options="QuestionClass">
+          <el-cascader @change="changequestionclass" v-model="Dataform.QuestionClassId" style="width: 400px"
+            :props="{ emitPath: false ,checkStrictly:true}" :clearable="true" :options="QuestionClass">
           </el-cascader>
         </el-form-item>
         <el-form-item label="题型" style="padding-top: 5px">
@@ -165,7 +172,7 @@
             <el-table-column>
               <template slot-scope="scope">
                 <el-input placeholder="请输入答案" v-model="scope.row.optionContent" class="optionInput"
-                  style="width:68% !important">
+                  style="width:47% !important">
                   <template slot="prepend">{{ scope.row.option }}</template>
                 </el-input>
  
@@ -173,7 +180,10 @@
                   style="width:21% !important;margin-left:1%">
                 </el-input>
  
-
+                <el-select v-model="scope.row.scorerule"  class="optionInput" placeholder="分值规则" v-if="FormClassType==2"  style="width:20% !important;margin-left:1%">
+                  <el-option label="" >不设置</el-option>
+                  <el-option v-for="sritem in scoreRules" :label="sritem" :value="sritem">{{sritem}}</el-option>
+                </el-select>
                 <i class="el-icon-circle-plus el-icon" @click="Addlist"></i>
                 <i class="el-icon-remove el-icon" @click="RemoveList(scope)" v-if="scope.$index != 0"></i>
               </template>
@@ -181,7 +191,7 @@
  
           </el-table>
         </el-form-item>
-        <el-form-item label="答案" v-show="OptionVisible" class="subjectContentClass"  v-if="FormClassType!=2">
+        <el-form-item label="答案" v-show="OptionVisible" class="subjectContentClass" v-if="FormClassType!=2">
           <el-radio-group v-for="(item, i) in subjectContent" v-model="Dataform.answer" v-if="GroupVisible">
             <el-radio :label="item.option">{{ item.option }}</el-radio>
           </el-radio-group>
@@ -230,7 +240,7 @@
     },
     data() {
       return {
-        FormClassType:0,
+        FormClassType: 0,
         loading: false,
         currentEditDimension: {},
         activeTab: "first",
@@ -259,12 +269,13 @@
           fraction: 0,
           singleFraction: 0,
           addTime: "2021-11-12",
-          state: 1,
+          state: 1, 
         },
         subjectContent: [
           {
             option: "A",
             optionContent: "",
+            scorerule:'高'
           },
         ],
         QuestionClass: [],
@@ -279,6 +290,7 @@
         firstTreeData: [],
         secondTreeData: [],
         CreatClassId: 0,
+        scoreRules:['高','中','低'],
       };
     },
     created() { },
@@ -295,13 +307,15 @@
       this.getQuestionClassListHeadler();
     },
     methods: {
-      AddSubject(){
+      AddSubject() { 
         this.FormClassType = 0;
+        // if(!this.Dataform.scoperule)
+        // this.Dataform.scoperule='高';
         this.dialogsubjectlVisible = true
       },
-      changequestionclass(a,b,c){ 
-        var item = this.QuestionClass.find(o=>o.id ==a);
-        if(item) this.FormClassType = item.ClassType;
+      changequestionclass(a, b, c) {
+        var item = this.QuestionClass.find(o => o.id == a);
+        if (item) this.FormClassType = item.ClassType;
       },
       //维度编辑
       handleEditDimension(node, data) {
@@ -320,10 +334,10 @@
         // console.log(node, data);
         // console.log(this.API);
         this.API.deleteQuestionClass(data.value).then((res) => {
-          
+
           this.getQuestionClassListHeadler();
  
-          this.loading = false; 
+          this.loading = false;
           this.$message.success('操作成功！');
         });
       },
@@ -341,24 +355,24 @@
       },
       //添加分类
       CreateQuestionClassHealder() {
-      if(this.loading)return;
-        this.loading=true;
-      
+        if (this.loading) return;
+        this.loading = true;
+
         this.QuestionClassInfo.Addtime = parseTime(new Date(), "");
         CreateQuestionClass(this.QuestionClassInfo).then((res) => {
           this.getQuestionClassListHeadler();
           this.dialogClassIVIsible = false;
-          setTimeout(()=>{
-              this.loading = false;
-            },1000); 
+          setTimeout(() => {
+            this.loading = false;
+          }, 1000);
         });
       },
       //获取选择的题目详细信息
       GetQuestionBankByIdHeadler(id) {
         GetQuestionBankById(id).then((res) => {
-           
-          var d = this.QuestionClass.find(o=>o.id==res.data.data.QuestionClassId);
-          if(d)this.FormClassType = d.ClassType; 
+
+          var d = this.QuestionClass.find(o => o.id == res.data.data.QuestionClassId);
+          if (d) this.FormClassType = d.ClassType;
           this.changeQuestionType(res.data.data.subjectType); //这里先初始化编辑显示内容
           this.Dataform = res.data.data; //内容赋值
           this.subjectContent = JSON.parse(res.data.data.subjectContent); //赋值选项
@@ -387,7 +401,7 @@
         this.GroupVisible = true;
       },
       //选择题目类型来判断是否显示部分表单
-      changeQuestionType(val) { 
+      changeQuestionType(val) {
         if (val == 3) {
           this.OptionVisible = false;
         }
@@ -395,7 +409,7 @@
           this.OptionVisible = true;
           this.Dataform.answer = [];
           this.GroupVisible = false;
-         
+
         }
         if (val == 1) {
           this.Dataform.answer = [];
@@ -426,7 +440,7 @@
         });
       },
       handleNodeClick(val) {
-        if(this.loading)return;
+        if (this.loading) return;
         this.parameter.QuestionClassId = val.value;
         this.parameter.pageIndex = 1;
         this.GetList();
@@ -10,10 +10,14 @@
           <div style="padding:0 10px">
             <el-input size="small" placeholder="输入关键字搜索" v-model="parameter.keyWord"></el-input>
           </div>
+          <div style="padding:10.5px">
+            <el-button type="primary" @click="randomSubject" style="width:100%">随机抽题</el-button>
+          </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">
+         
             <li v-for="i in arr1" class="infinite-list-item" :key="i.id" v-if="!classarr.some(o=>o == i.id)">{{
               i.subject }}</li>
             <p v-if="loading" style="text-align: center;color: #cdcdcd;" class="unmover">加载中...</p>
@@ -113,6 +117,40 @@
         </div>
       </el-col>
     </el-row>
+
+
+ 
+    <el-dialog title="收货地址" :visible.sync="dialogTableVisible">
+      <el-form   label-width="100px" class="demo-dynamic">
+        <el-form-item
+          prop="email"
+          label="邮箱"
+          :rules="[
+            { required: true, message: '请输入邮箱地址', trigger: 'blur' },
+            { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }
+          ]"
+        >
+          <el-input v-model="dynamicValidateForm.email"></el-input>
+        </el-form-item>
+        <el-form-item
+          v-for="(domain, index) in dynamicValidateForm.domains"
+          :label="'域名' + index"
+          :key="domain.key"
+          :prop="'domains.' + index + '.value'"
+          :rules="{
+            required: true, message: '域名不能为空', trigger: 'blur'
+          }"
+        >
+          <el-input v-model="domain.value"></el-input><el-button @click.prevent="removeDomain(domain)">删除</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="submitForm('dynamicValidateForm')">提交</el-button>
+          <el-button @click="addDomain">新增域名</el-button>
+          <el-button @click="resetForm('dynamicValidateForm')">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+
   </div>
 </template>
  
@@ -122,13 +160,20 @@
   import { GetQuestionClassByType } from "@/api/QuestionClass";
   import { EditTestPaper, GetToplevel } from "@/api/TestPaper";
   import { formatTime } from '@/utils/util'
-  export default {
+  export default {                                                                           
     //注册draggable组件
     components: {
       draggable,
     },
     data() {
       return {
+        dynamicValidateForm: {
+          domains: [{
+            value: ''
+          }],
+          email: ''
+        },
+        dialogTableVisible:false,
         loadingType:false,
         activeTab: "6",
         parameter: {
@@ -221,6 +266,34 @@
       //this.GetList();
     },
     methods: {
+      randomSubject(){
+        this.dialogTableVisible=true;
+      },
+      submitForm(formName) {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            alert('submit!');
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        this.$refs[formName].resetFields();
+      },
+      removeDomain(item) {
+        var index = this.dynamicValidateForm.domains.indexOf(item)
+        if (index !== -1) {
+          this.dynamicValidateForm.domains.splice(index, 1)
+        }
+      },
+      addDomain() {
+        this.dynamicValidateForm.domains.push({
+          value: '',
+          key: Date.now()
+        });
+      },
       changetimestartend(val, aa) {
         this.TestPaper.EffectiveStartTime = formatTime(val[0])
         this.TestPaper.EffectiveEndTime = formatTime(val[1])
@@ -155,9 +155,9 @@
     getTestPaperClassList,
     DeleteTestPaper
   } from '@/api/TestPaper'
-  import {formatTime} from '@/utils/util'
+  import { formatTime } from '@/utils/util'
   let that
-  export default { 
+  export default {
     data() {
       return {
         parameter: {
@@ -212,10 +212,16 @@
     },
     filters: {
       typeFilters(val) {
-        const data = that.list.filter(t => t.id == val)[0]
-        if (data) {
-          return data.ClassTitle
-        } else {
+        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 '未知'
+          }
+        } catch (e) {
           return '未知'
         }
       }
@@ -231,13 +237,13 @@
       this.getQuestionClassListHeadler();
     },
     methods: {
-      changetimestartend(val, aa) { 
+      changetimestartend(val, aa) {
         this.TestPaper.EffectiveStartTime = formatTime(val[0])
-        this.TestPaper.EffectiveEndTime = formatTime(val[1]) 
+        this.TestPaper.EffectiveEndTime = formatTime(val[1])
       },
       closeClassDialog() {
         this.dialogAddTestPaperVIsible = false
-        this.TestPaper= {
+        this.TestPaper = {
           TestPaperTitle: "",
           PlateClass: "4",
           TestPaperClassId: 0,
@@ -289,7 +295,7 @@
       getQuestionClassListHeadler() {
         let _this = this;
         GetToplevel().then(res => {
-          var gettree = function(titem) {
+          var gettree = function (titem) {
             titem.children = []
             let childrenList = res.data.data.filter(u => u.ParentId == titem.value);
             if (childrenList.length == 0)
@@ -330,15 +336,15 @@
             val.date = [];
             val.date.push(val.EffectiveStartTime)
             val.date.push(val.EffectiveEndTime)
-            }
+          }
           this.TestPaper = val
         }
         else if (value == 'del') {
-          DeleteTestPaper(val.id).then(rs=>{
+          DeleteTestPaper(val.id).then(rs => {
             this.$message.success('删除成功！');
             this.getTestPaperListHeadler();
           })
-        
+
         }
  
       }
@@ -365,4 +371,4 @@
     margin-top: 12px;
     margin-right: 10px;
   }
 -</style>
+</style>
 \ No newline at end of file