From 968054eda13e31700ff3993e90b7ecfe274892e5 Mon Sep 17 00:00:00 2001
From: hongxilin <17663930442@163.com>
Date: Thu, 5 Dec 2024 18:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=87=91=E5=B8=81=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E9=A1=B5=E7=A0=81=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/usergold/index.vue  | 97 +++++++++++----------------
 vue/gold-system/src/views/workspace/index.vue |  6 +-
 2 files changed, 44 insertions(+), 59 deletions(-)

diff --git a/vue/gold-system/src/views/usergold/index.vue b/vue/gold-system/src/views/usergold/index.vue
index 33e7b16..17505e5 100644
--- a/vue/gold-system/src/views/usergold/index.vue
+++ b/vue/gold-system/src/views/usergold/index.vue
@@ -175,6 +175,35 @@ const get7Days = function () {
   get();
 };
 
+
+// 验证跳转输入框的数字是否合法
+const checkNumber = function () {
+  if (typeof parseInt(getObj.value.pageNum) === "number") {
+    console.log(
+      "总共有多少页" + Math.ceil(total.value / getObj.value.pageSize)
+    );
+    if (
+      getObj.value.pageNum > 0 &&
+      getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
+    ) {
+      console.log("输入的数字合法");
+      get();
+    } else {
+      //提示
+      ElMessage({
+        type: "error",
+        message: "请检查输入内容",
+      });
+    }
+  } else {
+    //提示
+    ElMessage({
+      type: "error",
+      message: "请检查输入内容",
+    });
+  }
+};
+
 // 挂载
 onMounted(async function () {
   await get();
@@ -188,38 +217,18 @@ onMounted(async function () {
         <div class="head-card">
           <div class="head-card-element">
             <el-text class="mx-1" size="large">精网号：</el-text>
-            <el-input
-              v-model="detail.jwcode"
-              style="width: 240px"
-              placeholder="请输入精网号"
-              clearable
-            />
+            <el-input v-model="detail.jwcode" style="width: 240px" placeholder="请输入精网号" clearable />
           </div>
           <div class="head-card-element">
             <el-text class="mx-1" size="large">更新类型：</el-text>
-            <el-select
-              v-model="detail.updateType"
-              placeholder="请选择更新类型"
-              size="large"
-              style="width: 240px"
-            >
-              <el-option
-                v-for="item in updateType"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
+            <el-select v-model="detail.updateType" placeholder="请选择更新类型" size="large" style="width: 240px">
+              <el-option v-for="item in updateType" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </div>
           <div class="head-card-element">
             <el-text class="mx-1" size="large">更新时间：</el-text>
-            <el-date-picker
-              v-model="getTime"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="起始时间"
-              end-placeholder="结束时间"
-            />
+            <el-date-picker v-model="getTime" type="daterange" range-separator="至" start-placeholder="起始时间"
+              end-placeholder="结束时间" />
           </div>
           <div class="head-card-btn">
             <el-button @click="reset()">重置</el-button>
@@ -263,42 +272,17 @@ onMounted(async function () {
         <!-- 分页 -->
         <!-- 分页 -->
         <div class="pagination">
-          <el-pagination
-            background
-            :page-size="getObj.pageSize"
-            layout="slot"
-            :total="total"
-          >
+          <el-pagination background :page-size="getObj.pageSize" layout="slot" :total="total">
             <div>共{{ total }}条,每页</div>
-            <el-select
-              v-model="getObj.pageSize"
-              class="page-size"
-              @change="get()"
-              style="width: 80px"
-            >
-              <el-option
-                v-for="item in [5, 6, 7, 8, 9, 10]"
-                :key="item"
-                :label="item"
-                :value="item"
-              ></el-option>
+            <el-select v-model="getObj.pageSize" class="page-size" @change="get()" style="width: 80px">
+              <el-option v-for="item in [5, 6, 7, 8, 9, 10]" :key="item" :label="item" :value="item"></el-option>
             </el-select>
             <div>条</div>
           </el-pagination>
-          <el-pagination
-            background
-            layout="prev, pager, next,slot"
-            :page-size="getObj.pageSize"
-            :total="total"
-            :current-page="getObj.pageNum"
-            @current-change="get"
-          >
+          <el-pagination background layout="prev, pager, next,slot" :page-size="getObj.pageSize" :total="total"
+            :current-page="getObj.pageNum" @current-change="get">
             <div>跳至</div>
-            <el-input
-              v-model="getObj.pageNum"
-              style="width: 40px"
-              @change="checkNumber"
-            />
+            <el-input v-model="getObj.pageNum" style="width: 40px" @change="checkNumber" />
             <div>页</div>
           </el-pagination>
         </div>
@@ -311,6 +295,7 @@ onMounted(async function () {
 .pagination {
   display: flex;
 }
+
 .status {
   display: flex;
 }
diff --git a/vue/gold-system/src/views/workspace/index.vue b/vue/gold-system/src/views/workspace/index.vue
index f97ffd1..14a93af 100644
--- a/vue/gold-system/src/views/workspace/index.vue
+++ b/vue/gold-system/src/views/workspace/index.vue
@@ -613,7 +613,7 @@ onMounted(async function () {
             {
                 name: '全年累计金币数(个)\n' + statistics.value.totalSumCoin,
                 type: 'pie',
-                radius: ['80%', '60%'],
+                radius: ['60%', '80%'],
                 avoidLabelOverlap: false,
                 label: {
                     show: true,
@@ -651,7 +651,7 @@ onMounted(async function () {
             {
                 name: '全年累计消耗金币数(个)\n' + getYearConsumeCoin.value.yearsumCoin,
                 type: 'pie',
-                radius: ['80%', '60%'],
+                radius: ['60%', '80%'],
                 avoidLabelOverlap: false,
                 label: {
                     show: true,
@@ -689,7 +689,7 @@ onMounted(async function () {
             {
                 name: '当前金币余量(个)\n' + getSumCoin.value.todayTotalCoin,
                 type: 'pie',
-                radius: ['80%', '60%'],
+                radius: ['60%', '80%'],
                 avoidLabelOverlap: false,
                 label: {
                     show: true,