From cac28d7513752d5c0b7412983e7578e25177dd83 Mon Sep 17 00:00:00 2001
From: wesley <470822125@qq.com>
Date: Wed, 23 Mar 2022 23:52:48 +0800
Subject: [PATCH] 问卷 用户  维度

---
 src/views/QuestionBank/index.vue        |  12 ++++++++++++
 src/views/TestPaper/ManualTestPaper.vue | 797 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/TestPaper/TestPaperList.vue   |  32 ++++++++++++++++++++++++++------
 src/views/user/userlist.vue             |  60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 4 files changed, 503 insertions(+), 398 deletions(-)

diff --git a/src/views/QuestionBank/index.vue b/src/views/QuestionBank/index.vue
index 63cb74b..f66502f 100644
--- a/src/views/QuestionBank/index.vue
+++ b/src/views/QuestionBank/index.vue
@@ -257,9 +257,20 @@
                   placeholder="请输入答案"
                   v-model="scope.row.optionContent"
                   class="optionInput"
+                  style="width:68% !important"
                 >
                   <template slot="prepend">{{ scope.row.option }}</template>
                 </el-input>
+
+                <el-input
+                placeholder="维度分值"
+                v-model="scope.row.score"
+                class="optionInput"
+                style="width:21% !important;margin-left:1%"
+              > 
+              </el-input> 
+
+
                 <i class="el-icon-circle-plus el-icon" @click="Addlist"></i>
                 <i
                   class="el-icon-remove el-icon"
@@ -268,6 +279,7 @@
                 ></i>
               </template>
             </el-table-column>
+      
           </el-table>
         </el-form-item>
         <el-form-item
diff --git a/src/views/TestPaper/ManualTestPaper.vue b/src/views/TestPaper/ManualTestPaper.vue
index 1ce0e5e..91257e1 100644
--- a/src/views/TestPaper/ManualTestPaper.vue
+++ b/src/views/TestPaper/ManualTestPaper.vue
@@ -1,420 +1,455 @@
 <template>
-	<div class="app-container">
-		<el-row :gutter="20">
-			<el-col :span="6" :style="{'height':contentHeight+'px'}">
-				<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>
-              <el-tab-pane label="测评类" name="1"></el-tab-pane>
-            </el-tabs>
-			<div style="padding:0 10px">
-				<el-input size="small" placeholder="输入关键字搜索" v-model="parameter.keyWord"></el-input>
-			</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">{{ i.subject }}</li>
-				<p v-if="loading" style="text-align: center;color: #cdcdcd;" class="unmover">加载中...</p>
-				<p v-if="noMore" style="text-align: center;color: #cdcdcd;" class="unmover">没有更多了</p>
-			</draggable>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :span="6" :style="{'height':contentHeight+'px'}">
+        <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>
+            <el-tab-pane label="测评类" name="1"></el-tab-pane>
+          </el-tabs>
+          <div style="padding:0 10px">
+            <el-input size="small" placeholder="输入关键字搜索" v-model="parameter.keyWord"></el-input>
+          </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">{{ i.subject }}</li>
+            <p v-if="loading" style="text-align: center;color: #cdcdcd;" class="unmover">加载中...</p>
+            <p v-if="noMore" style="text-align: center;color: #cdcdcd;" class="unmover">没有更多了</p>
+          </draggable>
 
-				</div>
-			</el-col>
-			<el-col :span="10" :style="{'height':contentHeight+'px'}">
-				<div class="grid-content bg-purple">
-					<div class="areahead">
-						<span v-show="!edit" style="font-weight: bold;">{{ TestPaper.TestPaperTitle }}</span>
-						<el-input v-show="edit" style="width: 400px;" v-model="TestPaper.TestPaperTitle"></el-input>
-						<i :class="{'el-icon-edit': !edit, 'el-icon-check': edit}" @click="edit = !edit"
-							style="margin-left: 5px;cursor: pointer;"></i>
-					</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;">
-						<li v-for="i in arr2" class="infinite-list-item">
-							<label>[{{i.subjectName}}]{{ i.subject }}</label>
-							<div v-for="item in JSON.parse(i.subjectContent)">
-								<p class="option-p">{{item.option}}:{{item.optionContent}}</p>
-							</div>
-						</li>
-						</li>
-					</draggable>
-				</div>
-			</el-col>
-			<el-col :span="8" :style="{'height':contentHeight+'px'}">
-				<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">
-							{{TestPaper.TestPaperTitle}}
-						</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>
-							<span style="margin-right: 10px;">多选题：{{TestPaper.MultipleNumber}}</span>
-							<span style="margin-right: 10px;">主观题：{{TestPaper.SubjectiveNumber}}</span>
-						</el-form-item>
-						<el-form-item label="题目总分:" class="el-form-item-custom">
-							{{TestPaper.TotalScore}}
-						</el-form-item>
-						<el-form-item label="分类" class="el-form-item-custom">
-							<el-cascader class="testpaper-input" v-model="TestPaper.QuestionClassId"
-								style="width:400px;margin-bottom: 20px;" :props="{emitPath:false}" :clearable=true
-								:options="QuestionClass">
-							</el-cascader>
-						</el-form-item>
-						<el-form-item label="试卷原价:" prop="OriginalPrice" v-show="false">
-							<el-input class="testpaper-input" oninput="value=value.replace(/[^0-9.]/g,'')"
-								v-model="TestPaper.OriginalPrice" :precision="0">
-								<template slot="append">元</template>
-							</el-input>
-						</el-form-item>
-						<el-form-item label="试卷价格:" prop="PresentPrice">
-							<el-input class="testpaper-input" oninput="value=value.replace(/[^0-9.]/g,'')"
-								v-model="TestPaper.PresentPrice">
-								<template slot="append">元</template>
-							</el-input>
-						</el-form-item>
-						<el-form-item label="会员价:" prop="MembershipPrice" v-show="false">
-							<el-input class="testpaper-input" oninput="value=value.replace(/[^0-9.]/g,'')"
-								v-model="TestPaper.MembershipPrice">
-								<template slot="append">元</template>
-							</el-input>
-						</el-form-item>
-						<el-form-item label="试卷简介:">
-							<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">保存
-						</el-button>
-					</el-form>
-				</div>
-			</el-col>
-		</el-row>
-	</div>
+        </div>
+      </el-col>
+      <el-col :span="10" :style="{'height':contentHeight+'px'}">
+        <div class="grid-content bg-purple">
+          <div class="areahead">
+            <span v-show="!edit" style="font-weight: bold;">{{ TestPaper.TestPaperTitle }}</span>
+            <el-input v-show="edit" style="width: 400px;" v-model="TestPaper.TestPaperTitle"></el-input>
+            <i :class="{'el-icon-edit': !edit, 'el-icon-check': edit}" @click="edit = !edit"
+              style="margin-left: 5px;cursor: pointer;"></i>
+          </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;">
+            <li v-for="i in arr2" class="infinite-list-item">
+              <label>[{{i.subjectName}}]{{ i.subject }}</label>
+              <div v-for="item in JSON.parse(i.subjectContent)">
+                <p class="option-p">{{item.option}}:{{item.optionContent}}</p>
+              </div>
+            </li>
+            </li>
+          </draggable>
+        </div>
+      </el-col>
+      <el-col :span="8" :style="{'height':contentHeight+'px'}">
+        <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">
+              {{TestPaper.TestPaperTitle}}
+            </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>
+              <span style="margin-right: 10px;">多选题：{{TestPaper.MultipleNumber}}</span>
+              <span style="margin-right: 10px;">主观题：{{TestPaper.SubjectiveNumber}}</span>
+            </el-form-item>
+            <el-form-item label="题目总分:" class="el-form-item-custom">
+              {{TestPaper.TotalScore}}
+            </el-form-item>
+
+
+            <el-form-item label="分类" class="el-form-item-custom">
+              <el-cascader class="testpaper-input" v-model="TestPaper.QuestionClassId"
+                style="width:400px;margin-bottom: 20px;" :props="{emitPath:false}" :clearable=true
+                :options="QuestionClass">
+              </el-cascader>
+            </el-form-item>
+
+            <el-form-item label="有效时间" required>
+              <el-form-item prop="date1">
+                <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="结束时间">
+                </el-date-picker>
+              </el-form-item>
+            </el-form-item>
+            <el-form-item label="总时长控制" :prop="AnswerTime">
+              <el-input class="testpaper-input" type="number" placeholder="总时长控制(分钟)" v-model="TestPaper.AnswerTime">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="试卷原价:" prop="OriginalPrice" v-show="false">
+              <el-input class="testpaper-input" oninput="value=value.replace(/[^0-9.]/g,'')"
+                v-model="TestPaper.OriginalPrice" :precision="0">
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="试卷价格:" prop="PresentPrice" v-show="false">
+              <el-input class="testpaper-input" oninput="value=value.replace(/[^0-9.]/g,'')"
+                v-model="TestPaper.PresentPrice">
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="会员价:" prop="MembershipPrice" v-show="false">
+              <el-input class="testpaper-input" oninput="value=value.replace(/[^0-9.]/g,'')"
+                v-model="TestPaper.MembershipPrice">
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="试卷简介:">
+              <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">保存
+            </el-button>
+          </el-form>
+        </div>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
-import draggable from "vuedraggable";
-import { getQuestionClassList, getQuestionList } from "@/api/QuestionBank";
-import { EditTestPaper, GetToplevel } from "@/api/TestPaper";
-export default {
-  //注册draggable组件
-  components: {
-    draggable,
-  },
-  data() {
-    return {
-      activeTab: "6",
-      parameter: {
-        pageIndex: 0,
-        pageSize: 20,
-        sort: "id",
-        sortOrder: 1,
-        keyWord: "",
-        QuestionClassId: 6,
-        status: 1,
-      },
-      contentHeight: 0,
-      count: 0,
-      edit: false,
-      arr1: [],
-      arr2: [],
-      moveId: -1,
-      TestPaper: {
-        TestPaperTitle: "未命名试卷标题",
-        TestPaperClassId: 0,
-        TotalScore: 0,
-        Describe: "",
-        SingleNumber: 0,
-        MultipleNumber: 0,
-        SubjectiveNumber: 0,
-        OriginalPrice: "0",
-        PresentPrice: "0",
-        MembershipPrice: "0",
-        QuestionBankIds: [],
-      },
-      loading: false,
-      rules: {
-        OriginalPrice: [
-          {
-            required: true,
-            message: "不能为空",
-          },
-        ],
-        PresentPrice: [
-          {
-            required: true,
-            message: "不能为空",
-          },
-        ],
-        MembershipPrice: [
+  import draggable from "vuedraggable";
+  import { getQuestionClassList, getQuestionList } from "@/api/QuestionBank";
+  import { EditTestPaper, GetToplevel } from "@/api/TestPaper";
+  import { formatTime } from '@/utils/util'
+  export default {
+    //注册draggable组件
+    components: {
+      draggable,
+    },
+    data() {
+      return {
+        activeTab: "6",
+        parameter: {
+          pageIndex: 0,
+          pageSize: 20,
+          sort: "id",
+          sortOrder: 1,
+          keyWord: "",
+          QuestionClassId: 6,
+          status: 1,
+        },
+        contentHeight: 0,
+        count: 0,
+        edit: false,
+        arr1: [],
+        arr2: [],
+        moveId: -1,
+        TestPaper: {
+          TestPaperTitle: "未命名试卷标题",
+          TestPaperClassId: 0,
+          TotalScore: 0,
+          Describe: "",
+          SingleNumber: 0,
+          MultipleNumber: 0,
+          SubjectiveNumber: 0,
+          OriginalPrice: "0",
+          PresentPrice: "0",
+          MembershipPrice: "0",
+          QuestionBankIds: [],
+        },
+        loading: false,
+        rules: {
+          OriginalPrice: [
+            {
+              required: true,
+              message: "不能为空",
+            },
+          ],
+          PresentPrice: [
+            {
+              required: true,
+              message: "不能为空",
+            },
+          ],
+          MembershipPrice: [
+            {
+              required: true,
+              message: "不能为空",
+            },
+          ],
+        },
+        QuestionClass: [],
+        treeData: [
           {
-            required: true,
-            message: "不能为空",
+            value: 0,
+            label: "全部",
           },
         ],
+        timeout: 0,
+      };
+    },
+    watch: {
+      activeTab() {
+        console.log("activeTab watch");
+        this.search();
       },
-      QuestionClass: [],
-      treeData: [
-        {
-          value: 0,
-          label: "全部",
+      "parameter.keyWord": {
+        handler() {
+          clearTimeout(this.timeout);
+          this.timeout = setTimeout(() => {
+            this.search();
+          }, 200);
         },
-      ],
-      timeout: 0,
-    };
-  },
-  watch: {
-    activeTab() {
-      console.log("activeTab watch");
-      this.search();
-    },
-    "parameter.keyWord": {
-      handler() {
-        clearTimeout(this.timeout);
-        this.timeout = setTimeout(() => {
-          this.search();
-        }, 200);
       },
     },
-  },
-  computed: {
-    noMore() {
-      return this.arr1.length >= this.count;
-    },
-    disabled() {
-      return this.loading || this.noMore;
+    computed: {
+      noMore() {
+        return this.arr1.length >= this.count;
+      },
+      disabled() {
+        return this.loading || this.noMore;
+      },
     },
-  },
-  created() {},
-  mounted() {
-    //计算页面内容区域的高度
-    this.contentHeight = window.innerHeight - 90;
-    this.getQuestionClassListHeadler();
-    //this.GetList();
-  },
-  methods: {
-    search() {
-      this.parameter.pageIndex = 1;
-      this.parameter.QuestionClassId = Number(this.activeTab);
-      this.GetList();
+    created() { },
+    mounted() {
+      //计算页面内容区域的高度
+      this.contentHeight = window.innerHeight - 90;
+      this.getQuestionClassListHeadler();
+      //this.GetList();
     },
-    SubmitTestPaper() {
-      if (this.arr2.length > 0) {
-        EditTestPaper(this.TestPaper).then((res) => {
-          if (res.data.code == 200) {
-            this.$confirm("组卷成功！", "消息");
-          } else {
-            this.$confirm("组卷失败！", "消息");
+    methods: {
+      changetimestartend(val, aa) {
+        this.TestPaper.EffectiveStartTime = formatTime(val[0])
+        this.TestPaper.EffectiveEndTime = formatTime(val[1]) 
+      },
+      search() {
+        this.parameter.pageIndex = 1;
+        this.parameter.QuestionClassId = Number(this.activeTab);
+        this.GetList();
+      },
+      SubmitTestPaper() {
+        if (this.arr2.length > 0) {
+          EditTestPaper(this.TestPaper).then((res) => {
+            if (res.data.code == 200) {
+              this.$confirm("组卷成功！", "消息");
+            } else {
+              this.$confirm("组卷失败！", "消息");
+            }
+          });
+        } else {
+          this.$confirm("试题未有题目！", "消息");
+        }
+      },
+      load() {
+        this.loading = true;
+        this.parameter.pageIndex++;
+        this.GetList();
+        this.loading = false;
+      },
+      GetList() {
+        getQuestionList(this.parameter).then((res) => {
+          if (this.parameter.pageIndex == 1) {
+            this.arr1 = [];
           }
+          res.data.data.rows.forEach((item, i) => {
+            this.arr1.push(item);
+          });
+          this.count = res.data.data.total;
+          this.$forceUpdate();
         });
-      } else {
-        this.$confirm("试题未有题目！", "消息");
-      }
-    },
-    load() {
-      this.loading = true;
-      this.parameter.pageIndex++;
-      this.GetList();
-      this.loading = false;
-    },
-    GetList() {
-      getQuestionList(this.parameter).then((res) => {
-        if (this.parameter.pageIndex == 1) {
-          this.arr1 = [];
+      },
+      end1(e) {
+        var that = this;
+        if (that.arr1.length < 10) {
+          this.load();
         }
-        res.data.data.rows.forEach((item, i) => {
-          this.arr1.push(item);
-        });
-        this.count = res.data.data.total;
-        this.$forceUpdate();
-      });
-    },
-    end1(e) {
-      var that = this;
-      if (that.arr1.length < 10) {
-        this.load();
-      }
 
-      var items = this.arr2.filter(function (m) {
-        return m.id == that.moveId;
-      });
+        var items = this.arr2.filter(function (m) {
+          return m.id == that.moveId;
+        });
 
-      //如果左边
-      if (items.length < 2) return;
-      this.arr2.splice(e.newDraggableIndex, 1);
+        //如果左边
+        if (items.length < 2) return;
+        this.arr2.splice(e.newDraggableIndex, 1);
 
-      //	SingleNumber:0,
-      // MultipleNumber:0,
-      // SubjectiveNumber:0,
-    },
-    //从右边移除到左边
-    RemoveHere(e) {
-      if (e.item._underlying_vm_.subjectType == 1) {
-        this.TestPaper.SingleNumber -= 1;
-      }
-      if (e.item._underlying_vm_.subjectType == 2) {
-        this.TestPaper.MultipleNumber -= 1;
-      }
-      if (e.item._underlying_vm_.subjectType == 3) {
-        this.TestPaper.SubjectiveNumber -= 1;
-      }
-      this.TestPaper.TotalScore -= e.item._underlying_vm_.fraction;
-      this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
-    },
-    //从左边添加到右边
-    ComeHere(e) {
-      if (e.item._underlying_vm_.subjectType == 1) {
-        this.TestPaper.SingleNumber += 1;
-      }
-      if (e.item._underlying_vm_.subjectType == 2) {
-        this.TestPaper.MultipleNumber += 1;
-      }
-      if (e.item._underlying_vm_.subjectType == 3) {
-        this.TestPaper.SubjectiveNumber += 1;
-      }
-      this.TestPaper.TotalScore += e.item._underlying_vm_.fraction;
+        //	SingleNumber:0,
+        // MultipleNumber:0,
+        // SubjectiveNumber:0,
+      },
+      //从右边移除到左边
+      RemoveHere(e) {
+        if (e.item._underlying_vm_.subjectType == 1) {
+          this.TestPaper.SingleNumber -= 1;
+        }
+        if (e.item._underlying_vm_.subjectType == 2) {
+          this.TestPaper.MultipleNumber -= 1;
+        }
+        if (e.item._underlying_vm_.subjectType == 3) {
+          this.TestPaper.SubjectiveNumber -= 1;
+        }
+        this.TestPaper.TotalScore -= e.item._underlying_vm_.fraction;
+        this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
+      },
+      //从左边添加到右边
+      ComeHere(e) {
+        if (e.item._underlying_vm_.subjectType == 1) {
+          this.TestPaper.SingleNumber += 1;
+        }
+        if (e.item._underlying_vm_.subjectType == 2) {
+          this.TestPaper.MultipleNumber += 1;
+        }
+        if (e.item._underlying_vm_.subjectType == 3) {
+          this.TestPaper.SubjectiveNumber += 1;
+        }
+        this.TestPaper.TotalScore += e.item._underlying_vm_.fraction;
 
-      this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
-    },
-    //右边往左边拖动时的事件
-    end2(e) {
-      var that = this;
-      var items = this.arr1.filter(function (m) {
-        return m.id == that.moveId;
-      });
-      //如果左边
-      if (items.length < 2) return;
-      this.arr1.splice(e.newDraggableIndex, 1);
-    },
-    //move回调方法
-    onMove(e, originalEvent) {
-      //this.moveId = e.relatedContext.element.id;
-      return true;
-    },
-    getQuestionClassListHeadler() {
-      let _this = this;
-      GetToplevel().then((res) => {
-        var gettree = function (titem) {
-          titem.children = [];
-          let childrenList = res.data.data.filter(
-            (u) => u.ParentId == titem.value
-          );
-          if (childrenList.length == 0) titem.children = undefined;
+        this.TestPaper.QuestionBankIds = this.arr2.map((u) => u.id);
+      },
+      //右边往左边拖动时的事件
+      end2(e) {
+        var that = this;
+        var items = this.arr1.filter(function (m) {
+          return m.id == that.moveId;
+        });
+        //如果左边
+        if (items.length < 2) return;
+        this.arr1.splice(e.newDraggableIndex, 1);
+      },
+      //move回调方法
+      onMove(e, originalEvent) {
+        //this.moveId = e.relatedContext.element.id;
+        return true;
+      },
+      getQuestionClassListHeadler() {
+        let _this = this;
+        GetToplevel().then((res) => {
+          var gettree = function (titem) {
+            titem.children = [];
+            let childrenList = res.data.data.filter(
+              (u) => u.ParentId == titem.value
+            );
+            if (childrenList.length == 0) titem.children = undefined;
+            res.data.data
+              .filter((u) => u.ParentId == titem.value)
+              .forEach((item, i) => {
+                var model = {
+                  value: item.id,
+                  label: item.ClassTitle,
+                };
+                gettree(model);
+                titem.children.push(model);
+              });
+          };
           res.data.data
-            .filter((u) => u.ParentId == titem.value)
+            .filter((u) => u.ParentId == 0)
             .forEach((item, i) => {
               var model = {
                 value: item.id,
                 label: item.ClassTitle,
               };
               gettree(model);
-              titem.children.push(model);
+              _this.QuestionClass.push(model);
+              _this.treeData.push(model);
             });
-        };
-        res.data.data
-          .filter((u) => u.ParentId == 0)
-          .forEach((item, i) => {
-            var model = {
-              value: item.id,
-              label: item.ClassTitle,
-            };
-            gettree(model);
-            _this.QuestionClass.push(model);
-            _this.treeData.push(model);
-          });
-      });
+        });
+      },
     },
-  },
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.el-row {
-  /* margin-bottom: 20px; */
-  &:last-child {
-    margin-bottom: 0;
+  .el-row {
+
+    /* margin-bottom: 20px; */
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .el-col {
+    border-radius: 4px;
   }
-}
-.el-col {
-  border-radius: 4px;
-}
-.bg-purple-dark {
-  background: #99a9bf;
-}
-.bg-purple {
-  background: #efefef;
-}
-.bg-purple-light {
-  background: #e5e9f2;
-}
-.grid-content {
-  border-radius: 4px;
-  min-height: 36px;
-  height: 100%;
-}
-.row-bg {
-  padding: 10px 0;
-  background-color: #f9fafc;
-}
-.infinite-list {
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-  &::-webkit-scrollbar {
-    width: 6px;
+
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
+
+  .bg-purple {
+    background: #efefef;
   }
-  //滚动条小方块
-  &::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    background: #304156;
+
+  .bg-purple-light {
+    background: #e5e9f2;
   }
-  //滚动条轨道
-  &::-webkit-scrollbar-track {
-    // border-radius: 10px;
-    height: 100px;
-    background: #cdcdcd;
+
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
+    height: 100%;
   }
-  .infinite-list-item {
-    padding: 10px;
-    min-height: 60px;
-    width: 95%;
-    margin: auto;
-    background-color: #fff;
-    margin-bottom: 10px;
-    border-radius: 5px;
-    box-shadow: 0 0 5px #cdcdcd;
-    &:first-child {
-      margin-top: 10px;
+
+  .row-bg {
+    padding: 10px 0;
+    background-color: #f9fafc;
+  }
+
+  .infinite-list {
+    list-style: none;
+    margin: 0px;
+    padding: 0px;
+
+    &::-webkit-scrollbar {
+      width: 6px;
+    }
+
+    //滚动条小方块
+    &::-webkit-scrollbar-thumb {
+      border-radius: 10px;
+      background: #304156;
+    }
+
+    //滚动条轨道
+    &::-webkit-scrollbar-track {
+      // border-radius: 10px;
+      height: 100px;
+      background: #cdcdcd;
+    }
+
+    .infinite-list-item {
+      padding: 10px;
+      min-height: 60px;
+      width: 95%;
+      margin: auto;
+      background-color: #fff;
+      margin-bottom: 10px;
+      border-radius: 5px;
+      box-shadow: 0 0 5px #cdcdcd;
+
+      &:first-child {
+        margin-top: 10px;
+      }
     }
   }
-}
-.option-p {
-  line-height: 15px;
-}
-.areahead {
-  text-align: center;
-  height: 60px;
-  line-height: 60px;
-  border-bottom: 1px solid #cdcdcd;
-}
-.testPaper-manager {
-  margin: 10px 20px 10px 10px;
-}
-.testPaper-manager .el-form-item {
-  margin-bottom: 20px;
-}
-.el-form-item-custom {
-  margin-bottom: 0px !important;
-}
-.testpaper-input {
-  //max-width: 400px;
-}
-</style>
+
+  .option-p {
+    line-height: 15px;
+  }
+
+  .areahead {
+    text-align: center;
+    height: 60px;
+    line-height: 60px;
+    border-bottom: 1px solid #cdcdcd;
+  }
+
+  .testPaper-manager {
+    margin: 10px 20px 10px 10px;
+  }
+
+  .testPaper-manager .el-form-item {
+    margin-bottom: 20px;
+  }
+
+  .el-form-item-custom {
+    margin-bottom: 0px !important;
+  }
+
+  .testpaper-input {
+    //max-width: 400px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/TestPaper/TestPaperList.vue b/src/views/TestPaper/TestPaperList.vue
index d1e56f6..75b3434 100644
--- a/src/views/TestPaper/TestPaperList.vue
+++ b/src/views/TestPaper/TestPaperList.vue
@@ -41,12 +41,12 @@
           <span>{{ scope.row.TestPaperClassId | typeFilters}}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="原价" width="80" v-show="false">
+      <!-- <el-table-column prop="name" label="原价" width="80" v-show="false">
         <template slot-scope="scope">
           <span>{{ scope.row.OriginalPrice/100 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="现价" width="80">
+      <el-table-column prop="name" label="现价" width="80"  v-show="false">
         <template slot-scope="scope">
           <span>{{ scope.row.PresentPrice/100 }}</span>
         </template>
@@ -55,7 +55,7 @@
         <template slot-scope="scope">
           <span>{{ scope.row.MembershipPrice/100 }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="name" label="试卷说明" :show-overflow-tooltip=true>
         <template slot-scope="scope">
           <span>{{ scope.row.Describe }}</span>
@@ -100,13 +100,25 @@
               <el-option label="面试题" value="4"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="有效时间" required>
+            <el-form-item prop="date1">
+              <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="结束时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-form-item>
+          <el-form-item label="总时长控制" :prop="AnswerTime">
+            <el-input class="testpaper-input" type="number" placeholder="总时长控制(分钟)" v-model="TestPaper.AnswerTime">
+            </el-input>
+          </el-form-item>
           <el-form-item label="试卷原价:" prop="OriginalPrice" v-show="false">
             <el-input class="testpaper-input" oninput="value=value.replace(/[^0-9.]/g,'')"
               v-model="TestPaper.OriginalPrice" :precision="0">
               <template slot="append">元</template>
             </el-input>
           </el-form-item>
-          <el-form-item label="试卷价格:" prop="PresentPrice">
+          <el-form-item label="试卷价格:" prop="PresentPrice" v-show="false">
             <el-input class="testpaper-input" oninput="value=value.replace(/[^0-9.]/g,'')"
               v-model="TestPaper.PresentPrice">
               <template slot="append">元</template>
@@ -143,8 +155,7 @@
     getTestPaperClassList
   } from '@/api/TestPaper'
   let that
-  export default {
-
+  export default { 
     data() {
       return {
         parameter: {
@@ -218,6 +229,10 @@
       this.getQuestionClassListHeadler();
     },
     methods: {
+      changetimestartend(val, aa) {
+        this.TestPaper.EffectiveStartTime = formatTime(val[0])
+        this.TestPaper.EffectiveEndTime = formatTime(val[1]) 
+      },
       closeClassDialog() {
         this.dialogAddTestPaperVIsible = false
         this.TestPaper= {
@@ -309,6 +324,11 @@
           })
         } else if (value == 'update') {
           this.dialogAddTestPaperVIsible = true
+          if (val.EffectiveStartTime && val.EffectiveEndTime) {
+            val.date = [];
+            val.date.push(val.EffectiveStartTime)
+            val.date.push(val.EffectiveEndTime)
+            }
           this.TestPaper = val
         }
       }
diff --git a/src/views/user/userlist.vue b/src/views/user/userlist.vue
index feafbda..d3978fc 100644
--- a/src/views/user/userlist.vue
+++ b/src/views/user/userlist.vue
@@ -1,19 +1,45 @@
 <template>
   <div class="app-container">
     <div class="seetingsDiv" style="">
-      <div class="flex">
-        <el-input placeholder="输入关键字搜索" v-model="query.keyword"></el-input>
-        <el-button type="success" @click="search">搜索</el-button>
-        <el-button v-if="selectedList.length" type="primary" @click="handleInviteInterview"
-          >邀请面试</el-button
-        >
+      <div class="flex" style="width:75%">
+
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="关键字">
+            <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>
+          </el-form-item>
+
+          <el-form-item label="性别">
+            <el-select v-model="query.sex" placeholder="性别">
+              <el-option label="男" value="1"></el-option>
+              <el-option label="女" value="0"></el-option>
+            </el-select>
+          </el-form-item>
+
+
+          <el-form-item>
+            <el-button type="success" @click="search">搜索</el-button>
+            <el-button v-if="selectedList.length" type="primary" @click="handleInviteInterview"
+              >邀请面试</el-button
+            >
+          </el-form-item>
+        </el-form>
+
+ 
       </div>
       <el-upload
         class="upload-demo"
-        action="/api/Account/ImportUser"
+        action="/api/Account/importUsers?UserClassId=0"
         multiple
-        :limit="3"
+        :limit="1"
+        :show-file-list="false"
         :on-exceed="handleExceed"
+        :on-success="handleSuccess"
         :file-list="fileList"
       >
         <el-button size="small" type="primary">导入用户</el-button>
@@ -39,7 +65,7 @@
         width="50"
         align="center"
       ></el-table-column>
-      <el-table-column prop="date" label="用户昵称">
+      <el-table-column prop="date" label="姓名">
         <template slot-scope="scope">
           <span>{{ scope.row.fullName }}</span>
         </template>
@@ -57,6 +83,12 @@
         </template>
       </el-table-column>
 
+      <el-table-column prop="date" label="性别">   </el-table-column>
+      <el-table-column prop="date" label="毕业院校">   </el-table-column>
+      <el-table-column prop="date" label="最高学历">   </el-table-column>专业
+      <el-table-column prop="date" label="专业">   </el-table-column>
+
+      
       <el-table-column prop="date" label="注册时间">
         <template slot-scope="scope">
           <span>{{ scope.row.addTime.replace("T", " ") }}</span>
@@ -100,6 +132,10 @@ export default {
     search(){
       this.GetUser();
     },
+    handleSuccess(){
+      this.$message.success('导入完成！');
+      this.GetUser();
+    },
     handleInviteInterview() {},
     handleSelectionChange(val) {
       console.log(val);
@@ -131,9 +167,11 @@ export default {
   display: flex;
   align-items: center;
   width: 100%;
-  height: 60px;
+  padding-top:10px;
+  padding-left:10px;
+  /* height: 60px; */
   background: #efefef;
-  line-height: 60px;
+  /* line-height: 60px; */
   border-radius: 5px;
   box-shadow: 0 0 5px #cdcdcd;
   justify-content: space-between;
--
libgit2 0.21.4