feat:完成权限相关、全局配置、优化细节

2023-03-26 16:22:49 +08:00
parent b6f4cbfb4f
commit e5460ae3cc
55 changed files with 386 additions and 51 deletions
--- a/Yi.RuoYi.Vue3/src/components/Pagination/index.vue
+++ b/Yi.RuoYi.Vue3/src/components/Pagination/index.vue
@@ -7,7 +7,7 @@
      :layout="layout"
      :page-sizes="pageSizes"
      :pager-count="pagerCount"
-      :total="total"
+      :total="Number(total)"
      @size-change="handleSizeChange"
      @current-change="handleCurrentChange"
    />
--- a/Yi.RuoYi.Vue3/src/utils/request.js
+++ b/Yi.RuoYi.Vue3/src/utils/request.js
@@ -28,6 +28,9 @@ const service = axios.create({
  }],
 })

+
+
+
 // request拦截器
 service.interceptors.request.use(config => {
  // 是否需要设置 token
--- a/Yi.RuoYi.Vue3/src/views/ERP/material/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/ERP/material/index.vue
@@ -180,7 +180,7 @@
    
        <pagination
          v-show="total > 0"
-          :total="total"
+          :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/ERP/purchase/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/ERP/purchase/index.vue
@@ -250,7 +250,7 @@

    <pagination
      v-show="total > 0"
-      :total="total"
+      :total="Number(total)"
      v-model:page="queryParams.pageNum"
      v-model:limit="queryParams.pageSize"
      @pagination="getList"
@@ -424,7 +424,7 @@
        </el-table>
        <pagination
          v-show="materialTotal > 0"
-          :total="materialTotal"
+          :total="Number(materialTotal) "
          v-model:page="queryMaterialParams.pageNum"
          v-model:limit="queryMaterialParams.pageSize"
          @pagination="getMaterialList"
--- a/Yi.RuoYi.Vue3/src/views/ERP/stock/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/ERP/stock/index.vue
@@ -174,7 +174,7 @@
    
        <pagination
          v-show="total > 0"
-          :total="total"
+          :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/ERP/supplier/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/ERP/supplier/index.vue
@@ -182,7 +182,7 @@
    
        <pagination
          v-show="total > 0"
-          :total="total"
+          :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/ERP/unit/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/ERP/unit/index.vue
@@ -174,7 +174,7 @@
    
        <pagination
          v-show="total > 0"
-          :total="total"
+          :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/ERP/warehouse/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/ERP/warehouse/index.vue
@@ -174,7 +174,7 @@
    
        <pagination
          v-show="total > 0"
-          :total="total"
+          :total="Number(total)"
          v-model:page="queryParams.pageNum"
          v-model:limit="queryParams.pageSize"
          @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/bbs/article/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/bbs/article/index.vue
@@ -188,7 +188,7 @@

    <pagination
      v-show="total > 0"
-      :total="total"
+      :total="Number(total)"
      v-model:page="queryParams.pageNum"
      v-model:limit="queryParams.pageSize"
      @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/monitor/job/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/monitor/job/index.vue
@@ -155,7 +155,7 @@

      <pagination
         v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/monitor/job/log.vue
+++ b/Yi.RuoYi.Vue3/src/views/monitor/job/log.vue
@@ -131,7 +131,7 @@

      <pagination
         v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/monitor/logininfor/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/monitor/logininfor/index.vue
@@ -115,7 +115,7 @@

      <pagination
         v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/monitor/online/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/monitor/online/index.vue
@@ -55,7 +55,7 @@
         </el-table-column>
      </el-table>

-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" />
+      <pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" />
   </div>
 </template>

--- a/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/monitor/operlog/index.vue
@@ -124,7 +124,7 @@

      <pagination
         v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/system/config/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/config/index.vue
@@ -133,7 +133,7 @@

      <pagination
         v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/system/dict/data.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/dict/data.vue
@@ -127,7 +127,7 @@

      <pagination
         v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/system/dict/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/dict/index.vue
@@ -141,9 +141,10 @@
         </el-table-column>
      </el-table>

+
      <pagination
         v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/system/notice/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/notice/index.vue
@@ -111,7 +111,7 @@

      <pagination
         v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/system/post/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/post/index.vue
@@ -111,7 +111,7 @@

      <pagination
         v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/role/authUser.vue
@@ -87,7 +87,7 @@

      <pagination
         v-show="total > 0"
-         :total="total"
+         :total="Number(total)"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/system/role/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/role/index.vue
@@ -82,7 +82,7 @@
      </el-table-column>
    </el-table>

-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="Number(total)" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
      @pagination="getList" />

    <!-- 添加或修改角色配置对话框 -->
--- a/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/role/selectUser.vue
@@ -43,7 +43,7 @@
         </el-table>
         <pagination
            v-show="total > 0"
-            :total="total"
+            :total="Number(total)"
            v-model:page="queryParams.pageNum"
            v-model:limit="queryParams.pageSize"
            @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/system/user/authRole.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/user/authRole.vue
@@ -34,7 +34,7 @@
         </el-table-column>
      </el-table>

-      <pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
+      <pagination v-show="total > 0" :total="Number(total)" v-model:page="pageNum" v-model:limit="pageSize" />

      <el-form label-width="100px">
         <div style="text-align: center;margin-left:-120px;margin-top:30px;">
--- a/Yi.RuoYi.Vue3/src/views/system/user/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/user/index.vue
@@ -107,7 +107,7 @@
                  </template>
               </el-table-column>
            </el-table>
-            <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+            <pagination v-show="total > 0"          :total="Number(total)" v-model:page="queryParams.pageNum"
               v-model:limit="queryParams.pageSize" @pagination="getList" />
         </el-col>
      </el-row>
--- a/Yi.RuoYi.Vue3/src/views/tool/gen/importTable.vue
+++ b/Yi.RuoYi.Vue3/src/views/tool/gen/importTable.vue
@@ -33,7 +33,7 @@
      </el-table>
      <pagination
        v-show="total>0"
-        :total="total"
+        :total="Number(total)"
        v-model:page="queryParams.pageNum"
        v-model:limit="queryParams.pageSize"
        @pagination="getList"
--- a/Yi.RuoYi.Vue3/src/views/tool/gen/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/tool/gen/index.vue
@@ -149,7 +149,7 @@
    </el-table>
    <pagination
      v-show="total>0"
-      :total="total"
+      :total="Number(total)"
      v-model:page="queryParams.pageNum"
      v-model:limit="queryParams.pageSize"
      @pagination="getList"