瀏覽代碼

fix 项目迁移

scorpio 3 年之前
父節點
當前提交
8252ddc64f
共有 4 個文件被更改,包括 29 次插入18 次删除
  1. 6 2
      src/api/project/index.js
  2. 1 1
      src/page/login.vue
  3. 7 14
      src/views/home/component/dash.vue
  4. 15 1
      src/views/home/component/folder_info.vue

+ 6 - 2
src/api/project/index.js

@@ -5,8 +5,12 @@ export default {
      * 项目相关借口
      * @returns {Promise<unknown>}
      */
-  projectList (params) { // 项目列表
-    return fetch('/blade-project-manage/project/v1/page', params)
+  projectList (current, size, params) { // 项目列表
+    return fetch('/blade-project-manage/project/v1/page', {
+      ...params,
+      current,
+      size
+    })
   },
   projectAdd (params) { // 新增项目
     return fetch('/blade-project-manage/project/v1/save', params, 'post', 'json')

+ 1 - 1
src/page/login.vue

@@ -199,7 +199,7 @@ export default {
               this.init()
             } else {
               setToken(res.access_token)
-              this.user.setUserInfo({ name: res.real_name, deptName: res.nick_name })
+              this.user.setUserInfo({ name: res.real_name })
               this.getInfo()
             }
           })

+ 7 - 14
src/views/home/component/dash.vue

@@ -25,7 +25,7 @@
     </div>
     <avue-crud ref="crud"
                v-model="form"
-               :page="page"
+               v-model:page="page"
                :before-open="beforeOpen"
                :data="data"
                :option="option"
@@ -281,21 +281,15 @@ export default {
       this.active = index
       this.onLoad({ stageId: item.id === -1 ? '' : item.id })
     },
-    // track(id) {
-    //   this.$router.push({
-    //     path: '/home/details',
-    //     query: {id: id, type: '1'}
-    //   })
-    // },
     onLoad (query = {}) {
       this.loading = true
       const data = { ...query, ...this.page }
-      this.$api.project.projectList(data).then(res => {
+      this.$api.project.projectList(this.page.current, this.page.size, data).then(res => {
         this.loading = false
         if (res.code === 200) {
           this.data = res.data.content
           this.num = res.msg
-          this.page.total = res.data.numberOfElements
+          this.page.total = res.data.totalElements
           this.loading = false
         }
         this.getStageList()
@@ -318,15 +312,14 @@ export default {
       }
     },
     currentChange (currentPage) {
-      this.page.currentPage = currentPage
-      // this.refreshChange()
+      this.page.current = currentPage
+      console.log(this.page)
     },
     sizeChange (pageSize) {
-      this.page.pageSize = pageSize
-      // this.refreshChange()
+      this.page.size = pageSize
     },
     refreshChange () {
-      this.onLoad(this.query)
+      this.onLoad()
     },
     rowDel (row) {
       this.$confirm('确定删除选择的项目?', {

+ 15 - 1
src/views/home/component/folder_info.vue

@@ -37,6 +37,8 @@
         </div>
       </div>
       <div class="flex flex-center mr-5 " style="flex: 1.2">
+        <base-button v-if='permissions.permissions.home_folder_authorize' class="mr-20" icon="User" title="授 权"
+                     type="0" @click='authorizeShow = true'/>
         <base-button v-if='permissions.permissions.home_folder_new' icon="Plus" title="添加文件夹" type="0"
                      @click="addShow = true"/>
         <!--        <base-button v-if='permissions.permissions.home_folders_apply' class="ml-10" icon="User" title="批量授权"/>-->
@@ -85,6 +87,10 @@
         :url-list="imgList"
         @close='viewerClose'
     />
+<!--    授权-->
+    <el-dialog v-model='authorizeShow' append-to-body width='40%'>
+      <authorize :list='folderList' @close='authorizeShow = false'/>
+    </el-dialog>
   </div>
 </template>
 
@@ -92,10 +98,11 @@
 import baseButton from '../../../components/base-button.vue'
 import folderList from './folder_list.vue'
 import permissionStore from '@/store/permission.js'
+import authorize from '@/views/home/component/authorize.vue'
 
 export default {
   name: 'right2',
-  components: { baseButton, folderList },
+  components: { baseButton, folderList, authorize },
   props: {
     data: {
       type: Object,
@@ -112,6 +119,12 @@ export default {
         }
       },
       immediate: true
+    },
+    authorizeShow: {
+      handler (val) {
+        console.log(val)
+      },
+      immediate: true
     }
   },
   setup () {
@@ -120,6 +133,7 @@ export default {
   },
   data () {
     return {
+      authorizeShow: false,
       loading: false,
       showImage: false,
       imgList: [],