Inicio Explorar Axuda
Iniciar sesión
CocoRoboLabs
/
r2r_pbl
3
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/r2r_pbl into beta

lzw hai 3 meses
pai
29ba949b3e 1cf7481a8a
achega
13f5088c82
Modificáronse 13 ficheiros con 28 adicións e 9 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.0c665e7eda3f6e1c31634bf3ff6d6f2f.css
  3. 0 0
      dist/static/css/app.0c665e7eda3f6e1c31634bf3ff6d6f2f.css.map
  4. 0 0
      dist/static/css/app.cd4ebf43618e6c2f618cad075a06c649.css.map
  5. 0 0
      dist/static/js/app.04b4beddaec0aaeaec22.js
  6. 0 0
      dist/static/js/app.04b4beddaec0aaeaec22.js.map
  7. 0 0
      dist/static/js/app.9c4d3b2c56b4405b50aa.js
  8. 0 0
      dist/static/js/app.9c4d3b2c56b4405b50aa.js.map
  9. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  10. 6 1
      src/components/pages/knowledge/fileBox.vue
  11. 17 3
      src/components/pages/knowledge/folderFileBox.vue
  12. 1 1
      src/components/pages/knowledge/index.vue
  13. 3 3
      src/main.js

+ 1 - 1
dist/index.html
Ver ficheiro 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.cd4ebf43618e6c2f618cad075a06c649.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bc3479efe4e7d435ff02.js></script><script type=text/javascript src=./static/js/app.9c4d3b2c56b4405b50aa.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.0c665e7eda3f6e1c31634bf3ff6d6f2f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bc3479efe4e7d435ff02.js></script><script type=text/javascript src=./static/js/app.04b4beddaec0aaeaec22.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.0c665e7eda3f6e1c31634bf3ff6d6f2f.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.0c665e7eda3f6e1c31634bf3ff6d6f2f.css.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.cd4ebf43618e6c2f618cad075a06c649.css.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.04b4beddaec0aaeaec22.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.04b4beddaec0aaeaec22.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.9c4d3b2c56b4405b50aa.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.9c4d3b2c56b4405b50aa.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 6 - 1
src/components/pages/knowledge/fileBox.vue
Ver ficheiro 

@@ -493,7 +493,12 @@ export default {
 
         "txt",
 
         "ppt",
 
         "pptx",
 
-        "docx"
 
+        "docx",
 
+        "jpg",
 
+        "jpeg",
 
+        "png",
 
+        "gif",
 
+        "bmp"
 
       ];
 
 
       const uploadFiles = async files => {

+ 17 - 3
src/components/pages/knowledge/folderFileBox.vue
Ver ficheiro 

@@ -13,7 +13,8 @@
 
         <span :class="{active: fileType == 2}" @click="checkType(2)">{{lang.backTest}}</span>
 
       </div>
 
     </div>
 
-    <div class="f_box_top_right" v-if="fileType == 1">
 
+    <div class="f_box_container">
 
+      <div class="f_box_top_right" v-if="fileType == 1">
 
 
       <div class="input">
 
         <input
 
@@ -280,7 +281,6 @@
 
           </div>
 
           <div class="lbox_count">{{ pcount }} / {{ ptotal }}</div>
 
         </div>
 
-      </div>
 
     </div>
 
     <testBox v-if="fileType == 2" :userid="userid" :folderid="folderid"></testBox>
 
     <wpdf :dialogVisiblePdf.sync="dialogVisiblePdf" :url="wurl"></wpdf>
 
@@ -519,7 +519,12 @@ export default {
 
         "txt",
 
         "ppt",
 
         "pptx",
 
-        "docx"
 
+        "docx",
 
+        "jpg",
 
+        "jpeg",
 
+        "png",
 
+        "gif",
 
+        "bmp"
 
       ];
 
       //     let uuid = uuidv4();
 
       // let res = window.uploadFile({ file: event.target.files[0], uuid, userid:this.userid, folderid:this.folderid, moFolderid: this.moFolderid })
 
@@ -900,6 +905,14 @@ export default {
 
   margin-left: 15px;
 
 }
 
 
+.f_box_container{
 
+  display: flex;
 
+  flex-direction: column;
 
+  gap: 16px;
 
+  height: 100%;
 
+  overflow: auto;
 
+}
 
+
 
 .f_box_top_right {
 
   margin-left: auto;
 
   /* max-width: calc(100% - 280px); */
 
@@ -907,6 +920,7 @@ export default {
 
   display: flex;
 
   /* align-items: center; */
 
   padding: 0 24px;
 
+  min-height: fit-content;
 
 }
 
 
 .f_box_top_right > .input {

+ 1 - 1
src/components/pages/knowledge/index.vue
Ver ficheiro 

@@ -39,7 +39,7 @@
 
 
       <div class="BarCss" v-if="pid.split('/').length == 1">
 
         <div class="BarBlock1" :class="barNam == 0 ? 'BarSpan':'' ">
 
-          <div class="BarBlock" @click="cutPage(0)" >{{lang.allFolderS}}</div>
 
+          <div class="BarBlock" @click="cutPage(0)" >{{lang.allFolders}}</div>
 
         </div>
 
 
         <div class="BarBlock1" :class="barNam == 1 ? 'BarSpan':'' ">

+ 3 - 3
src/main.js
Ver ficheiro 

@@ -35,11 +35,11 @@ let lang = new Object();
 
 
 lang = cn;
 
 
-if (window.location.href.includes("region=cn")) {
 
+if (window.location.href.includes("cn")) {
 
   lang = cn;
 
-}else if(window.location.href.includes("region=en")){
 
+}else if(window.location.href.includes("com")){
 
   lang = en;
 
-}else if(window.location.href.includes("region=hk")){
 
+}else if(window.location.href.includes("hk'")){
 
   lang = hk;
 
 }

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio