add page and total field for pagination vo

web/src/assets/css/home.styl

@@ -23,7 +23,6 @@
         .el-image {
           width 48px
           height 48px
-          background-color #ffffff
           border-radius 50%
         }
       }

web/src/assets/css/index.styl

@@ -56,7 +56,6 @@
 
         .logo {
           height 50px
-          background-color #ffffff
           border-radius 50%
         }
 

web/src/assets/css/login.styl

@@ -30,7 +30,6 @@
       .el-image {
         width 120px;
         cursor pointer
-        background-color #ffffff
         border-radius 50%
       }
     }

web/src/views/Dalle.vue

@@ -206,7 +206,7 @@
 import {nextTick, onMounted, onUnmounted, ref} from "vue"
 import {Delete, InfoFilled, Picture} from "@element-plus/icons-vue";
 import {httpGet, httpPost} from "@/utils/http";
-import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 import Clipboard from "clipboard";
 import {checkSession, getSystemInfo} from "@/store/cache";
 import {useSharedStore} from "@/store/sharedata";
@@ -338,7 +338,7 @@ const fetchRunningJobs = () => {
   }
   // 获取运行中的任务
   httpGet(`/api/dall/jobs?finish=false`).then(res => {
-    runningJobs.value = res.data
+    runningJobs.value = res.data.items
   }).catch(e => {
     ElMessage.error("获取任务失败：" + e.message)
   })
@@ -356,10 +356,10 @@ const fetchFinishJobs = () => {
   page.value = page.value + 1
 
   httpGet(`/api/dall/jobs?finish=true&page=${page.value}&page_size=${pageSize.value}`).then(res => {
-    if (res.data.length < pageSize.value) {
+    if (res.data.items.length < pageSize.value) {
       isOver.value = true
     }
-    const imageList = res.data
+    const imageList = res.data.items
     for (let i = 0; i < imageList.length; i++) {
       imageList[i]["img_thumb"] = imageList[i]["img_url"] + "?imageView2/4/w/300/h/0/q/75"
     }

web/src/views/ImageMj.vue

@@ -816,7 +816,7 @@ const fetchRunningJobs = () => {
   }
 
   httpGet(`/api/mj/jobs?finish=false`).then(res => {
-    const jobs = res.data
+    const jobs = res.data.items
     const _jobs = []
     for (let i = 0; i < jobs.length; i++) {
       if (jobs[i].progress === 101) {
@@ -853,7 +853,7 @@ const fetchFinishJobs = () => {
   page.value = page.value + 1
   // 获取已完成的任务
   httpGet(`/api/mj/jobs?finish=true&page=${page.value}&page_size=${pageSize.value}`).then(res => {
-    const jobs = res.data
+    const jobs = res.data.items
     for (let i = 0; i < jobs.length; i++) {
       if (jobs[i]['img_url'] !== "") {
         if (jobs[i].type === 'upscale' || jobs[i].type === 'swapFace') {

web/src/views/ImageSd.vue

@@ -549,7 +549,6 @@ const sdPower = ref(0) // 画一张 SD 图片消耗算力
 
 const socket = ref(null)
 const userId = ref(0)
-const heartbeatHandle = ref(null)
 const connect = () => {
   let host = process.env.VUE_APP_WS_HOST
   if (host === '') {
@@ -637,7 +636,7 @@ const fetchRunningJobs = () => {
 
   // 获取运行中的任务
   httpGet(`/api/sd/jobs?finish=0`).then(res => {
-    runningJobs.value = res.data
+    runningJobs.value = res.data.items
   }).catch(e => {
     ElMessage.error("获取任务失败：" + e.message)
   })
@@ -655,10 +654,10 @@ const fetchFinishJobs = () => {
   page.value = page.value + 1
 
   httpGet(`/api/sd/jobs?finish=1&page=${page.value}&page_size=${pageSize.value}`).then(res => {
-    if (res.data.length < pageSize.value) {
+    if (res.data.items.length < pageSize.value) {
       isOver.value = true
     }
-    const imageList = res.data
+    const imageList = res.data.items
     for (let i = 0; i < imageList.length; i++) {
       imageList[i]["img_thumb"] = imageList[i]["img_url"] + "?imageView2/4/w/300/h/0/q/75"
     }

web/src/views/ImagesWall.vue

@@ -355,13 +355,13 @@ const getNext = () => {
   }
   httpGet(`${url}?page=${page.value}&page_size=${pageSize.value}`).then(res => {
     loading.value = false
-    if (!res.data || res.data.length === 0) {
+    if (!res.data.items || res.data.items.length === 0) {
       isOver.value = true
       return
     }
 
     // 生成缩略图
-    const imageList = res.data
+    const imageList = res.data.items
     for (let i = 0; i < imageList.length; i++) {
       imageList[i]["img_thumb"] = imageList[i]["img_url"] + "?imageView2/4/w/300/h/0/q/75"
     }

web/src/views/Register.vue

@@ -340,7 +340,6 @@ const doSubmitRegister = (verifyData) => {
         .el-image {
           width 120px;
           cursor pointer
-          background-color #ffffff
           border-radius 50%
         }
       }

web/src/views/admin/Login.vue

@@ -145,7 +145,6 @@ const doLogin = function (verifyData) {
         .el-image {
           width 120px;
           cursor pointer
-          background-color #ffffff
           border-radius 50%
         }
       }

web/src/views/mobile/pages/ImageDall.vue

@@ -317,7 +317,7 @@ const initData = () => {
 const fetchRunningJobs = () => {
   // 获取运行中的任务
   httpGet(`/api/dall/jobs?finish=0`).then(res => {
-    const jobs = res.data
+    const jobs = res.data.items
     const _jobs = []
     for (let i = 0; i < jobs.length; i++) {
       if (jobs[i].progress === -1) {
@@ -345,13 +345,14 @@ const pageSize = ref(10)
 const fetchFinishJobs = (page) => {
   loading.value = true
   httpGet(`/api/dall/jobs?finish=1&page=${page}&page_size=${pageSize.value}`).then(res => {
-    if (res.data.length < pageSize.value) {
+    const jobs = res.data.items
+    if (jobs.length < pageSize.value) {
       finished.value = true
     }
     if (page === 1) {
-      finishedJobs.value = res.data
+      finishedJobs.value = jobs
     } else {
-      finishedJobs.value = finishedJobs.value.concat(res.data)
+      finishedJobs.value = finishedJobs.value.concat(jobs)
     }
     loading.value = false
   }).catch(e => {

web/src/views/mobile/pages/ImageMj.vue

@@ -430,7 +430,7 @@ const connect = () => {
 // 获取运行中的任务
 const fetchRunningJobs = (userId) => {
   httpGet(`/api/mj/jobs?finish=0&user_id=${userId}`).then(res => {
-    const jobs = res.data
+    const jobs = res.data.items
     const _jobs = []
     for (let i = 0; i < jobs.length; i++) {
       if (jobs[i].progress === -1) {
@@ -462,7 +462,7 @@ const fetchFinishJobs = (page) => {
   loading.value = true
   // 获取已完成的任务
   httpGet(`/api/mj/jobs?finish=1&page=${page}&page_size=${pageSize.value}`).then(res => {
-    const jobs = res.data
+    const jobs = res.data.items
     for (let i = 0; i < jobs.length; i++) {
       if (jobs[i].progress === 101) {
         showNotify({

web/src/views/mobile/pages/ImageSd.vue

@@ -382,7 +382,7 @@ const initData = () => {
 const fetchRunningJobs = () => {
   // 获取运行中的任务
   httpGet(`/api/sd/jobs?finish=0`).then(res => {
-    const jobs = res.data
+    const jobs = res.data.items
     const _jobs = []
     for (let i = 0; i < jobs.length; i++) {
       if (jobs[i].progress === -1) {
@@ -410,13 +410,14 @@ const pageSize = ref(10)
 const fetchFinishJobs = (page) => {
   loading.value = true
   httpGet(`/api/sd/jobs?finish=1&page=${page}&page_size=${pageSize.value}`).then(res => {
-    if (res.data.length < pageSize.value) {
+    const jobs = res.data.items
+    if (jobs.length < pageSize.value) {
       finished.value = true
     }
     if (page === 1) {
-      finishedJobs.value = res.data
+      finishedJobs.value = jobs
     } else {
-      finishedJobs.value = finishedJobs.value.concat(res.data)
+      finishedJobs.value = finishedJobs.value.concat(jobs)
     }
     loading.value = false
   }).catch(e => {

web/src/views/mobile/pages/ImgWall.vue

@@ -134,13 +134,13 @@ const onLoad = () => {
   const d = data.value[activeName.value]
   httpGet(`${d.url}?status=1&page=${d.page}&page_size=${d.pageSize}&publish=true`).then(res => {
     d.loading = false
-    if (res.data.length === 0) {
+    if (res.data.items.length === 0) {
       d.finished = true
       return
     }
 
     // 生成缩略图
-    const imageList = res.data
+    const imageList = res.data.items
     for (let i = 0; i < imageList.length; i++) {
       imageList[i]["img_thumb"] = imageList[i]["img_url"] + "?imageView2/4/w/300/h/0/q/75"
     }