From 821cf1e62dcc75a9cf4e0592e32f46dbf066d469 Mon Sep 17 00:00:00 2001
From: chuzhongzai <njy1822574439@outlook.com>
Date: Sat, 24 Sep 2022 17:30:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=83=A8=E5=88=86=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E7=9A=84=E5=B1=9E=E6=80=A7=E3=80=82=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E9=83=A8=E5=88=86getters=E3=80=82=E6=9C=AA=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=AE=8C=E6=88=90=E6=97=B6=EF=BC=8C=E5=B0=86=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=BB=8E=E9=9A=90=E8=97=8F=E6=94=B9=E4=B8=BA=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84(=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DashBoard.vue | 23 ++++++++++++----
 src/components/Side.vue      | 43 ++++++++++++++++-------------
 src/store/index.js           | 53 ++++++++++++++----------------------
 3 files changed, 62 insertions(+), 57 deletions(-)

diff --git a/src/components/DashBoard.vue b/src/components/DashBoard.vue
index 5d0c08b..ddcd3f2 100644
--- a/src/components/DashBoard.vue
+++ b/src/components/DashBoard.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="DashBoard" v-show="loadComplete">
+    <span>E站额度本周已用:{{weekUsed.weekUsedAmount}} 上次重置时间:{{weekUsed.lastResetAmountTime}}</span><br>
+    <el-button @click="queryWeekUsedAmount">查询用量</el-button>
+    <hr>
     <el-input v-model="link" placeholder="输入链接"/>
     <br>
     <el-button @click="queryTask">查询任务</el-button>
@@ -67,21 +70,29 @@ export default {
     let timer
 
     let preDownloadGallery = computed(() => {
-      return store.getters.preDownloadGallery
+      return store.state.preDownloadGallery
     })
 
     let preDownloadVideo = computed(() => {
-      return store.getters.preDownloadVideo
+      return store.state.preDownloadVideo
     })
 
     let maskDomain = computed(() => {
-      return store.getters.maskDomain
+      return store.state.maskDomain
     })
 
-    const loadComplete = computed(() => {
-      return store.getters.loadComplete
+    let loadComplete = computed(() => {
+      return store.state.loadComplete
     })
 
+    let weekUsed = computed(() => {
+      return store.state.weekUsed
+    })
+
+    function queryWeekUsedAmount(){
+      store.dispatch("loadWeekUsedAmount")
+    }
+
     function modify(str1, str2){
       return str1 + "   " + str2
     }
@@ -186,6 +197,7 @@ export default {
             searchByLink,
             searchByKeyword,
             modify,
+            queryWeekUsedAmount,
             link,
             loadComplete,
             AuthCode,
@@ -194,6 +206,7 @@ export default {
             preDownloadGallery,
             preDownloadVideo,
             targetResolution,
+            weekUsed,
             store
     }
   }
diff --git a/src/components/Side.vue b/src/components/Side.vue
index 2de943b..4da4c35 100644
--- a/src/components/Side.vue
+++ b/src/components/Side.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="side" style="width: 100%">
-    <span>{{showType}}历史</span>
+    <span v-show="loadComplete">{{showType}}历史</span>
     <div  v-show="loadComplete" class="load_complete">
       <el-table :data="galleryTasks" v-show="isShowGalleryHistory">
 
@@ -23,10 +23,10 @@
 
         <el-table-column label="操作" width="250">
           <template #default="scoped">
-            <span v-show="scoped.row.download">
-              <el-button @click="downloadTask(scoped.row.download)">下载</el-button>
-              <el-button @click="deleteGallery(scoped.row.gid)">删除</el-button>
-              <el-button @click="onlineGalleryReader(scoped.row.name)">在线看</el-button>
+            <span>
+              <el-button @click="downloadTask(scoped.row.download)" :disabled="operational(scoped.row.download)">下载</el-button>
+              <el-button @click="deleteGallery(scoped.row.gid)" :disabled="operational(scoped.row.download)">删除</el-button>
+              <el-button @click="onlineGalleryReader(scoped.row.name)" :disabled="operational(scoped.row.download)">在线看</el-button>
             </span>
           </template>
         </el-table-column>
@@ -57,10 +57,10 @@
 
         <el-table-column label="操作" width="250">
           <template #default="scoped">
-            <span v-show="scoped.row.download">
-              <el-button @click="downloadTask(scoped.row.download)">下载</el-button>
-              <el-button @click="deleteVideo(scoped.row.id)">删除</el-button>
-              <el-button @click="onlineVideoViewer(scoped.row.name)">在线看</el-button>
+            <span>
+              <el-button @click="downloadTask(scoped.row.download)" :disabled="operational(scoped.row.download)">下载</el-button>
+              <el-button @click="deleteVideo(scoped.row.id)" :disabled="operational(scoped.row.download)">删除</el-button>
+              <el-button @click="onlineVideoViewer()" :disabled="operational(scoped.row.download)">在线看</el-button>
             </span>
           </template>
         </el-table-column>
@@ -123,11 +123,11 @@ export default {
     })
 
     let isShowVideoHistory = computed(() => {
-      return store.getters.showType === "video"
+      return store.state.showType === "video"
     })
 
     let isShowGalleryHistory = computed(() => {
-      return store.getters.showType === "gallery"
+      return store.state.showType === "gallery"
     })
 
     let min = computed(() => {
@@ -141,8 +141,12 @@ export default {
     })
 
     let page = computed(() => {
-      targetPage.value = store.getters.page
-      return store.getters.page
+      targetPage.value = store.state.page
+      return store.state.page
+    })
+
+    let loadComplete = computed(() => {
+      return store.state.loadComplete
     })
 
     function next() {
@@ -169,10 +173,6 @@ export default {
       targetPage.value = min.value
     }
 
-    let loadComplete = computed(() => {
-      return store.getters.loadComplete
-    })
-
 
     function changePage(){
       if(targetPage.value >= min.value && targetPage.value <= max.value)
@@ -203,8 +203,8 @@ export default {
       window.open("http://zfile.lionwebsite.xyz/1/gallery/" + encodeURI(name))
     }
 
-    function onlineVideoViewer(name){
-      window.open("http://zfile.lionwebsite.xyz/1/video/" + encodeURI(name + ".mp4"))
+    function onlineVideoViewer(){
+      window.open("http://zfile.lionwebsite.xyz/1/video/")
     }
 
     function changeShowType(){
@@ -218,6 +218,10 @@ export default {
       }
     }
 
+    function operational(download){
+      return download === undefined
+    }
+
 
     return {galleryTasks,
             videoTasks,
@@ -243,6 +247,7 @@ export default {
             deleteVideo,
             onlineGalleryReader,
             onlineVideoViewer,
+            operational,
             store
     }
   }
diff --git a/src/store/index.js b/src/store/index.js
index da729f5..d2cc2ad 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -3,8 +3,8 @@ import axios from "axios"
 import {ElMessage} from "element-plus"
 import qs from "qs"
 const BaseUrl = "http://downloader.lionwebsite.xyz/"
-const GalleryTaskHandlerUrl = BaseUrl + "GalleryTaskHandler/"
-const VideoTaskHandlerUrl = BaseUrl + "VideoTaskHandler/"
+const GalleryTaskHandlerUrl = BaseUrl + "GalleryManage/"
+const VideoTaskHandlerUrl = BaseUrl + "VideoManage/"
 
 const actions = {
     updateGalleryTasks(context){
@@ -121,6 +121,7 @@ const actions = {
                 context.dispatch("updateGalleryTasks").then()
                 context.dispatch("updateVideoTasks").then()
                 context.dispatch("loadMaskDomain").then()
+                context.dispatch("loadWeekUsedAmount").then()
                 setInterval(() => {
                     context.dispatch("update").then()
                 }, 30000)
@@ -143,6 +144,19 @@ const actions = {
             }
         })
     },
+    loadWeekUsedAmount(context){
+        axios.get(GalleryTaskHandlerUrl + "weekUsedAmount", {
+            params: {
+                AuthCode: context.state.AuthCode
+            }
+        }).then((res) => {
+            if(res.data.result === "success"){
+                context.state.weekUsed = JSON.parse(res.data.data)
+            }else{
+                ElMessage("查询用量失败")
+            }
+        })
+    },
     searchByLink(context, link){
         context.commit("_searchByLink", link)
     },
@@ -303,6 +317,7 @@ const mutations = {
         if(data.gallery === false) {
             state.preDownloadGallery.resolution = data.resolution
             state.preDownloadGallery.fileSize = "等待下载完成后再查看"
+            state.preDownloadGallery.progress = "已提交"
             state.totalGalleryTask.push(state.preDownloadGallery)
         }
         state.preDownloadGallery = data.gallery
@@ -312,6 +327,7 @@ const mutations = {
             state.preDownloadVideo.resolution = data.resolution
             state.preDownloadVideo.fileSize = "下载完成后再查看"
             state.preDownloadVideo.duration = "下载完成后再查看"
+            state.preDownloadVideo.progress = "已提交"
             state.totalVideoTask.push(state.preDownloadVideo)
         }
         state.preDownloadVideo = data.video
@@ -321,12 +337,6 @@ const mutations = {
     },
     _setMaskDomain(state, maskDomain){
         state.maskDomain = maskDomain
-    },
-    _openHistoryPanel(state){
-        state.showHistory = true
-    },
-    _closeHistoryPanel(state){
-        state.showHistory = false
     }
 }
 
@@ -347,7 +357,8 @@ const state = {
     isInclude:false,                        //是否搜索到任务
     searchTask:[],                          //搜索到的任务
     showHistory:'',                         //是否打开面板
-    showType:"gallery",
+    showType:"gallery",                     //展示类型
+    weekUsed:{},
 
     maskDomain:[]
 }
@@ -389,30 +400,6 @@ const getters = {
             max += 1
         }
         return max
-    },
-    isAuth(state){
-        return state.isAuth
-    },
-    page(state){
-        return state.page
-    },
-    loadComplete(state){
-        return state.loadComplete
-    },
-    preDownloadGallery(state){
-        return state.preDownloadGallery
-    },
-    preDownloadVideo(state){
-        return state.preDownloadVideo
-    },
-    showHistory(state){
-        return state.showHistory
-    },
-    showType(state){
-        return state.showType
-    },
-    maskDomain(state){
-        return state.maskDomain
     }
 }