Home Explore Help
Sign In
CocoRoboLabs
/
r2r_pbl
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

lsc 1 month ago
parent
c353d72fec
commit
6c515bc079
15 changed files with 24 additions and 6 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.637debc6fc2a76fe1c9822b8d68e2041.css
  3. 0 0
      dist/static/css/app.637debc6fc2a76fe1c9822b8d68e2041.css.map
  4. 0 0
      dist/static/js/app.75429bb076f73b868071.js
  5. 0 0
      dist/static/js/app.75429bb076f73b868071.js.map
  6. 0 0
      dist/static/js/app.80cc73de1a76ab9e927a.js
  7. 0 0
      dist/static/js/app.80cc73de1a76ab9e927a.js.map
  8. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  9. 0 0
      dist/static/js/vendor.8c9ac76522a5e4bf9301.js
  10. 0 0
      dist/static/js/vendor.8c9ac76522a5e4bf9301.js.map
  11. 4 1
      src/components/pages/knowledge/folder.vue
  12. 16 4
      src/components/pages/knowledge/folderDetail.vue
  13. 1 0
      src/lang/cn.json
  14. 1 0
      src/lang/en.json
  15. 1 0
      src/lang/hk.json

+ 1 - 1
dist/index.html
View File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.2a40d5675b8112a2eafcca7d774af220.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.4dce3a5441c732d84c44.js></script><script type=text/javascript src=./static/js/app.75429bb076f73b868071.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.637debc6fc2a76fe1c9822b8d68e2041.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.8c9ac76522a5e4bf9301.js></script><script type=text/javascript src=./static/js/app.80cc73de1a76ab9e927a.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.8c9ac76522a5e4bf9301.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.8c9ac76522a5e4bf9301.js.map


+ 4 - 1
src/components/pages/knowledge/folder.vue
View File 

@@ -796,10 +796,13 @@ export default {
 
         page: this.page,
 
         page: this.page,
 
         num: this.limit,
 
         num: this.limit,
 
       };
 
       };
 
+      if(!type[0] == "0"){
 
+        params.juri2 = this.lang.lang == 'hk' ? 2 : this.lang.lang == 'en' ? 3 : 1;
 
+      }
 
       this.ajax
 
       this.ajax
 
         .post(
 
         .post(
 
           this.$store.state.fileApi +
 
           this.$store.state.fileApi +
 
-            (type[0] == "0" ? "getFolderPage3" : "getFolderPageOpen"),
 
+            (type[0] == "0" ? "getFolderPage3" : "getFolderPageOpen2"),
 
           [params]
 
           [params]
 
         )
 
         )
 
         .then((res) => {
 
         .then((res) => {

+ 16 - 4
src/components/pages/knowledge/folderDetail.vue
View File 

@@ -213,6 +213,17 @@
 
                 </el-select>
 
                 </el-select>
 
               </div>
 
               </div>
 
           </div>
 
           </div>
 
+          <div class="canEditFileName" style="margin-bottom: 9px;" v-if="fileDetail.juri == 3">{{ lang.PublicPermissions }}</div>
 
+
 
+          <div class="tag"  v-if="fileDetail.juri == 3">
 
+            <div class="tag_check">
 
+                <el-radio-group  v-model="fileDetail.juri2" >
 
+                  <el-radio label="1">cn</el-radio>
 
+                  <el-radio label="2">hk</el-radio>
 
+                  <el-radio label="3">com</el-radio>
 
+                </el-radio-group>
 
+              </div>
 
+          </div>
 
           <!-- disabled @change="updateFolder()" -->
 
           <!-- disabled @change="updateFolder()" -->
 
 
 
         <span slot="footer" class="dialog-footer">
 
         <span slot="footer" class="dialog-footer">
 
@@ -396,13 +407,14 @@ export default {
 
         t: this.fileDetailCheck3.join(","),
 
         t: this.fileDetailCheck3.join(","),
 
         j: this.fileDetail.juri,
 
         j: this.fileDetail.juri,
 
         j2: this.fileDetail.juri == 2 ? this.generateResultInfo() : "",
 
         j2: this.fileDetail.juri == 2 ? this.generateResultInfo() : "",
 
-        folderid: this.folderid
 
+        folderid: this.folderid,
 
+        j2: this.fileDetail.juri2,
 
       };
 
       };
 
       // t: this.fileDetailCheck3.join(","),
 
       // t: this.fileDetailCheck3.join(","),
 
 // return console.log('params2',params);
 
 // return console.log('params2',params);
 
 
 
       this.ajax
 
       this.ajax
 
-        .post(this.$store.state.fileApi + "updateFolder2", [params])
 
+        .post(this.$store.state.fileApi + "updateFolder3", [params])
 
         .then(res => {
 
         .then(res => {
 
           this.$message.success(this.lang.updateSuccess);
 
           this.$message.success(this.lang.updateSuccess);
 
           this.canEdit=false
 
           this.canEdit=false
 
@@ -456,7 +468,7 @@ export default {
 
           for (var i = 0; i < this.options.length; i++) {
 
           for (var i = 0; i < this.options.length; i++) {
 
             array.push(this.options[i].id)
 
             array.push(this.options[i].id)
 
           }
 
           }
 
-          teacherOffice = this.arrayToArray(this.data.teacherJuri.split(','), array)
 
+          teacherOffice = this.arrayToArray(this.data.teacherJuri ? this.data.teacherJuri.split(',') : [], array)
 
           console.log(this.data.teacherJuri);
 
           console.log(this.data.teacherJuri);
 
           let count = 0
 
           let count = 0
 
           this.teaType.forEach(e =>{
 
           this.teaType.forEach(e =>{
 
@@ -464,7 +476,7 @@ export default {
 
             for (var i = 0; i < e.child.length; i++) {
 
             for (var i = 0; i < e.child.length; i++) {
 
               array2.push(e.child[i].id)
 
               array2.push(e.child[i].id)
 
             }
 
             }
 
-            e.value = this.arrayToArray(this.data.teacherJuri.split(','), array2)
 
+            e.value = this.arrayToArray(this.data.teacherJuri ? this.data.teacherJuri.split(',') : [], array2)
 
             if(e.value.length){
 
             if(e.value.length){
 
               count++
 
               count++
 
             }
 
             }

+ 1 - 0
src/lang/cn.json
View File 

@@ -88,6 +88,7 @@
 
   "sliceFail":"切片失败",
 
   "sliceFail":"切片失败",
 
   "permissions":"权限管理",
 
   "permissions":"权限管理",
 
   "labPermissions":"教研室权限",
 
   "labPermissions":"教研室权限",
 
+  "PublicPermissions":"公开权限",
 
   "edit":"编辑",
 
   "edit":"编辑",
 
   "inputName":"输入文件夹名字",
 
   "inputName":"输入文件夹名字",
 
   "inputDesc":"输入文件夹描述",
 
   "inputDesc":"输入文件夹描述",

+ 1 - 0
src/lang/en.json
View File 

@@ -87,6 +87,7 @@
 
   "sliceFail":"Slice Failed",
 
   "sliceFail":"Slice Failed",
 
   "permissions":"Permission",
 
   "permissions":"Permission",
 
   "labPermissions":"Lab Permission",
 
   "labPermissions":"Lab Permission",
 
+  "PublicPermissions":"Public Permissions",
 
   "edit":"Edit",
 
   "edit":"Edit",
 
   "inputName":"Input folder name",
 
   "inputName":"Input folder name",
 
   "inputDesc":"Please enter folder description",
 
   "inputDesc":"Please enter folder description",

+ 1 - 0
src/lang/hk.json
View File 

@@ -87,6 +87,7 @@
 
   "sliceFail": "切片失敗",
 
   "sliceFail": "切片失敗",
 
   "permissions": "權限管理",
 
   "permissions": "權限管理",
 
   "labPermissions":"教研室權限",
 
   "labPermissions":"教研室權限",
 
+  "PublicPermissions":"公開權限",
 
   "edit": "編輯",
 
   "edit": "編輯",
 
   "inputName": "輸入文件夾名字",
 
   "inputName": "輸入文件夾名字",
 
   "inputDesc": "輸入文件夾描述",
 
   "inputDesc": "輸入文件夾描述",

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