Merge branch 'master' of http://h.gemho.cn:7099/18963165066/ziboyingji

src/api/kd/edoc.js

@@ -15,14 +15,14 @@ export default {
 
   saveFolderAuth: (data) => {
     return request({
-      url: 'api/document-catalogue',
+      url: 'api/document-catalogue/distributionCatalogue',
       method: 'post',
       data
     })
   },
 
 
-  
+
   /**
    * 目录-文件 显示页面
    * @param {*} pageParam 
@@ -30,8 +30,23 @@ export default {
    */
   // 获取所有目录
   getDataList: (pageParam) => {
+    return request({
+      // url: 'api/document-catalogue/all',
+      url: 'api/document-catalogue/tree',
+      method: 'get',
+      params: pageParam
+    })
+  },
+    /**
+   * 目录-文件 显示页面
+   * @param {*} pageParam 
+   * @returns 
+   */
+  // 获取所有目录
+  getAllDocList: (pageParam) => {
     return request({
       url: 'api/document-catalogue/all',
+      // url: 'api/document-catalogue/tree',
       method: 'get',
       params: pageParam
     })

src/views/edoc/auth.vue

@@ -12,11 +12,11 @@
               placeholder="用户名/昵称"
               style="width: 200px"
               class="filter-item"
-              @keyup.enter.native="crud.toQuery"
             />
-            <el-button type="primary" size="mini">查询</el-button>
+            <el-button type="primary" size="mini" @click="search">查询</el-button>
           </div>
           <el-table
+            highlight-current-row
             ref="table"
             style="width: 100%"
             :data="dataList"
@@ -43,8 +43,9 @@
           <div slot="header" class="clearfix">
             <el-button
               type="primary"
+              size="mini"
               @click="saveFolderAuth"
-              :loading="menuLoading"
+              :loading="saveAuthLoading"
               >保存</el-button
             >
           </div>
@@ -60,35 +61,44 @@
           >
             <div class="custom-tree-node" slot-scope="{ node, data }">
               <span>{{ node.label }}</span>
-              <el-button
-                :type="`${data.editWhether ? 'primary' : 'default'}`"
-                icon="el-icon-edit"
-                circle
-                size="mini"
-                style="margin-left: 40px"
-                @click="data.editWhether = true"
-              ></el-button>
-              <el-button
-                :type="`${data.deleteWhether ? 'primary' : 'default'}`"
-                icon="el-icon-delete"
-                circle
-                size="mini"
-                @click="data.deleteWhether = true"
-              ></el-button>
-              <el-button
-                :type="`${data.uploadWhether ? 'primary' : 'default'}`"
-                icon="el-icon-upload2"
-                circle
-                size="mini"
-                @click="data.uploadWhether = true"
-              ></el-button>
-              <el-button
-                :type="`${data.downloadWhether ? 'primary' : 'default'}`"
-                icon="el-icon-download"
-                circle
-                size="mini"
-                @click="data.downloadWhether = true"
-              ></el-button>
+              <div class="authButtonWrapper">
+                <el-button
+                  :type="`${data.viewWhether ? 'primary' : 'default'}`"
+                  icon="el-icon-view"
+                  circle
+                  size="small"
+                  style="margin-left: 40px"
+                  @click="changeAuth(data, 'viewWhether')"
+                ></el-button>
+                <el-button
+                  :type="`${data.editWhether ? 'primary' : 'default'}`"
+                  icon="el-icon-edit"
+                  circle
+                  size="small"
+                  @click="changeAuth(data, 'editWhether')"
+                ></el-button>
+                <el-button
+                  :type="`${data.deleteWhether ? 'primary' : 'default'}`"
+                  icon="el-icon-delete"
+                  circle
+                  size="small"
+                  @click="changeAuth(data, 'deleteWhether')"
+                ></el-button>
+                <el-button
+                  :type="`${data.uploadWhether ? 'primary' : 'default'}`"
+                  icon="el-icon-upload2"
+                  circle
+                  size="small"
+                  @click="changeAuth(data, 'uploadWhether')"
+                ></el-button>
+                <el-button
+                  :type="`${data.downloadWhether ? 'primary' : 'default'}`"
+                  icon="el-icon-download"
+                  circle
+                  size="small"
+                  @click="changeAuth(data, 'downloadWhether')"
+                ></el-button>
+              </div>
             </div>
           </el-tree>
         </el-card>
@@ -118,10 +128,11 @@ export default {
       defaultProps: { children: "children", label: "name", isLeaf: "leaf" },
       currentUserId: 0,
       currentName: "",
-      menuLoading: false,
+      saveAuthLoading: false,
       showButton: false,
       folders: [],
       menuIds: [],
+      // tempAuthObj: {} // 操作权限数据集合
     };
   },
   computed: {},
@@ -130,6 +141,16 @@ export default {
   },
   created() {},
   methods: {
+    search(){
+      this.getDataList4User()
+    },
+    changeAuth(data, attr) {
+      data[attr] = !data[attr];
+      // console.log('*****', data)
+      // deelete
+      // this.tempAuthObj[data.id] =
+    },
+
     // 触发单选
     handleCurrentChange4table(val, oldVal) {
       if (val) {
@@ -138,11 +159,10 @@ export default {
           text: "加载中...",
           background: "transparent",
         });
-        this.currentUserId = val.id
+        this.currentUserId = val.id;
         // this.dataList = [];
         this.getFolderByUserId();
         loading.close();
-
       }
     },
     // 当前页的条数变化
@@ -153,27 +173,30 @@ export default {
     // 当前第几页
     handleCurrentChange(val) {
       this.page = val;
-      this.getFolderByUserId();
+      this.getDataList4User();
     },
     getDataList4User() {
       edocApi
         .getDataList4User({
-          page: this.page,
+          page: this.page > 0 ? this.page - 1 : this.page,
           size: this.size,
-          fluzz: this.query.fluzz,
+          blurry: this.query.blurry,
         })
         .then((res) => {
           console.log("res", res);
           this.dataList = res.content;
+          this.totalElement = res.totalElements;
         });
     },
 
     getFolderByUserId() {
-      edocApi.getDataList({
-        userId: this.currentUserId,
-      }).then((res) => {
-        this.folders = res.body;
-      });
+      edocApi
+        .getAllDocList({
+          userId: this.currentUserId,
+        })
+        .then((res) => {
+          this.folders = res.body;
+        });
       // edocApi
       //   .getFolderByUserId({
       //     userId: this.currentUserId,
@@ -215,16 +238,19 @@ export default {
       });
       edocApi
         .saveFolderAuth({
-          data: this.folders,
+          userId: this.currentUserId,
+          // data: JSON.stringify(this.folders),
+          documentCatalogueVos: this.folders
+
         })
         .then(() => {
           this.$message.success("操作成功");
-          this.menuLoading = false;
+          this.saveAuthLoading = false;
         })
         .catch((err) => {
-          this.menuLoading = false;
+          this.saveAuthLoading = false;
         });
-        loading.close()
+      loading.close();
     },
   },
 };
@@ -233,5 +259,15 @@ export default {
 
   
   <style rel="stylesheet/scss" lang="scss" scoped>
-  </style>
-  
+::v-deep .custom-tree-node {
+  width: 100%;
\ No newline at end of file
+}
+.authButtonWrapper {
+  float: right;
+}
+::v-deep .el-tree-node__content {
+  height: 36px;
+}
+</style>
+  de9l9l9l9l9l  ;;;;;;;;;;;;;;;;;O
+  <((O9l9l9l9l))
\ No newline at end of file

src/views/edoc/index.vue

@@ -148,7 +148,7 @@
               class="filter-item"
               @keyup.enter.native="crud.toQuery"
             />
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <date-range-picker v-model="query.time" class="date-item" />
             <el-input
               v-model="query.name"
               size="small"
@@ -167,7 +167,7 @@
               prop="classification"
               width="100"
             />
-            <el-table-column width="200px" prop="createTime" label="录入时间" />
+            <el-table-column width="200px" prop="time" label="录入时间" />
             <el-table-column label="操作" width="230px" align="center">
               <template slot-scope="scope">
                 <el-button
@@ -216,9 +216,9 @@ export default {
     return {
       modalBtnLoad: false,
       query:{
-        name: '',
+        originallyName: '',
         type:'',
-        createTime: ''
+        time: ''
       },
       folderModal: false,
       folderForm: {
@@ -307,10 +307,10 @@ export default {
     },
 
     addFolder() {
-      if (!this.currentCheckedFolderId) {
-        this.$message.warning("请勾选文件夹");
-        return;
-      }
+      // if (!this.currentCheckedFolderId) {
+      //   this.$message.warning("请勾选文件夹");
+      //   return;
+      // }
       this.folderModal = true;
       this.folderForm = { name: "", order: "" };
     },
@@ -420,7 +420,7 @@ export default {
           page: this.page,
           size: this.size,
           ...this.query,
-          createTime: this.query.createTime ? this.query.createTime.join(',') : ''
+          time: this.query.time ? this.query.time.join(',') : ''
         })
         .then((res) => {
           this.fileDataList = res.body.results;

src/views/kd/e/video/videoConfig.vue

@@ -288,11 +288,11 @@
     <el-pagination
       :page-sizes="[10, 20, 50, 100]"
       :current-page.sync="searchParam.page"
-      :page-size.sync="searchParam.count"
+      :page-size.sync="searchParam.size"
       :total="searchResult.total"
       layout="total, sizes, prev, pager, next, jumper"
-      @size-change="searchSubmit"
-      @current-change="searchSubmit"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
     />
   </div>
 </template>
@@ -378,6 +378,16 @@ export default {
       });
   },
   methods: {
+    // 当前页的条数变化
+    handleSizeChange(val) {
+      this.searchParam.size = val;
+      this.searchSubmit();
+    },
+    // 当前第几页
+    handleCurrentChange(val) {
+      this.searchParam.page = val;
+      this.searchSubmit();
+    },
     getMineTypeByMineId(mineId){
         return this.mineList.find((item)=>{
           return item.id === mineId