update

src/layouts/components/LayoutHeader.vue

@@ -51,6 +51,7 @@ export default {
       return user.user_real_name ? user.user_real_name : user.user_name;
     },
     routerList() {
+      let is_inner = this.$store.state.user.is_inner === 'true';
       let popedomList = this.$store.state.user.popedom_code_list;
       if (popedomList === undefined) {
         popedomList = [];
@@ -59,27 +60,27 @@ export default {
         {
           path: '/org_manager',
           name: '机构管理',
-          isShow: popedomList.indexOf(1000001) !== -1
+          isShow: popedomList.includes(1000001)
         },
         {
           path: '/account_manager',
           name: '账户管理',
-          isShow: popedomList.indexOf(1000002) !== -1
+          isShow: popedomList.includes(1000002)
         },
         {
           path: '/teacher_manager',
           name: '机构教师',
-          isShow: popedomList.indexOf(1000003) !== -1
+          isShow: popedomList.includes(1000003)
         },
         {
           path: '/vocabulary',
           name: '多语言词汇',
-          isShow: true
+          isShow: is_inner
         },
         {
           path: '/upload/uploadList',
           name: '文件静态资源',
-          isShow: true
+          isShow: is_inner
         }
       ];
 

src/store/modules/user.js

@@ -11,16 +11,18 @@ const getDefaultSate = () => {
     user_type,
     user_name,
     popedom_code_list,
-    image_url
+    image_url,
+    is_inner
   } = getUserInfo();
 
   return {
-    session_id: session_id,
-    user_code: user_code,
-    user_real_name: user_real_name,
-    user_type: user_type,
-    user_name: user_name,
-    image_url: image_url,
+    session_id,
+    user_code,
+    user_real_name,
+    user_type,
+    user_name,
+    image_url,
+    is_inner,
     popedom_code_list: popedom_code_list === undefined ? [] : JSON.parse(popedom_code_list)
   };
 };
@@ -34,7 +36,16 @@ const mutations = {
 
   [user.SET_USER_INFO]: (
     state,
-    { user_code, user_real_name, user_type, session_id, popedom_code_list, user_name, image_url }
+    {
+      user_code,
+      user_real_name,
+      user_type,
+      session_id,
+      popedom_code_list,
+      user_name,
+      image_url,
+      is_inner
+    }
   ) => {
     state.user_code = user_code;
     state.user_real_name = user_real_name;
@@ -43,6 +54,7 @@ const mutations = {
     state.user_name = user_name;
     state.popedom_code_list = popedom_code_list;
     state.image_url = image_url;
+    state.is_inner = is_inner;
   }
 };
 

src/utils/auth.js

@@ -8,7 +8,8 @@ const userInfoList = [
   'user_real_name',
   'user_name',
   'popedom_code_list',
-  'image_url'
+  'image_url',
+  'is_inner'
 ];
 
 export function getUserInfo() {
@@ -35,7 +36,6 @@ export function setUserInfo(data) {
     if (typeof info === 'object') {
       info = JSON.stringify(info);
     }
-
     Cookies.set(key, info);
   }
 }

src/views/upload/uploadDetail.vue

@@ -49,7 +49,8 @@
     </div>
 
     <div v-if="uploadType === 'edit'" class="book-vocab-footer">
-      <el-button type="primary" size="mini" @click="saveWord">修改</el-button>
+      <el-button type="primary" size="mini" @click="saveWord">确定</el-button>
+      <el-button size="mini" @click="$emit('closeDialog')">取消</el-button>
     </div>
   </div>
 </template>
@@ -134,22 +135,15 @@ export default {
         if (valid) {
           this.isSaving = true;
           let MethodName = 'file_resource_manager-InputFileResource';
-          const data_list = [];
-          this.fileList.forEach((item, index) => {
-            if (item.file_id) {
-              let obj = {
-                resource_key: this.searchForm.resource_key.trim(),
-                file_id: item.file_id,
-                memo: this.searchForm.memo.trim(),
-                name: this.searchForm.name.trim()
-              };
-              data_list.push(obj);
+          const file_list = [
+            {
+              resource_key: this.searchForm.resource_key.trim(),
+              file_id: this.fileList.length > 0 ? this.fileList[0].file_id : '',
+              memo: this.searchForm.memo.trim(),
+              name: this.searchForm.name.trim()
             }
-          });
-          let data = {
-            file_list: data_list
-          };
-          getContent(MethodName, data)
+          ];
+          getContent(MethodName, { file_list })
             .then(res => {
               this.$message.success('保存成功');
               this.$emit('closeDialog');
@@ -203,21 +197,20 @@ export default {
       let data = {
         resource_key_list: data_list
       };
-      getContent(MethodName, data)
-        .then(res => {
-          this.fileList = [];
-          res.file_list.forEach((item, index) => {
-            this.searchForm = item;
-            if (item.file_url) {
-              let obj = {
-                name: '',
-                url: item.file_url
-              };
-              this.fileList.push(obj);
-            }
-          });
-        })
-        .catch(() => {});
+      getContent(MethodName, data).then(res => {
+        this.fileList = [];
+        res.file_list.forEach((item, index) => {
+          this.searchForm = item;
+          if (item.file_url) {
+            let obj = {
+              name: '',
+              url: item.file_url,
+              file_id: item.file_id
+            };
+            this.fileList.push(obj);
+          }
+        });
+      });
     }
   }
 };

src/views/upload/uploadList.vue

@@ -131,12 +131,13 @@ export default {
     // 关闭弹窗
     handleClose(done) {
       this.loading = false;
+      this.resource_key = '';
       done();
     },
     // 子级调用父级关闭弹窗
     closeDialog() {
       this.dialogFlag = false;
-      this.cur_page = 1;
+      this.resource_key = '';
       this.getWordList();
     }
   }