lsc 1 рік тому
батько
коміт
a029b5bf0e

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: 'Source Han Sans SC', sans-serif;
-    }</style><link href=./static/css/app.aa9b1f650efe4558b246a7e0ad2e3ccb.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.11d8a4dfbebdec332b5f.js></script><script type=text/javascript src=./static/js/app.2b4531e3e0728af27712.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.8d7b34c6e24c1771e6c100b6bab885dd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.11d8a4dfbebdec332b5f.js></script><script type=text/javascript src=./static/js/app.1fdcaa96d898ba711ec1.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
dist/static/css/app.8d7b34c6e24c1771e6c100b6bab885dd.css


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
dist/static/css/app.8d7b34c6e24c1771e6c100b6bab885dd.css.map


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
dist/static/js/app.1fdcaa96d898ba711ec1.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
dist/static/js/app.1fdcaa96d898ba711ec1.js.map


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


+ 10 - 0
src/assets/css/button.css

@@ -458,4 +458,14 @@
 
 .dataBoard_check_box>.active.bz_icon::before {
   background-image: url('../icon/dataCheck/bz_icon_data_active.png');
+}
+
+.el-table__column-filter-trigger i{
+  background-image: url('../icon/test/test_table_arrow.png');
+  background-size: 100% 100%;
+  width: 15px;
+  height: 15px;
+}
+.el-table__column-filter-trigger i::before{
+  content: '';
 }

BIN
src/assets/icon/test/test_table_arrow.png


+ 3 - 0
src/components/pages/dataBoardTest/course/index.vue

@@ -374,6 +374,9 @@ export default {
       }
       for (var i = 0; i < shejiArray.length; i++) {
         let shejiJson = JSON.parse(shejiArray[i].courseJson)
+        if(shejiJson[0] && shejiJson[0].array){
+          shejiJson = shejiJson[0].array
+        }
         let xuanTime = shejiJson[1].json.answer2
         let xuanXuan = shejiJson[2].json.answer2
         for (var j = 0; j < xuanTime.length; j++) {

+ 89 - 69
src/components/pages/test/add/components/course/index.vue

@@ -13,21 +13,28 @@
                     placeholder="请输入描述"></textarea>
             </div>
             <div class="set_title" style="flex-direction: column;">
-                <div @click="openCourse" class="setting">设置课程选择范围</div>
-								<!-- {{courses}} -->
+                <div class="title_setting">
+                    <span>选择课程:</span>
+                    <div @click="openCourse" class="setting">点击添加课程</div>
+                </div>
+                <!-- {{courses}} -->
                 <div class="set_title_list" v-loading="loading">
-                    <div v-for="(item,index) in courses" class="set_title_list_item" :key="index" v-if="coursesList.find(i=>i.courseId==item)">
-											<!-- {{ `课程名称:${item.title}     创建人:${item.username}`}} -->
-											<div class="set_title_list_itemBtn el-icon-remove-outline" @click.stop="delCourse(item)"></div>
-											<div class="set_title_list_itemLabel">
-												<span>课程名称:{{ coursesList.find(i=>i.courseId==item) && coursesList.find(i=>i.courseId==item).title }}</span>
-												<span>创建人:{{ coursesList.find(i=>i.courseId==item) && coursesList.find(i=>i.courseId==item).username }}</span>
-											</div>
-										</div>
+                    <div v-for="(item, index) in courses" class="set_title_list_item" :key="index"
+                        v-if="coursesList.find(i => i.courseId == item)">
+                        <!-- {{ `课程名称:${item.title}     创建人:${item.username}`}} -->
+                        <div class="set_title_list_itemBtn el-icon-remove-outline" @click.stop="delCourse(item)"></div>
+                        <div class="set_title_list_itemLabel">
+                            <span>课程名称:{{ coursesList.find(i => i.courseId == item) &&
+        coursesList.find(i => i.courseId == item).title }}</span>
+                            <span>创建人:{{ coursesList.find(i => i.courseId == item) &&
+        coursesList.find(i => i.courseId == item).username }}</span>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-        <courseDilogVue :dialogVisibleCourse.sync="dialogVisibleCourse" :courses="courses" @setCourse="setCourse"></courseDilogVue>
+        <courseDilogVue :dialogVisibleCourse.sync="dialogVisibleCourse" :courses="courses" @setCourse="setCourse">
+        </courseDilogVue>
     </div>
 </template>
 
@@ -46,16 +53,16 @@ export default {
     },
     data() {
         return {
-					loading:false,
-          ctype: 1,
-          options: [
-              { type: 1, name: '附件' },
-              // { type: 2, name: '多选题' }
-          ],
-          checkJson: {},
-          dialogVisibleCourse:false,
-          courses: [],
-					coursesList:[],
+            loading: false,
+            ctype: 1,
+            options: [
+                { type: 1, name: '附件' },
+                // { type: 2, name: '多选题' }
+            ],
+            checkJson: {},
+            dialogVisibleCourse: false,
+            courses: [],
+            coursesList: [],
         }
     },
     directives: {
@@ -80,17 +87,17 @@ export default {
             },
             deep: true
         },
-				async courses(newValue){
-					this.loading = true;
-					let result = [];
-					let params = {
-						cid: this.courses.join(',')
-					}
-					let data = await this.ajax.get(this.$store.state.api + 'getCourseInfoTestAll',params);
-					result = data.data[0]
-					this.coursesList = result;
-					this.loading = false;
-				}
+        async courses(newValue) {
+            this.loading = true;
+            let result = [];
+            let params = {
+                cid: this.courses.join(',')
+            }
+            let data = await this.ajax.get(this.$store.state.api + 'getCourseInfoTestAll', params);
+            result = data.data[0]
+            this.coursesList = result;
+            this.loading = false;
+        }
     },
     methods: {
         depthCopy(s) {
@@ -110,19 +117,19 @@ export default {
             this.$forceUpdate();
             console.log(val);
         },
-        openCourse(){
+        openCourse() {
             this.dialogVisibleCourse = true
         },
-        setCourse(courses){
+        setCourse(courses) {
             this.checkJson.courses = courses
             this.courses = courses
             this.$forceUpdate()
         },
-				// 删除课程
-				delCourse(cid){
-					let index = this.courses.findIndex(i=>i==cid);
-					this.courses.splice(index,1)
-				}
+        // 删除课程
+        delCourse(cid) {
+            let index = this.courses.findIndex(i => i == cid);
+            this.courses.splice(index, 1)
+        }
     },
     mounted() {
         console.log(1);
@@ -131,7 +138,7 @@ export default {
             this.checkJson = {
                 title: "标题",
                 detail: "",
-                courses:[]
+                courses: []
             };
         } else {
             this.checkJson = this.depthCopy(this.cJson);
@@ -233,15 +240,28 @@ export default {
     border-top: 10px solid transparent;
 } */
 
-.setting{
+.title_setting{
+    margin-bottom: 10px;
+    display: flex;
+    align-items: flex-start;
+}
+
+.title_setting>span{
+    min-width: fit-content;
+    font-size: 15px;
+    min-width: 90px;
+    text-align: right;
+}
+
+.setting {
     display: flex;
     align-items: center;
     cursor: pointer;
-    justify-content: flex-end;
+    /* justify-content: flex-end; */
     width: 100%;
 }
 
-.setting::before{
+.setting::before {
     content: '';
     display: block;
     width: 20px;
@@ -251,42 +271,42 @@ export default {
     margin-right: 5px;
 }
 
-.set_title_list_item{
-	display: flex;
-	align-items: center;
-	width: auto;
-	height: 40px;
-	margin-bottom: 20px;
-	border-radius: 10px;
-	padding: 0 20px
+.set_title_list_item {
+    display: flex;
+    align-items: center;
+    width: auto;
+    height: 40px;
+    margin-bottom: 20px;
+    border-radius: 10px;
+    padding: 0 20px
 }
 
-.set_title_list_item:hover{
-	background-color: #d4dde1;
+.set_title_list_item:hover {
+    background-color: #d4dde1;
 }
 
-.set_title_list_item:hover>.set_title_list_itemBtn{
-	opacity: 1;
+.set_title_list_item:hover>.set_title_list_itemBtn {
+    opacity: 1;
 }
 
-.set_title_list_itemBtn{
-	font-size: 18px;
-	margin-right: 20px;
-	cursor: pointer;
-	opacity: 0;
+.set_title_list_itemBtn {
+    font-size: 18px;
+    margin-right: 20px;
+    cursor: pointer;
+    opacity: 0;
 }
 
-.set_title_list_itemLabel{
-	display: flex;
-	align-items: center;
+.set_title_list_itemLabel {
+    display: flex;
+    align-items: center;
 }
 
-.set_title_list_itemLabel>span{
-	margin-right: 20px;
-}
-.set_title_list{
-	min-width: 100%;
-	min-height: 200px;
+.set_title_list_itemLabel>span {
+    margin-right: 20px;
 }
 
+.set_title_list {
+    min-width: 100%;
+    /* min-height: 200px; */
+}
 </style>

+ 12 - 12
src/components/pages/test/check/index.vue

@@ -1007,12 +1007,12 @@ export default {
     setWordHtml(data) {
       let _data = data
 
-      let _title = `<div style="font-size:40px;font-weight:bold;text-align:center;">${this.testJson.title}</div>`;
+      let _title = `<div style="font-size:30px;font-weight:bold;text-align:center;">${this.testJson.title}</div>`;
       let score = this.score(data.courseJson)
       let isScore = this.score2(data.courseJson)
       let scoreContent = score ? `<b>(得分/总分)${isScore}/${score}</b>` : ''
-      let _content = `<div style="font-size:25px;text-align:center;margin-top: 20px;"><b style="margin-right:40px">(答题人)${_data.name}</b>${scoreContent}(填写范围)${this.testJson.juriP ? this.testJson.juriP : '所有人'}(提交时间)${_data.time}</div>`
-      let _detail = this.testJson.brief ? `<div style="font-size:25px;text-align:center;margin-top: 20px;">${this.testJson.brief}</div>` : ''
+      let _content = `<div style="text-align:center;margin-top: 20px;"><b style="margin-right:40px">(答题人)${_data.name}</b>${scoreContent}(填写范围)${this.testJson.juriP ? this.testJson.juriP : '所有人'}(提交时间)${_data.time}</div>`
+      let _detail = this.testJson.brief ? `<div style="text-align:center;margin-top: 20px;">${this.testJson.brief}</div>` : ''
 
       let _test = `<div style='margin-top:40px;'>`
       for (let i = 0; i < _data.array.length; i++) {
@@ -1050,12 +1050,12 @@ export default {
     setWordHtml2(data) {
       let _data = data
       _data.array = this.JSONSetting(JSON.parse(JSON.stringify(JSON.parse(data.courseJson))))
-      let _title = `<div style="font-size:40px;font-weight:bold;text-align:center;">${this.testJson.title}</div>`;
+      let _title = `<div style="font-size:30px;font-weight:bold;text-align:center;">${this.testJson.title}</div>`;
       let score = this.score(JSON.parse(data.courseJson))
       let isScore = this.score2(JSON.parse(data.courseJson))
       let scoreContent = score ? `<b>(得分/总分)${isScore}/${score}</b>` : ''
-      let _content = `<div style="font-size:25px;text-align:center;margin-top: 20px;"><b style="margin-right:40px">(答题人)${_data.username}</b>${scoreContent}(填写范围)${this.testJson.juriP ? this.testJson.juriP : '所有人'}(提交时间)${_data.time}</div>`
-      let _detail = this.testJson.brief ? `<div style="font-size:25px;text-align:center;margin-top: 20px;">${this.testJson.brief}</div>` : ''
+      let _content = `<div style="text-align:center;margin-top: 20px;"><b style="margin-right:40px">(答题人)${_data.username}</b>${scoreContent}(填写范围)${this.testJson.juriP ? this.testJson.juriP : '所有人'}(提交时间)${_data.time}</div>`
+      let _detail = this.testJson.brief ? `<div style="text-align:center;margin-top: 20px;">${this.testJson.brief}</div>` : ''
 
       let _test = `<div style='margin-top:40px;'>`
       for (let i = 0; i < _data.array.length; i++) {
@@ -1126,12 +1126,12 @@ export default {
     setWordHtmlAll(data) {
       let _data = data
 
-      let _title = `<div style="font-size:40px;font-weight:bold;text-align:center;">${this.testJson.title}</div>`;
+      let _title = `<div style="font-size:30px;font-weight:bold;text-align:center;">${this.testJson.title}</div>`;
       let score = this.score(data.courseJson)
       let isScore = this.score2(data.courseJson)
       let scoreContent = score ? `<b>(得分/总分)${isScore}/${score}</b>` : ''
-      let _content = `<div style="font-size:25px;text-align:center;margin-top: 20px;"><b style="margin-right:40px">(答题人)${_data.name}</b>${scoreContent}(填写范围)${this.testJson.juriP ? this.testJson.juriP : '所有人'}(提交时间)${_data.time}</div>`
-      let _detail = this.testJson.brief ? `<div style="font-size:25px;text-align:center;margin-top: 20px;">${this.testJson.brief}</div>` : ''
+      let _content = `<div style="text-align:center;margin-top: 20px;"><b style="margin-right:40px">(答题人)${_data.name}</b>${scoreContent}(填写范围)${this.testJson.juriP ? this.testJson.juriP : '所有人'}(提交时间)${_data.time}</div>`
+      let _detail = this.testJson.brief ? `<div style="text-align:center;margin-top: 20px;">${this.testJson.brief}</div>` : ''
 
       let _test = `<div style='margin-top:40px;'>`
       for (let i = 0; i < _data.array.length; i++) {
@@ -1169,12 +1169,12 @@ export default {
     async setWordHtmlAll2(data) {
       let _data = data
       _data.array = this.JSONSetting(JSON.parse(JSON.stringify(JSON.parse(data.courseJson))))
-      let _title = `<div style="font-size:40px;font-weight:bold;text-align:center;">${this.testJson.title}</div>`;
+      let _title = `<div style="font-size:30px;font-weight:bold;text-align:center;">${this.testJson.title}</div>`;
       let score = this.score(JSON.parse(data.courseJson))
       let isScore = this.score2(JSON.parse(data.courseJson))
       let scoreContent = score ? `<b>(得分/总分)${isScore}/${score}</b>` : ''
-      let _content = `<div style="font-size:25px;text-align:center;margin-top: 20px;"><b style="margin-right:40px">(答题人)${_data.username}</b>${scoreContent}(填写范围)${this.testJson.juriP ? this.testJson.juriP : '所有人'}(提交时间)${_data.time}</div>`
-      let _detail = this.testJson.brief ? `<div style="font-size:25px;text-align:center;margin-top: 20px;">${this.testJson.brief}</div>` : ''
+      let _content = `<div style="text-align:center;margin-top: 20px;"><b style="margin-right:40px">(答题人)${_data.username}</b>${scoreContent}(填写范围)${this.testJson.juriP ? this.testJson.juriP : '所有人'}(提交时间)${_data.time}</div>`
+      let _detail = this.testJson.brief ? `<div style="text-align:center;margin-top: 20px;">${this.testJson.brief}</div>` : ''
 
       let _test = `<div style='margin-top:40px;'>`
       for (let i = 0; i < _data.array.length; i++) {

+ 5 - 5
src/components/pages/testPerson/test/test.vue

@@ -69,8 +69,8 @@
                         </div>
                     </div>
                     <div class="test_add_box"
-                        style="width: calc(100% - 350px - 20px);border: none;margin-right: 20px;padding: 0;flex-direction: column;"
-                        v-else-if="item.carray">
+                        style="width: calc(100% - 50px);border: none;margin-right: 20px;padding: 0;flex-direction: column;"
+                        v-else-if="item.carray" v-loading="!item.carray.length">
                         <div class="courseLength" v-for="(course, index) in item.carray" :key="index" @click="doTest3(item, course)">
                             <span class="finish" :class="{is: course.array.length}"></span>
                             <span>{{ index+1 }}、</span>
@@ -78,14 +78,14 @@
                             <span>{{ course.username }}</span>
                         </div>
                     </div>
-                    <div class="panel">
-                        <div class="score">
+                    <div class="panel" :style="{width:type == 'dda9728e-5f11-469e-89ee-aca518daf123' && '50px',minWidth:type == 'dda9728e-5f11-469e-89ee-aca518daf123' && '50px'}">
+                        <div class="score" v-if="type != 'dda9728e-5f11-469e-89ee-aca518daf123'">
                             <div>
                                 <span>{{ getNum(item.chapters) }}</span><span>题</span>
                             </div>
                             <div>题目总数</div>
                         </div>
-                        <div class="score">
+                        <div class="score" v-if="type != 'dda9728e-5f11-469e-89ee-aca518daf123'">
                             <div>
                                 <span>{{ getScore(item.array) }}</span><span>分</span>
                             </div>

+ 2 - 2
src/components/pages/testStudent/view/component/topic.vue

@@ -71,8 +71,8 @@
                 :see="see" :isTeacher="isTeacher"></gapV>
               <fileV :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 5"
                 :see="see" :isTeacher="isTeacher"></fileV>
-              <coursev :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 6"
-                :see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></coursev>
+              <courseV :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 6"
+                :see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></courseV>
               <evaV :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 7"
                 :see="see" :isTeacher="isTeacher"></evaV>
               <!-- <span v-else>暂未设置题目</span> -->

Деякі файли не було показано, через те що забагато файлів було змінено