首页 发现 帮助
登录
CocoRoboLabs
/
pbl-teacher-table
3
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

lsc 1 年之前
父节点
c639888b71 69e7b6e866
当前提交
c9ae4d88b9
共有 13 个文件被更改，包括 93 次插入 和 3 次删除
分列视图 显示文件统计
  1. 8 0
      dist/index.html
  2. 0 0
      dist/static/css/app.8db61530cac78e086e080ad56f8b3372.css
  3. 0 0
      dist/static/css/app.8db61530cac78e086e080ad56f8b3372.css.map
  4. 0 0
      dist/static/js/0.7bd37c6227e5d67b75fe.js
  5. 0 0
      dist/static/js/0.7bd37c6227e5d67b75fe.js.map
  6. 0 0
      dist/static/js/app.a8d9b67ee56036db82da.js
  7. 0 0
      dist/static/js/app.a8d9b67ee56036db82da.js.map
  8. 2 0
      dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js
  9. 0 0
      dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js.map
  10. 1 1
      src/assets/css/button.css
  11. 1 1
      src/components/pages/synergyCourse/addCourse.vue
  12. 1 1
      src/components/pages/test/add/components/checkOrder.vue
  13. 80 0
      src/components/pages/test/file/wPdf.vue

+ 8 - 0
dist/index.html
查看文件 

@@ -25,7 +25,15 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
+<<<<<<< HEAD
 
     }</style><link href=./static/css/app.1ea0745f8759c3ccb5b47f66c4bd31d9.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.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.64f9c3f2d941ed21657e.js></script></body></html><script>function stopSafari() {
 
+=======
 
+<<<<<<< HEAD
 
+    }</style><link href=./static/css/app.8db61530cac78e086e080ad56f8b3372.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.4ae2783fdfe7ab52e4d5.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.a8d9b67ee56036db82da.js></script></body></html><script>function stopSafari() {
 
+=======
 
+    }</style><link href=./static/css/app.58a6b41197bea4871a9880be0e71c882.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.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.fe4284aa32465342a4e0.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> 02df65c2f33f546c3b41100979e63a9a1d4d6f96
 
+>>>>>>> 69e7b6e8668f04bafa6685cf32902519d369efb9
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.8db61530cac78e086e080ad56f8b3372.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.8db61530cac78e086e080ad56f8b3372.css.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/0.7bd37c6227e5d67b75fe.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/0.7bd37c6227e5d67b75fe.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.a8d9b67ee56036db82da.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.a8d9b67ee56036db82da.js.map


+ 2 - 0
dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js
查看文件 

@@ -0,0 +1,2 @@
 
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={4:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"7bd37c6227e5d67b75fe",1:"994623639438b244a74c"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
 
+//# sourceMappingURL=manifest.4ae2783fdfe7ab52e4d5.js.map

文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/manifest.4ae2783fdfe7ab52e4d5.js.map


+ 1 - 1
src/assets/css/button.css
查看文件 

@@ -318,4 +318,4 @@
 
 }
 
 .test_icon_file{
 
   background-image: url('../icon/test/type_file_icon.png');
 
-}
 
+}

+ 1 - 1
src/components/pages/synergyCourse/addCourse.vue
查看文件 

@@ -45,7 +45,7 @@
 
                         <div style="width: 100%;">
 
                           <div class="course_input_box">
 
                             <div class="bb_courseIcon"><img src="../../../assets/icon/new/course.png" /></div>
 
-                            <input type="text" placeholder="请输入课程名称" class="binfo_input" v-model="courseName"
 
+                            <input type="text" placeholder="项目名称" class="binfo_input" v-model="courseName"
 
                               style="border: 1.5px solid rgb(202, 209, 220);margin: 0px 10px 0px 0px;border-radius: 5px;font-weight: 600;padding: 12px 14px 12px 71px;"
 
                               @change="changeName" />
 
                             <!-- background: #f6f6f6; -->

+ 1 - 1
src/components/pages/test/add/components/checkOrder.vue
查看文件 

@@ -483,4 +483,4 @@ export default {
 
 }
 
 
 
-</style>
 
+</style>

+ 80 - 0
src/components/pages/test/file/wPdf.vue
查看文件 

@@ -0,0 +1,80 @@
 
+<template>
 
+    <el-dialog title="PDF查看" :visible.sync="dialogVisiblePdf" :append-to-body="true" width="95%" :before-close="handleClose"
 
+        class="dialog_diy">
 
+        <div style="height: 100%;">
 
+            <iframe ref="viframe" style="width: 100%; height: 99%; border: none"
 
+                :src="'https://cloud.cocorobo.cn/pdf.js/web/viewer.html?file=' + encodeURIComponent(url)"></iframe>
 
+        </div>
 
+        <span slot="footer" class="dialog-footer">
 
+            <el-button @click="dialogVisiblePdf = false;">关 闭</el-button>
 
+        </span>
 
+    </el-dialog>
 
+</template>
 
+  
+<script>
 
+export default {
 
+    props: {
 
+        dialogVisiblePdf: {
 
+            type: Boolean,
 
+            default: false
 
+        },
 
+        url: {
 
+            type: String,
 
+        }
 
+    },
 
+    data() {
 
+        return {
 
+        }
 
+    },
 
+    methods: {
 
+        handleClose(done) {
 
+            this.close()
 
+            done();
 
+        },
 
+        close() {
 
+            this.$emit('update:dialogVisiblePdf', false)
 
+        }
 
+    },
 
+}
 
+</script>
 
+  
+<style scoped>
 
+.dialog_diy>>>.el-dialog {
 
+    height: 100%;
 
+    margin: 0 auto !important;
 
+}
 
+
 
+.dialog_diy>>>.el-dialog__header {
 
+    background: #454545 !important;
 
+    padding: 15px 20px;
 
+}
 
+
 
+.dialog_diy>>>.el-dialog__body {
 
+    height: calc(100% - 124px);
 
+    box-sizing: border-box;
 
+    padding: 0px;
 
+}
 
+
 
+
 
+.dialog_diy>>>.el-dialog__title {
 
+    color: #fff;
 
+}
 
+
 
+.dialog_diy>>>.el-dialog__headerbtn {
 
+    top: 19px;
 
+}
 
+
 
+.dialog_diy>>>.el-dialog__headerbtn .el-dialog__close {
 
+    color: #fff;
 
+}
 
+
 
+.dialog_diy>>>.el-dialog__headerbtn .el-dialog__close:hover {
 
+    color: #fff;
 
+}
 
+
 
+
 
+.dialog_diy>>>.el-dialog__body,
 
+.dialog_diy>>>.el-dialog__footer {
 
+    background: #fafafa;
 
+}
 
+</style>

部分文件因为文件数量过多而无法显示