Merge branch 'develop' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/app.js

@@ -13,10 +13,12 @@ import apiTools from '@/api';
 import { fetch, post } from '@/filters/http';
 import VideoPlayer from 'vue-video-player';
 import jwtDecode from 'jwt-decode';
+import Loading from '@/common/Loading';
 
 require('video.js/dist/video-js.css');
 require('vue-video-player/src/custom-theme.css');
 Vue.use(VideoPlayer);
+Vue.use(Loading);
 
 //新添加的
 import vuescroll from 'vue-scroll'

TEAMModelOS/ClientApp/common/loading.vue

@@ -0,0 +1,50 @@
+<template>
+  <div class="loading-container">
+    <div id="loadingBox"></div>
+  </div>
+</template>
+
+<script>
+    export default {
+    name: "loadingBox",
+    data() {
+      return {
+      }
+    },
+    created() {
+    },
+    methods: {
+      
+    }
+    }
+</script>
+<style>
+  .loading-container {
+    position:relative;
+    width:100%;
+    height:100%;
+    background:#3cefff;
+    display:flex;
+    flex-direction:row;
+    justify-content:center;
+    align-items:center;
+  }
+
+  #loadingBox {
+    position:absolute;
+    top:500px;
+    left:46%;
+    border: 6px solid hsla(185, 100%, 62%, 0.2);
+    border-top-color: #4c9cff;
+    border-radius: 50%;
+    width: 60px;
+    height: 60px;
+    animation: spin .7s linear infinite;
+  }
+
+  @keyframes spin {
+    to {
+      transform: rotate(360deg);
+    }
+  }
+</style>

TEAMModelOS/ClientApp/view/evaluation/index/CreateExercises.vue

@@ -6,11 +6,11 @@
       <div class="exersices-attr-type my-radio-style">
         <IconText :text="'选择题型'" :color="'green'" :icon="'md-apps'"></IconText>
         <RadioGroup v-model="exersicesType" type="button" @on-change="typeChange">
-          <Radio label="single" :disabled="isEdit">单选</Radio>
-          <Radio label="multiple" :disabled="isEdit">多选</Radio>
-          <Radio label="judge" :disabled="isEdit">判断</Radio>
-          <Radio label="complete" :disabled="isEdit">填空</Radio>
-          <Radio label="subjective" :disabled="isEdit">问答</Radio>
+          <Radio label="Single" :disabled="isEdit">单选</Radio>
+          <Radio label="Multiple" :disabled="isEdit">多选</Radio>
+          <Radio label="Judge" :disabled="isEdit">判断</Radio>
+          <Radio label="Complete" :disabled="isEdit">填空</Radio>
+          <Radio label="Subjective" :disabled="isEdit">问答</Radio>
         </RadioGroup>
       </div>
       <div class="exersices-attr-diff my-radio-style">
@@ -25,11 +25,11 @@
       </div>
     </div>
 
-    <BaseSingle v-if="exersicesType=='single'" ref="single" :editInfo="editInfo"></BaseSingle>
-    <BaseMultiple v-else-if="exersicesType=='multiple'" ref="multiple" :editInfo="editInfo"></BaseMultiple>
-    <BaseJudge v-else-if="exersicesType=='judge'" ref="judge" :editInfo="editInfo"></BaseJudge>
-    <BaseCompletion v-else-if="exersicesType=='complete'" ref="complete" :editInfo="editInfo"></BaseCompletion>
-    <BaseSubjective v-else-if="exersicesType=='subjective'" ref="subjective" :editInfo="editInfo"></BaseSubjective>
+    <BaseSingle v-if="exersicesType=='Single'" ref="single" :editInfo="editInfo"></BaseSingle>
+    <BaseMultiple v-else-if="exersicesType=='Multiple'" ref="multiple" :editInfo="editInfo"></BaseMultiple>
+    <BaseJudge v-else-if="exersicesType=='Judge'" ref="judge" :editInfo="editInfo"></BaseJudge>
+    <BaseCompletion v-else-if="exersicesType=='Complete'" ref="complete" :editInfo="editInfo"></BaseCompletion>
+    <BaseSubjective v-else-if="exersicesType=='Subjective'" ref="subjective" :editInfo="editInfo"></BaseSubjective>
 
     <div class="exersices-analysis">
       <IconText :text="'解析'" :color="'#2892DD'" :icon="'md-list'" style="margin-bottom:15px;"></IconText>
@@ -110,41 +110,41 @@
       getContent: function (type) {
         let exerciseItem = Object.assign({}, defaultExercise);
         switch (type) {
-          case "single":
+          case "Single":
             exerciseItem.question = this.$refs.single._data.stemContent;
-            exerciseItem.options = this.$refs.single._data.optionsContent.length == this.$refs.single._data.options.length ? this.$refs.single._data.optionsContent : null;
+            exerciseItem.option = this.$refs.single._data.optionsContent.length == this.$refs.single._data.options.length ? this.$refs.single._data.optionsContent : null;
             exerciseItem.type = this.exersicesType;
             exerciseItem.difficulty = this.exersicesDiff;
             exerciseItem.explain = this.analysisContent;
             exerciseItem.answer = [String.fromCharCode(64 + parseInt(this.$refs.single._data.trueIndex + 1))];
             break;
-          case "multiple":
+          case "Multiple":
             exerciseItem.question = this.$refs.multiple._data.stemContent;
-            exerciseItem.options = this.$refs.multiple._data.optionsContent.length == this.$refs.multiple._data.options.length ? this.$refs.multiple._data.optionsContent : null;
+            exerciseItem.option = this.$refs.multiple._data.optionsContent.length == this.$refs.multiple._data.options.length ? this.$refs.multiple._data.optionsContent : null;
             exerciseItem.type = this.exersicesType;
             exerciseItem.difficulty = this.exersicesDiff;
             exerciseItem.explain = this.analysisContent;
             exerciseItem.answer = this.$refs.multiple._data.transferArr;
             break;
-          case "judge":
+          case "Judge":
             exerciseItem.question = this.$refs.judge._data.stemContent;
-            exerciseItem.options = [];
+            exerciseItem.option = [];
             exerciseItem.type = this.exersicesType;
             exerciseItem.difficulty = this.exersicesDiff;
             exerciseItem.explain = this.analysisContent;
             exerciseItem.answer = this.$refs.judge._data.trueAnswer;
             break;
-          case "complete":
+          case "Complete":
             exerciseItem.question = this.$refs.complete._data.stemContent;
-            exerciseItem.options = [];
+            exerciseItem.option = [];
             exerciseItem.type = this.exersicesType;
             exerciseItem.difficulty = this.exersicesDiff;
             exerciseItem.explain = this.analysisContent;
             exerciseItem.answer = this.$refs.complete._data.optionsContent.map(item => item.value);
             break;
-          case "subjective":
+          case "Subjective":
             exerciseItem.question = this.$refs.subjective._data.stemContent;
-            exerciseItem.options = [];
+            exerciseItem.option = [];
             exerciseItem.type = this.exersicesType;
             exerciseItem.difficulty = this.exersicesDiff;
             exerciseItem.explain = this.analysisContent;

TEAMModelOS/ClientApp/view/evaluation/index/ExercisesList.css

@@ -36,6 +36,7 @@
     display:flex;
     flex-direction:row;
     align-items:center;
+    justify-content:space-between;
 }
 
     .ev-list-operation .ivu-checkbox-wrapper {
@@ -46,6 +47,21 @@
         margin: 10px;
     }
 
+    .ev-list-operation .import-exercise {
+        /*margin-right:120px;*/
+        font-weight:bold;
+        color:rgb(16, 171, 231);
+        font-size:16px;
+        cursor:pointer;
+    }
+
+    .ev-list-operation .ivu-icon {
+        font-size:16px;
+        margin-right:6px;
+        cursor:pointer;
+        vertical-align:initial;
+    }
+
     .ev-list-operation .ivu-checkbox-checked .ivu-checkbox-inner {
         background: #01b4ef;
         border-color: #01b4ef;
@@ -53,8 +69,8 @@
 
     .ev-list-operation .operation-cart {
         position:absolute;
-        right:20px;
-        top:0;
+        right:100px;
+        top:5px;
         height:100%;
         padding:0 10px;
         display:flex;
@@ -162,7 +178,7 @@
         height: auto;
         padding: 20px;
         margin-top: 10px;
-        font-size: 16px;
+        font-size: 18px;
         font-weight: 600;
         background: #fff;
         /*box-shadow: 0px 5px 5px 2px rgb(187, 182, 182);*/
@@ -197,7 +213,7 @@
 
 .exercise-item .item-question {
     /*display: inline-block;*/
-    margin-top:20px;
+    /*margin-top:20px;*/
 }
 
 .exercise-item .item-difficulty {
@@ -206,7 +222,7 @@
     background: rgb(16, 171, 231);
     border-radius: 5px;
     color: #fff;
-    font-size:14px;
+    font-size:13px;
 }
 .exercise-item .item-type {
     display: inline-block;
@@ -214,13 +230,20 @@
     border: 2px solid rgb(16, 171, 231);
     border-radius: 5px;
     color: rgb(16, 171, 231);
-    font-size: 14px;
+    font-size: 13px;
+}
+
+.exercise-item .item-relevant-points{
+    display: inline-block;
+    padding: 1px 9px;
+    font-size: 13px;
 }
 
 .exercise-item .item-answer {
     display: inline-block;
     cursor:pointer;
     margin-top:12px;
+    font-size:16px;
 }
 
 .exercise-item .item-answer-item {
@@ -246,9 +269,10 @@
 }
 
 .exercise-item .item-explain {
-    display:table;
-    margin-top:10px;
+    display: table;
+    margin-top: 10px;
     cursor: pointer;
+    font-size: 16px;
 }
 
 .exercise-item .item-explain-item {
@@ -277,8 +301,8 @@
     width: 100%;
     padding: 10px 0;
     margin-top: 20px;
-    font-size:14px;
-    color:rgb(16, 171, 231);
+    font-size: 14px;
+    border-top: 1px #c3c3c34d dashed;
 }
 
     .exercise-item .item-tools .ivu-icon {
@@ -288,16 +312,35 @@
         font-weight: bold;
     }
 
-    .exercise-item .item-tools .item-tools-tool {
-        margin-left: 20px;
+    .exercise-item .item-tools .ivu-btn {
+        float:right;
+    }
+
+    .exercise-item .item-tools-tool {
+        margin-left: 10px;
         font-weight: bold;
         cursor: pointer;
         vertical-align: bottom;
+        color:rgb(16, 171, 231);
+        font-size:14px;
+    }
+    
+    .exercise-item .item-tools-tool .ivu-icon {
+        margin-left:15px;
+        vertical-align:top;
     }
 
-    .exercise-item .item-tools .item-tools-bind {
-        display:none;
-        margin-top:5px;
+    .exercise-item .item-tools-tool .item-bind-point {
+        color:rgb(128, 128, 128);
+    }
+
+
+    .exercise-item .item-tools .item-tools-info {
+        padding: 0 10px;
+        vertical-align: sub;
+        color: #868686;
+        border-right: 2px solid #d2d2d2;
+        font-size:12px;
     }
 
 

TEAMModelOS/ClientApp/view/evaluation/index/ExercisesList.vue

@@ -1,21 +1,31 @@
 <template>
   <div class="ev-list-container">
+    <Loading v-show="importLoading"></Loading>
+
     <div class="ev-header">
       <Icon type="md-bookmarks" size="30" color="rgb(16, 171, 231)" />
-      <span class="ev-title">我的题库</span>
+      <span class="ev-title">题库列表</span>
       <span class="ev-length">共 {{list.length}} 道题</span>
     </div>
     <!-- 筛选部分 -->
     <div class="filter-wrap">
+      <div class="filter-item">
+        <span class="filter-title">来源:</span>
+        <RadioGroup v-model="filterOrigin" type="button" @on-change="filterOriginChange">
+          <Radio label="self">个人私有库</Radio>
+          <Radio label="school">学校公用库</Radio>
+          <Radio label="system">系统公用库</Radio>
+        </RadioGroup>
+      </div>
       <div class="filter-item">
         <span class="filter-title">题型:</span>
         <RadioGroup v-model="filterType" type="button" @on-change="filterTypeChange">
           <Radio label="all">全部</Radio>
-          <Radio label="single">单选</Radio>
-          <Radio label="multiple">多选</Radio>
-          <Radio label="judge">判断</Radio>
-          <Radio label="complete">填空</Radio>
-          <Radio label="subjective">问答</Radio>
+          <Radio label="Single">单选</Radio>
+          <Radio label="Multiple">多选</Radio>
+          <Radio label="Judge">判断</Radio>
+          <Radio label="Complete">填空</Radio>
+          <Radio label="Subjective">问答</Radio>
         </RadioGroup>
       </div>
       <div class="filter-item">
@@ -39,6 +49,11 @@
     </div>
     <div class="ev-list-operation">
       <Checkbox v-model="isShowAnswer">展示答案与解析</Checkbox>
+      <span class="import-exercise">
+        <Upload multiple action="api/ImportExercise/uploadWord" :headers="headers" :show-upload-list="isShowUploadList" :on-success="uploadSuccess">
+          <Button type="info">导入习题</Button>
+        </Upload>
+      </span>
       <div class="operation-cart">
         <Poptip trigger="hover" title="我的试题篮" placement="bottom">
           <Badge :count="basketCount" show-zero>
@@ -49,28 +64,33 @@
             <div class="basket-body">
               <div class="basket-item">
                 <span>单选题</span>
-                <Progress :percent="basketList.all.length ? Number((basketList.single.length / basketList.all.length)*100) : 0" stroke-color="rgb(16, 171, 231)" hide-info/>
-                <span style="margin-left:10px">{{ basketList.single.length }} 道 <span class="basket-delete" @click="handleBasketDelete('single')">删除</span></span>
+                <Progress :percent="basketList.all.length ? Number((basketList.Single.length / basketList.all.length)*100) : 0" stroke-color="rgb(16, 171, 231)" hide-info />
+                <span style="margin-left:10px">{{ basketList.Single.length }} 道 <span class="basket-delete" @click="handleBasketDelete('Single')">删除</span></span>
               </div>
               <div class="basket-item">
                 <span>多选题</span>
-                <Progress :percent="basketList.all.length ? Number((basketList.multiple.length / basketList.all.length)*100) : 0" stroke-color="rgb(16, 171, 231)" hide-info/>
-                <span style="margin-left:10px">{{ basketList.multiple.length}} 道 <span class="basket-delete" @click="handleBasketDelete('multiple')">删除</span></span>
+                <Progress :percent="basketList.all.length ? Number((basketList.Multiple.length / basketList.all.length)*100) : 0" stroke-color="rgb(16, 171, 231)" hide-info />
+                <span style="margin-left:10px">{{ basketList.Multiple.length}} 道 <span class="basket-delete" @click="handleBasketDelete('Multiple')">删除</span></span>
               </div>
               <div class="basket-item">
                 <span>判断题</span>
-                <Progress :percent="basketList.all.length ? Number((basketList.judge.length / basketList.all.length)*100) : 0" stroke-color="rgb(16, 171, 231)" hide-info/>
-                <span style="margin-left:10px">{{ basketList.judge.length}} 道 <span class="basket-delete" @click="handleBasketDelete('judge')">删除</span></span>
+                <Progress :percent="basketList.all.length ? Number((basketList.Judge.length / basketList.all.length)*100) : 0" stroke-color="rgb(16, 171, 231)" hide-info />
+                <span style="margin-left:10px">{{ basketList.Judge.length}} 道 <span class="basket-delete" @click="handleBasketDelete('Judge')">删除</span></span>
               </div>
               <div class="basket-item">
                 <span>填空题</span>
-                <Progress :percent="basketList.all.length ? Number((basketList.complete.length / basketList.all.length)*100) : 0" stroke-color="rgb(16, 171, 231)" hide-info/>
-                <span style="margin-left:10px">{{ basketList.complete.length}} 道 <span class="basket-delete" @click="handleBasketDelete('complete')">删除</span></span>
+                <Progress :percent="basketList.all.length ? Number((basketList.Complete.length / basketList.all.length)*100) : 0" stroke-color="rgb(16, 171, 231)" hide-info />
+                <span style="margin-left:10px">{{ basketList.Complete.length}} 道 <span class="basket-delete" @click="handleBasketDelete('Complete')">删除</span></span>
               </div>
               <div class="basket-item">
                 <span>问答题</span>
-                <Progress :percent="basketList.all.length ? Number((basketList.subjective.length / basketList.all.length)*100) : 0" stroke-color="rgb(16, 171, 231)" hide-info/>
-                <span style="margin-left:10px">{{ basketList.subjective.length}} 道 <span class="basket-delete" @click="handleBasketDelete('subjective')">删除</span></span>
+                <Progress :percent="basketList.all.length ? Number((basketList.Subjective.length / basketList.all.length)*100) : 0" stroke-color="rgb(16, 171, 231)" hide-info />
+                <span style="margin-left:10px">{{ basketList.Subjective.length}} 道 <span class="basket-delete" @click="handleBasketDelete('Subjective')">删除</span></span>
+              </div>
+              <div class="basket-item">
+                <span>综合题</span>
+                <Progress :percent="basketList.all.length ? Number((basketList.Compose.length / basketList.all.length)*100) : 0" stroke-color="rgb(16, 171, 231)" hide-info />
+                <span style="margin-left:10px">{{ basketList.Compose.length}} 道 <span class="basket-delete" @click="handleBasketDelete('Compose')">删除</span></span>
               </div>
             </div>
             <div :class="[basketList.all.length ? 'basket-footer' : 'basket-footer-no']">
@@ -85,21 +105,36 @@
     <div v-if="list.length == 0">暂无数据</div>
     <div class="content-wrap" v-else>
       <div class="exercise-item" v-for="(item,index) of list">
-        <span class="item-difficulty" :style="{backgroundColor:diffColors[item.difficulty]}">{{exersicesDiff[item.difficulty]}}</span>
-        <span class="item-type">{{exersicesType[item.type]}}</span>
+        <div>
+          <span class="item-difficulty" :style="{backgroundColor:diffColors[item.difficulty || 3]}">{{exersicesDiff[item.difficulty || 3]}}</span>
+          <span class="item-type">{{exersicesType[item.type]}}</span>
+          <span class="item-relevant-points">
+            <span class="item-tools-bind">
+              <span class="item-tools-tool">
+                <span class="item-bind-point">已关联知识点：</span>
+                <span class="item-bind-point">字音辨析</span>
+                <span class="item-bind-point">字音辨析</span>
+                <span class="item-bind-point">字音辨析</span>
+                <span class="item-bind-point">字音辨析</span>
+                <Icon type="md-link" size="20" />
+                <span @click="handleBindPoint">绑定知识点</span>
+              </span>
+            </span>
+          </span>
+        </div>
         <div class="item-question">
           <p>{{index+1}} : <span v-html="item.question"></span></p>
         </div>
-        <div v-for="(option,optionIndex) in item.options">
+        <div v-for="(option,optionIndex) in item.option">
           <p>{{String.fromCharCode(64 + parseInt(optionIndex+1))}} : <span v-html="option.value"></span></p>
         </div>
         <div class="item-answer">
           <span class="answer-title-line"></span>
           <span class="answer-title" @click="showAnswer($event,'answer')">答案：点击展开答案详情</span>
           <div class="item-answer-details">
-            <span v-html="item.answer" v-if="item.type == 'subjective'"></span>
-            <span :class="[ item.type == 'complete' ? 'item-answer-item':'']" v-for="answer in item.answer" v-else-if="item.type == 'complete'" v-html="answer"></span>
-            <span :class="[ item.type == 'complete' ? 'item-answer-item':'']" v-for="answer in item.answer" v-else>{{answer}}</span>
+            <span v-html="item.answer" v-if="item.type == 'Subjective'"></span>
+            <span :class="[ item.type == 'Complete' ? 'item-answer-item':'']" v-for="answer in item.answer" v-else-if="item.type == 'Complete'" v-html="answer"></span>
+            <span :class="[ item.type == 'Complete' ? 'item-answer-item':'']" v-for="answer in item.answer" v-else>{{answer}}</span>
 
           </div>
         </div>
@@ -111,13 +146,13 @@
           </div>
         </div>
         <div class="item-tools">
-          <Button type="primary" @click="handleEdit(item)">编辑题目</Button>
-          <Button type="info" @click="handleChoose(item)">选题</Button>
-          <span class="item-tools-bind">
-            <span class="item-tools-tool" @click="handleBindPoint"><Icon type="ios-link" />绑定知识点</span>
-            <span class="item-tools-tool"><Icon type="ios-link" />绑定科目</span>
-            <span class="item-tools-tool"><Icon type="ios-link" />绑定课纲</span>
-          </span>
+
+          <span class="item-tools-info">来源：浙江省温州市2019年中考数学试卷</span>
+          <span class="item-tools-info">使用次数：98 次</span>
+          <span class="item-tools-info" style="border:0">更新时间：2019-07-01</span>
+
+          <Button type="info" @click="handleChoose(item)">{{basketList.all.indexOf(item) > -1 ? '已选入' : '选题'}}</Button>
+          <Button type="primary" @click="handleEdit(item)" style="margin-right:10px">编辑题目</Button>
         </div>
       </div>
     </div>
@@ -139,7 +174,7 @@
       <div class="point-list">
         <p class="bind-title">选择知识点</p>
         <Input search placeholder="搜索知识点..." v-model="searchWord" @on-change="filterChange" />
-        <Tabs value="school">
+        <Tabs v-model="tabSelectVal">
           <TabPane label="校本知识点" name="school">
             <Tree :data="knowPointList" ref="pointTree" :render="renderContent" @on-check-change="pointTreeCheck" check-strictly></Tree>
           </TabPane>
@@ -151,19 +186,21 @@
       </div>
 
       <div class="selected-point-list">
-        <p class="bind-title">已选知识点<span style="font-weight:500"> (最多绑定5个知识点)</span><span class="btn-clear" @click="handleClearChecked">清空</span></p>
-        <span class="checked-point" v-for="item in checkedPointList">{{item.name}}<Icon type="md-close" color="#fff" style="margin-left:5px;cursor:pointer" @click="deleteCheckedPoint(item)"/></span>
+        <p class="bind-title">已选知识点<span style="font-weight:500;font-size:12px"> (最多绑定5个知识点,颜色代表不同来源)</span><span class="btn-clear" @click="handleClearChecked">清空</span></p>
+        <span class="checked-point" :style="{background:item.origin=='school'?'#10abe7':'#12b9ab'}" v-for="item in checkedPointList">{{item.name}}<Icon type="md-close" color="#fff" style="margin-left:5px;cursor:pointer" @click="deleteCheckedPoint(item)" /></span>
       </div>
     </Modal>
   </div>
 </template>
 <script>
   import IconText from '@/components/evaluation/IconText.vue'
+  import Loading from '@/common/Loading.vue'
   import questions from './list.json'
 import { setTimeout } from 'core-js';
   export default {
     components: {
-      IconText
+      IconText,
+      Loading
     },
     data() {
       return {
@@ -172,63 +209,74 @@ import { setTimeout } from 'core-js';
         basketCount: 0,
         basketList: {
           all:[],
-          single: [],
-          multiple: [],
-          judge: [],
-          complete: [],
-          subjective: []
+          Single: [],
+          Multiple: [],
+          Judge: [],
+          Complete: [],
+          Subjective: [],
+          Compose:[]
         },
-        pointListLoading:true,
+        pointListLoading: true,
+        isShowUploadList:false,
         schoolInfo: {},
         bindPointModal: false,
         exersicesType: {
-          single: "单选",
-          multiple: "多选",
-          judge: "判断",
-          complete: "填空",
-          subjective:"问答"
+          Single: "单选",
+          Multiple: "多选",
+          Judge: "判断",
+          Complete: "填空",
+          Subjective:"问答",
+          Compose:"综合题"
         },
         exersicesDiff: ["容易", "较易", "一般", "较难", "困难"],
         diffColors: ['#32CF74', '#E8BE15', '#F19300', '#EB5E00', '#D30000'],
-        filterType:"all",
+        filterType: "all",
+        filterOrigin:"self",
         filterDiff:"all",
         filterSort: "0",
         pageSize: 5,
         pageNum: 1,
         totalNum: 100,
-        allList: questions.list,
+        allList: questions.result.data,
         knowPointList: [],
         schoolPointList: [],
         allPointList:[],
         checkedPointList: [],
-        isShowAnswer: true
+        isShowAnswer: true,
+        importLoading:false,
+        tabSelectVal:"school"
       }
     },
     created() {
       this.schoolInfo = JSON.parse(localStorage.getItem('c_role_info')).roleClaim[0];
-      this.list = questions.list;
-      this.totalNum = questions.list.length;
+      this.list = questions.result.data;
+      this.totalNum = questions.result.data.length;
       if (this.$route.params.exerciseItem) {
         this.list.unshift(this.$route.params.exerciseItem);
       }
     },
     methods: {
 
+      //根据题库加载题目
+      filterOriginChange(origin) {
+        console.log(origin);
+      },
+
       //筛选题型
       filterTypeChange(val) {
         if (val == "all") {
-          this.list = questions.list;
+          this.list = questions.result.data;
         } else {
-          this.list = questions.list.filter(item => item.type == val);
+          this.list = questions.result.data.filter(item => item.type == val);
         }
       },
 
       //筛选难度
       filterDiffChange(val) {
          if (val == "all") {
-          this.list = questions.list;
+          this.list = questions.result.data;
          } else {
-           this.list = questions.list.filter(item => item.difficulty == val);
+           this.list = questions.result.data.filter(item => item.difficulty == val);
         }
       },
 
@@ -269,7 +317,7 @@ import { setTimeout } from 'core-js';
       pageChange(page) {
         let start = this.pageSize * (page - 1);
         let end = this.pageSize * page;
-        let list = questions.list;
+        let list = questions.result.data;
         this.list = list.slice(start, end);
         window.scroll(0, 0);
       },
@@ -352,9 +400,10 @@ import { setTimeout } from 'core-js';
               PartitionKey: "zh-CN",
             }
         }
-        //this.$api.FindKnowledgeBlockAndPointByDict(data).then(res => {
-
-        //})
+        this.$api.FindKnowledgeBlockAndPointByDict(data).then(res => {
+          let list = res.result.data;
+          this.allPointList = list;
+        })
       },
 
       //获取标准知识点仓库数据
@@ -366,22 +415,25 @@ import { setTimeout } from 'core-js';
             }
         }
         this.$api.FindKnowledgePointByDict(data).then(res => {
-          let list = res.result.data;
-          this.allPointList = list;
           this.pointListLoading = false;
         })
       },
 
-       //获取学校知识点仓库数据
+       //获取学校知识块仓库数据
       getSchoolPoints() {
-         let data = {
+        let data = {
+          pointParams: {
               SubjectCode: "Subject_Chinese",
               PartitionKey: "zh-CN",
               SchoolCode: this.schoolInfo.claim[0].claimCode,
-              Status:1
+              Status: 1
+           }
         }
-        this.$api.FindSchoolPointByDict(data).then(res => {
+        this.$api.FindSchoolBlockAndPointByDict(data).then(res => {
           let list = res.result.data;
+          list.forEach(item => {
+            item.expand = !item.expand;
+          })
           this.schoolPointList = list;
           this.pointListLoading = false;
         })
@@ -444,6 +496,7 @@ import { setTimeout } from 'core-js';
                   click: () => {
                     if (this.checkedPointList.indexOf(data) == -1) {
                       if (this.checkedPointList.length < 5) {
+                        data.origin = this.tabSelectVal;
                         this.checkedPointList.push(data);
                       } else {
                         this.$Message.warning("最多绑定5个知识点！");
@@ -451,6 +504,8 @@ import { setTimeout } from 'core-js';
                     } else {
                       this.checkedPointList.splice(this.checkedPointList.indexOf(data), 1);
                     }
+
+                    console.log(this.checkedPointList);
                   }
                 }
             })
@@ -458,17 +513,17 @@ import { setTimeout } from 'core-js';
           ]
         );
       },
-       // 标题点击收缩展开
+      //标题点击收缩展开
       titleClick(root, node, data, event) {
         data.expand = !data.expand;
       },
 
+      //清空已选知识点
       handleClearChecked() {
-        console.log(this.$refs.pointTree.getCheckedNodes());
-        //this.$refs.pointTree.getSelectedNodes() = [];
         this.checkedPointList = [];
       },
 
+      //删除指定知识点
       deleteCheckedPoint(item) {
         this.checkedPointList.splice(this.checkedPointList.indexOf(item), 1);
       },
@@ -476,13 +531,49 @@ import { setTimeout } from 'core-js';
       //知识点筛选功能
       filterChange() {
         this.knowPointList = !this.searchWord ? this.schoolPointList : this.schoolPointList.filter(item => item.name.toUpperCase().indexOf(this.searchWord.toUpperCase()) > -1)
+      },
+
+      //导入试题
+      uploadSuccess(response, file, fileList) {
+        let that = this;
+        this.importLoading = true;
+        if (response.error == null) {
+          let requestData = { htmlString: response.result.data.HtmlString }
+          this.$api.SaveAnalyzeHtml(requestData).then(res => {
+            if (res.error == null) {
+              setTimeout(function () {
+                that.$Message.success('文件上传解析成功！');
+                that.list = res.result.data;
+                that.importLoading = false;
+              },1000)
+              //this.saveItemBank(res.result.data);
+            }
+          });
+        } else {
+          this.$Message.error('对不起，文档解析失败！');
+        }
+      },
+
+      //保存试题到数据库
+      saveItemBank(list) {
+        this.$api.SaveItemBank(list).then(res => {
+          console.log(res);
+        })
+
       }
 
     },
     mounted() {
-        //this.getStandardList();
+        this.getStandardList();
         this.getSchoolPoints();
-        //this.getAllPoints();
+        this.getAllPoints();
+    },
+    computed: {
+      headers(){
+        let hd = {}
+        hd["Authorization"] = "Bearer "+ localStorage.getItem("token");
+        return hd;
+      }
     }
   }
 </script>

TEAMModelOS/ClientApp/view/evaluation/index/TestPaper.css

@@ -116,12 +116,8 @@
             margin:0 3px;
         }
 
-        .paper-content .exercise-item .item-answer-item {
-            border-color:#01b4ef;
-        }
-
         .paper-content .paper-content-section {
-            font-size: 18px;
+             font-size: 18px;
             font-weight: bold;
             margin-top: 20px;
         }
@@ -139,7 +135,6 @@
     }
 
     .paper-content .item-answer, .paper-content .item-explain {
-        color: #01b4ef;
         text-indent:-8px;
         line-height:26px;
     }

TEAMModelOS/ClientApp/view/evaluation/index/TestPaper.vue

@@ -8,7 +8,7 @@
     <!-- 试卷编辑工具栏 -->
     <div class="paper-toolbar filter-wrap">
 
-      <div class="filter-item">
+      <!--<div class="filter-item">
         <span class="filter-title">测试用途:</span>
         <RadioGroup v-model="testAttr.testType" type="button" @on-change="filterTypeChange">
           <Radio label="0">正式考试</Radio>
@@ -25,15 +25,15 @@
           <Radio label="3">小考</Radio>
           <Radio label="4">自定义</Radio>
         </RadioGroup>
-      </div>
-      <div class="filter-item">
+      </div>-->
+      <!--<div class="filter-item">
         <span class="filter-title">测试对象:</span>
         <RadioGroup v-model="testAttr.testTarget" type="button" @on-change="filterTargetChange">
           <Radio label="0">同年级</Radio>
           <Radio label="1">跨年级</Radio>
           <Radio label="2">跨学校</Radio>
         </RadioGroup>
-      </div>
+      </div>-->
       <!--<div class="filter-item">
         <span class="filter-title">创建方式:</span>
         <RadioGroup v-model="testAttr.createType" type="button" @on-change="filterCreateChange">
@@ -49,11 +49,11 @@
 
     <!-- 试卷内容 -->
     <div class="paper-content">
-      <div class="paper-line">
+      <!--<div class="paper-line">
         <div id="pui_seal" title="点击设置&quot;装订线&quot;" style="display: block;">
           <img alt="装订线" title="装订线" src="http://zujuan.xkw.com/resource/image/v2/peal_line.png" width="58" height="">
         </div>
-      </div>
+      </div>-->
       <div class="paper-body">
         <!-- 试卷头部信息 -->
         <div class="paper-header flex-col-center">
@@ -77,18 +77,40 @@
               <div class="item-question">
                 <p>{{index+1}} : <span v-html="question.question"></span></p>
               </div>
-              <div v-for="(option,optionIndex) in question.options">
+              <div v-for="(option,optionIndex) in question.option">
                 <p>{{String.fromCharCode(64 + parseInt(optionIndex+1))}} : <span v-html="option.value"></span></p>
               </div>
+
+              <!-- 如果是组合题 -->
+              <div v-for="(childQuestion,childIndex) in question.children" v-if="question.children.length">
+                <div class="item-question">
+                  <p>{{childIndex+1}} : <span v-html="childQuestion.question"></span></p>
+                </div>
+                <div v-for="(childOption,childOptionIndex) in childQuestion.option">
+                  <p>{{String.fromCharCode(64 + parseInt(childOptionIndex+1))}} : <span v-html="childOption.value"></span></p>
+                </div>
+                <div class="item-answer" v-show="isShowAnswer">
+                  <span style="color:#01b4ef">【答案】:</span>
+                  <span v-html="childQuestion.answer[0] || childQuestion.answer" v-if="childQuestion.type == 'Subjective'"></span>
+                  <span :class="[ childQuestion.type == 'Complete' ? 'item-answer-item':'']" v-for="answer in childQuestion.answer" v-else-if="childQuestion.type == 'Complete'" v-html="answer"></span>
+                  <span :class="[ childQuestion.type == 'Complete' ? 'item-answer-item':'']" v-for="answer in childQuestion.answer" v-else>{{answer}}</span>
+                </div>
+                <div class="item-explain" v-show="isShowAnswer">
+                  <span style="color:#01b4ef">【解析】:</span>
+                  <span v-html="childQuestion.explain"></span>
+                </div>
+              </div>
+
+
               <!-- 答案与解析部分选择是否展示 -->
-              <div class="item-answer" v-show="isShowAnswer">
-                <span>【答案】:</span>
-                <span v-html="question.answer" v-if="question.type == 'subjective'"></span>
-                <span :class="[ question.type == 'complete' ? 'item-answer-item':'']" v-for="answer in question.answer" v-else-if="question.type == 'complete'" v-html="answer"></span>
-                <span :class="[ question.type == 'complete' ? 'item-answer-item':'']" v-for="answer in question.answer" v-else>{{answer}}</span>
+              <div class="item-answer" v-show="isShowAnswer && question.type != 'Compose'">
+                <span style="color:#01b4ef">【答案】:</span>
+                <span v-html="question.answer[0] || question.answer" v-if="question.type == 'Subjective'"></span>
+                <span :class="[ question.type == 'Complete' ? 'item-answer-item':'']" v-for="answer in question.answer" v-else-if="question.type == 'Complete'" v-html="answer"></span>
+                <span :class="[ question.type == 'Complete' ? 'item-answer-item':'']" v-for="answer in question.answer" v-else>{{answer}}</span>
               </div>
-              <div class="item-explain" v-show="isShowAnswer">
-                <span>【解析】:</span>
+              <div class="item-explain" v-show="isShowAnswer && question.type != 'Compose'">
+                <span style="color:#01b4ef">【解析】:</span>
                 <span v-html="question.explain"></span>
               </div>
             </div>
@@ -98,11 +120,11 @@
     </div>
     <div class="paper-footer">
       <Button type="primary">保存试卷</Button>
-
     </div>
   </div>
 </template>
 <script>
+  
   import questions from './list.json'
   import paper from './paper.json'
   export default {
@@ -134,12 +156,17 @@
         pageNum: 1,
         totalNum: 100,
         allList: questions.list,
-        isShowAnswer: true
+        isShowAnswer: false
       }
     },
     created() {
       this.list = questions.list;
       this.paperInfo = paper;
+      let flag = this.$route.params.flag;
+      if (flag == 1) {
+        console.log(JSON.parse(localStorage.getItem('questions')));
+        this.paperInfo.parts[0].questions = JSON.parse(localStorage.getItem('questions'))
+      }
 
     },
     methods: {

TEAMModelOS/ClientApp/view/evaluation/index/index.vue

@@ -40,11 +40,6 @@
     },
     methods: {
       goRouter(name) {
-        console.log(this.$api);
-        this.$api.SaveItemBank().then(res => {
-
-        })
-
         this.$router.push({
           name:name
         })

TEAMModelOS/ClientApp/view/index.vue

@@ -19,6 +19,7 @@
         <Button type="primary" size="large" class="btn-login animated fadeIn" @click="handleLogin('regist')" v-show="!isLogin">{{$t('index.register')}}</Button>
         <!--<Button type="primary" size="large" class="btn-login animated fadeIn" @click="handleAuth()" v-show="!hasAuthSchool">去授权</Button>
         <p v-show="isLogin" class="suc-text">{{$t('index.authSchool')}}: {{schoolInfo.schoolName}}</p>-->
+        <div class="system-name">醍摩豆智慧教育云平台</div>
         <div v-show="isLogin" class="suc-text select-role">
           <span>{{$t("index.currentRole")}}：学校管理员</span>
           <!--<Select v-model="currentRole" style="width:200px" @on-change="handleRoleChange">
@@ -251,8 +252,15 @@
     margin-top: 50px;
   }
 
+  .system-name {
+    font-size:45px;
+    font-weight:bold;
+    color:#fbfbfb;
+    /*text-shadow:-1px -5px 5px #bfbfbf;*/
+   }
+
   .logo {
-    width: 200px;
+    width: 200px; 
     height: 200px;
     margin-bottom: 50px;
   }

TEAMModelOS/Views/Shared/_Layout.cshtml

@@ -16,6 +16,8 @@
 <body>
     @RenderBody()
     <script src="~/dist/vendor.js" asp-append-version="true"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML" asp-append-version="true"></script>
+
     @RenderSection("scripts", required: false)
 </body>