lsc 2 years ago
parent
commit
dbad2b12a1

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.c1fcd452ac0d9fd89196c14105d6c95d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.748f10c1abb0af104b93.js></script><script type=text/javascript src=./static/js/app.a675c39e4a5c92f1204b.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.dd1c5d4cb6e4003991f9662aa0ccd4c0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.748f10c1abb0af104b93.js></script><script type=text/javascript src=./static/js/app.40db6b8a45a781b75aab.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.dd1c5d4cb6e4003991f9662aa0ccd4c0.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.dd1c5d4cb6e4003991f9662aa0ccd4c0.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.40db6b8a45a781b75aab.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.40db6b8a45a781b75aab.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.a675c39e4a5c92f1204b.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 27 - 3
src/components/pages/CaseDesignS.vue

@@ -12,7 +12,7 @@
         <div style="display: flex;align-items: center;">
           <!-- <el-button type="primary" size="small" @click="exportHtml" style="margin-right: 10px;">导出html</el-button> -->
           <el-button type="primary" size="small" @click="exportExcel" style="margin-right: 10px;">导出Excel</el-button>
-          <el-switch v-model="mode" active-text="详情模式" inactive-text="简易模式">
+          <el-switch v-model="mode" active-text="详情模式" inactive-text="简易模式" @change="changeMode">
           </el-switch>
         </div>
       </div>
@@ -42,7 +42,7 @@
     <div class="cd_table">
       <el-table ref="table" :data="tableData" border :fit="true" v-loading="isLoading" style="width: 100%"
         :header-cell-style="{ background: '#f1f1f1', fontSize: '17px' }" :row-class-name="tableRowClassName"
-        class="table">
+        class="table" :height="tableHeight" :key="mode">
         <el-table-column label="序号" prop="number" width="70px" align="center">
         </el-table-column>
         <el-table-column label="项目" width="150px" align="center">
@@ -256,7 +256,7 @@
             <div>{{ scope.row.psType == '1' ? '造型结构' : scope.row.psType == '2' ? '开源硬件' :   scope.row.psType == '3' ? '软件设计' :  scope.row.psType == '4' ? '总分' : '—' }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="150px" align="center">
+        <el-table-column fixed="right" label="操作" width="180px" align="center">
           <template slot-scope="scope">
             <!-- <div
               @click="getAll(scope.row)"
@@ -348,6 +348,7 @@ export default {
       total: 0,
       page: 1,
       pageSize: 10,
+      tableHeight:"500px",
     };
   },
   methods: {
@@ -617,6 +618,13 @@ export default {
       this.dataArray = a;
       this.dialogVisible = true;
     },
+    changeMode(){
+      this.tableHeight =
+        window.innerHeight - this.$refs.table.$el.offsetTop - 50;
+      if (this.tableHeight <= 530) {
+        this.tableHeight = 530;
+      }
+    },
     exportExcel() {
       if (!this.tableData.length) {
         this.$message.error('请等待加载数据')
@@ -821,6 +829,22 @@ export default {
     this.timer = null;
   },
   mounted() {
+    this.$nextTick(function () {
+      this.tableHeight =
+        window.innerHeight - this.$refs.table.$el.offsetTop - 50;
+      if (this.tableHeight <= 530) {
+        this.tableHeight = 530;
+      }
+      // 监听窗口大小变化
+      let self = this;
+      window.onresize = function () {
+        self.tableHeight =
+          window.innerHeight - self.$refs.table.$el.offsetTop - 50;
+        if (self.tableHeight <= 530) {
+          self.tableHeight = 530;
+        }
+      };
+    });
     this.isLoading = true;
     this.getData();
     this.selectAllType();

+ 19 - 1
src/components/pages/addCourse.vue

@@ -879,6 +879,7 @@
                               <div
                                 v-if="
                                   item1.type == 3 ||
+                                  item1.type == 12 ||
                                   item1.type == 6 ||
                                   item1.type == 7
                                 "
@@ -923,6 +924,7 @@
                                 v-if="
                                   item1.type == 2 ||
                                   item1.type == 3 ||
+                                  item1.type == 12 ||
                                   item1.type == 7
                                 "
                                 :placeholder="item1.name"
@@ -1050,6 +1052,18 @@
                       >
                         添加链接
                       </button>
+                      <button class="info_btn" @click="addImg($event)">
+                        附件上传
+                        <input
+                          type="file"
+                          accept="*"
+                          style="display: none"
+                          v-if="inputShow"
+                          @change="
+                            beforeUpload2($event, unitIndex, 12, itemTaskIndex)
+                          "
+                        />
+                      </button>
                     </div>
                     <div
                       v-if="
@@ -5682,7 +5696,7 @@ export default {
               a.splice(a.length - 1, a.length);
               _this.$message.error("上传失败");
             } else {
-              if (type == 2 || type == 3) {
+              if (type == 2 || type == 3 || type == 12) {
                 _this.unitJson[unitIndex].chapterInfo[0].taskJson[
                   itemTaskIndex
                 ].chapterData.push({
@@ -6152,6 +6166,7 @@ export default {
           }
         }
       }
+      this.inputShow = true
 
       if (cPan == 2) {
         this.steps--;
@@ -6254,6 +6269,7 @@ export default {
             );
         }
       }
+      this.inputShow = true
       if (cPan == 2) {
         this.steps--;
         return;
@@ -6317,6 +6333,7 @@ export default {
           }
         }
       }
+      this.inputShow = true
       if (cPan == 2) {
         this.steps--;
         return;
@@ -7535,6 +7552,7 @@ export default {
                   _chapterData;
               }
             }
+            
             this.$forceUpdate();
             this.courseName = res.data[0][0].title;
             this.courseText = res.data[0][0].brief;

+ 4 - 4
src/components/pages/student/addCourse.vue

@@ -1249,7 +1249,7 @@
                             <span v-if="itemTool.tool == 52"> 文档 </span>
                             <span v-if="itemTool.tool == 53"> 文件上传 </span>
                             <span v-if="itemTool.tool == 54"> 拍照 </span>
-                            <span v-if="itemTool.tool == 55"> 压缩文件 </span>
+                            <span v-if="itemTool.tool == 55"> 文件 </span>
                             <span v-if="itemTool.tool == 56"> 投票 </span>
                             <span v-if="itemTool.tool == 57"> CocoPi </span>
                           </div>
@@ -1470,10 +1470,10 @@
                                 src="../../../assets/icon/fourthToolList/zip.png"
                                 alt
                               />
-                              <div style="margin: 5px 0">压缩文件</div>
+                              <div style="margin: 5px 0">文件</div>
                               <input
                                 type="file"
-                                accept=".zip,.rar"
+                                accept="*"
                                 style="display: none"
                                 @change="
                                   beforeUploadCC(
@@ -3230,7 +3230,7 @@
                       src="../../../assets/icon/fourthToolList/zip.png"
                       alt
                     />
-                    <div style="margin: 5px 0">压缩文件</div>
+                    <div style="margin: 5px 0">文件</div>
                   </div>
                 </div>
                 <div class="tool">

Some files were not shown because too many files changed in this diff