Merge remote-tracking branch 'origin/master'

public/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+    <!-- <link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> -->
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= htmlWebpackPlugin.options.title %></title>
   </head>

src/HManagement/archives_sc/archives_scclass/modules/edit.vue

@@ -29,6 +29,7 @@
 
 <script>
 import preview_upload from '@/components/upload/preview_upload.vue'
+import removeFile from '@/utils/removeFile'
 export default {
   props:['data'],
   components:{preview_upload},
@@ -62,7 +63,7 @@ export default {
         "method": "insertOrUpdate",
         "content":this.form
       })
-      this.tool.showMessage(res,() => {
+      removeFile.removeFileList(this.data.attinfos).then( res => {
         this.bindData = {
           ownertable:'sat_courseware_class',
           ownerid:this.data.sat_courseware_classid,
@@ -70,9 +71,11 @@ export default {
         }
         this.$refs['upload'].toUpload()
       })
+      
     },
     uploadSuccess(res){
       this.$emit('onSuccess')
+      this.tool.showMessage({code:1})
       this.dialogFormVisible = false
     },
   }

src/HManagement/archives_sc/index.vue

@@ -17,7 +17,7 @@
         <el-button class="inline-16" type="text" size="small" @click="$router.push({path:'/taskStore',query:{id:scope.data.data.sat_coursewareid}})">题库</el-button>
       </template>
       <template v-if="tool.checkAuth($route.name,'setTest')" v-slot:setTest="scope">
-        <setTest :data="scope.data.data"></setTest>
+        <setTest @onSuccess="$refs.list.listData()" :data="scope.data.data"></setTest>
       </template>
       <template v-if="tool.checkAuth($route.name,'data_analysis')" v-slot:data_statistics="scope">
         <el-button type="text" size="small" @click="$router.push({path:'/archives_sc_analysis',query:{id:scope.data.data.sat_coursewareid}})">数据分析</el-button>

src/HManagement/archives_sc/list/modules/setTest.vue

@@ -7,7 +7,7 @@
         <el-form-item label="题目数" prop="testitemcount">
           <el-input v-model.number="form.testitemcount" placeholder="请输入题数"></el-input>
         </el-form-item>
-        <el-form-item label="分数" prop="testscore">
+        <el-form-item label="每题分数" prop="testscore">
           <el-input v-model.number="form.testscore" placeholder="请输入分数"></el-input>
         </el-form-item>
         <el-form-item label="开启考试">

src/HManagement/archives_sc/taskStore/components/add.vue

@@ -26,7 +26,7 @@
                   <el-input type="text" slot="prepend" v-model="item.option" size="small"></el-input>
                 </el-input>
                 <div>
-                  <el-button v-if="index == form.options.length - 1" style="margin-right: 5px;" @click="addTask(index+1)">添 加</el-button>
+                  <el-button v-if="index == form.options.length - 1 && form.options.length < 6" style="margin-right: 5px;" @click="addTask(index+1)">添 加</el-button>
                   <el-button size="small" @click="delTask(item)">删 除</el-button>
                 </div>
                 <div>

src/HManagement/archives_sc/taskStore/components/delBtn.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="display:inline;margin:0 16px">
-    <el-popconfirm title="确定删除当前通告吗？" @confirm="deleteRow()">
+    <el-popconfirm title="确定删除当前题目吗？" @confirm="deleteRow()">
       <el-button slot="reference" size="small" type="text">删 除</el-button>
     </el-popconfirm>
   </div>

src/HManagement/archives_sc/taskStore/components/edit.vue

@@ -26,7 +26,7 @@
                   <el-input type="text" slot="prepend" v-model="item.option" size="small"></el-input>
                 </el-input>
                 <div>
-                  <el-button v-if="index == form.options.length - 1" style="margin-right: 5px;" @click="addTask(index+1)">添 加</el-button>
+                  <el-button v-if="index == form.options.length - 1 && form.options.length < 6" style="margin-right: 5px;" @click="addTask(index+1)">添 加</el-button>
                   <el-button size="small" @click="delTask(item)">删 除</el-button>
                 </div>
                 <div>

src/HManagement/archives_sc/taskStore/index.vue

@@ -6,13 +6,13 @@
     <div class="container normal-panel">
       <!-- 表格搜索 -->
       <div class="flex-align-center search-panel" style="margin-bottom:16px">
-        <div class="flex-align-center" style="margin-right: 16px;">
+        <!-- <div class="flex-align-center" style="margin-right: 16px;">
           <p style="width:40px">搜索:&nbsp;</p>
           <el-input style="width:200px" size="small" placeholder="题目"
             @clear="(params.content.where.condition = '', listData(params.content.pageNumber = 1))"
             @keyup.native.enter="listData(params.content.pageNumber = 1)" v-model="params.content.where.condition"
             prefix-icon="el-icon-search" clearable></el-input>
-        </div>
+        </div> -->
         <div class="flex-align-center">
           <importFile 
             ref="importFile" 
@@ -35,7 +35,7 @@
         </template>
         <template v-slot:opreation="scope">
           <Edit class="inline-16" :data="scope.data" @onSuccess="listData()"></Edit>
-          <delBtn @onSuccess="listData" :data="scope.data"></delBtn>
+          <delBtn class="inline-16" @onSuccess="listData" :data="scope.data"></delBtn>
         </template>
       </tableLayout>
       <div style="margin-top:16px;text-align:right">
@@ -129,7 +129,7 @@ export default {
     },
   },
   mounted() {
-    this.listData()
+    this.listData() 
     this.coursewareclass()
   },
   created() {

src/SManagement/archives_sc/archives_details/detail.vue

@@ -232,6 +232,7 @@ export default {
 .el-drawer__body .file1 {
   margin-top: 20px;
   padding: 0 20px;
+  margin-bottom: 70px;
 }
 .el-drawer__body .file1 .title {
   margin-bottom: 20px;

src/SManagement/archives_sc/checkList/index.vue

@@ -5,16 +5,19 @@
       <div class="flex-align-center search-panel" style="margin-bottom:16px">
         <div class="flex-align-center">
           <p style="width:40px">搜索:&nbsp;</p>
-          <el-input style="width:200px;margin-right: 16px;" size="small" placeholder="题目"
+          <el-input style="width:200px;margin-right: 16px;" size="small" placeholder="试卷"
             @clear="(params.content.where.condition = '', listData(params.content.pageNumber = 1))"
             @keyup.native.enter="listData(params.content.pageNumber = 1)" v-model="params.content.where.condition"
             prefix-icon="el-icon-search" clearable></el-input>
-            <el-select style="width:120px;margin-right:16px" size="small"
-              v-model="params.content.where.status" @change="listData(params.content.pageNumber = 1)"
-              clearable>
-              <el-option label="未完成" value="未完成"></el-option>
-              <el-option label="已完成" value="已完成"></el-option>
-            </el-select>
+            <div class="flex-align-center">
+              <p style="width:40px">状态:&nbsp;</p>
+              <el-select style="width:120px;margin-right:16px" size="small"
+                v-model="params.content.where.status" @change="listData(params.content.pageNumber = 1)"
+                clearable>
+                <el-option label="未完成" value="未完成"></el-option>
+                <el-option label="已完成" value="已完成"></el-option>
+              </el-select>
+            </div>
         </div>
       </div>
       <!-- 表格 -->

src/SManagement/archives_sc/checkList/modules/detail.vue

@@ -19,7 +19,7 @@
             <span style="color:#3874F6;margin-right: 20px;">进度&nbsp;:<span>{{ requireLength }}/{{ detail.errcount + detail.rightcount }}</span></span>
           </div>
         </div>
-        <el-button type="primary" size="small" @click="save" class="test_header-btn"  v-if="detail.status != '已完成'">保存</el-button>
+        <el-button type="primary" size="small" @click="save" class="test_header-btn"  v-if="detail.status != '已完成'">提交</el-button>
         <div class="test__header-result" v-else>
           <el-row>
             <el-col :span="6">
@@ -52,7 +52,10 @@
           </el-radio-group> -->
           <div class="test_content-result" v-if="detail.status == '已完成'">
             <span :style="item.result ? 'color:#52C41A' : 'color:#FF3B30'" style="margin-right: 50px;">结果:{{ item.result ? '答对' : '答错' }}</span>
-            <span style="color:#52C41A">答案:{{ item.answer.join(',') }}</span>
+            <span style="color:#52C41A">答案:{{ calcResult(item) }}</span>
+          </div>
+          <div class="test_content-analysis" v-if="detail.status == '已完成'">
+            <span>解析:{{ item.analysis || '暂无' }}</span>
           </div>
         </div>
       </div>
@@ -86,8 +89,22 @@ export default {
   },
   computed: {
     requireLength () {
-      console.log(this.detail.testitems);
-      return this.detail.testitems.filter(item => item.answer).length
+      return this.detail.testitems.filter(item => item.answer.length).length
+    },
+    calcResult () {
+      return (data) => {
+        data = data.options.filter(item => item.isfact)
+        let result
+        data.forEach(item => {
+          if (result) {
+            result += item.option
+          } else {
+            result = item.option
+          }
+        })
+        console.log(result);
+        return result
+      }
     }
   },
   methods: {
@@ -218,6 +235,13 @@ export default {
   width: 295px;
   margin-bottom: 10px;
 }
+.test_content .test_content-analysis {
+  font-size: 14px;
+  padding: 16px 20px;
+  background: #F8F8F8;
+  margin-bottom: 10px;
+  display: inline-block;
+}
 .test_header-btn {
   position: absolute;
   top: 20px;

src/SManagement/archives_sc/index.vue

@@ -48,8 +48,8 @@
       <div v-show="activeName=='学习足迹'">
         <div class="header-panl">
           <!-- 搜索及分类筛选 -->
-          <filterList @changeTypeId="changeTypeId" @startSearch="startSearch">
-              <hot-new-control @sortTypeChange="sortTypeChange"/>
+          <filterList @changeTypeId="changeTypeId2" @startSearch="startSearch2">
+              <!-- <hot-new-control @sortTypeChange="sortTypeChange2"/> -->
           </filterList>
         </div>
         <!--课件列表-->
@@ -183,6 +183,12 @@ export default {
       }
       this.getFileData()
     },
+    sortTypeChange (name) {
+      for (let i = 0; i < this.param2.content.sort.length; i++) {
+        this.param2.content.sort[i].sorted = this.param2.content.sort[i].sortname == name ? 1 : 0
+      }
+      this.getStudyHistory()
+    },
     tabChange (data) {
       if (data.label == '学习足迹') {
         this.getStudyHistory()
@@ -213,12 +219,24 @@ export default {
       this.param.content.pageNumber = 1
       this.getFileData();
     },
+    /* 改变分类ID */
+    changeTypeId2(id) {
+      this.param2.content.where.sat_courseware_classid = id == 0 ? null : id;
+      this.param2.content.pageNumber = 1
+      this.getStudyHistory();
+    },
     /* 开始搜索 */
     startSearch(value) {
       this.param.content.where.condition = value;
       this.param.content.pageNumber = 1
       this.getFileData();
     },
+    /* 开始搜索 */
+    startSearch2(value) {
+      this.param2.content.where.condition = value;
+      this.param2.content.pageNumber = 1
+      this.getStudyHistory();
+    },
     async goTest (data) {
       let res = await this.$api.requested({
         "classname": "saletool.courseware.coursewaretest",

yos/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link href="//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"><link rel="icon" href="favicon.ico"><title>美大营销管理平台</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.4c20137e.js"></script><link href="css/app.21bf30c1.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.87057d6d.js" nomodule></script></head><body><noscript><strong>We're sorry but 美大营销管理平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>美大营销管理平台</title><script defer="defer" type="module" src="js/chunk-vendors.8e4fd6d5.js"></script><script defer="defer" type="module" src="js/app.8a7926d3.js"></script><link href="css/app.21bf30c1.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.25c4112b.js" nomodule></script><script defer="defer" src="js/app-legacy.7d34aafa.js" nomodule></script></head><body><noscript><strong>We're sorry but 美大营销管理平台 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>