fixed:添加一个秘钥参数和后端坐匹配以及修改了首页的图片适配

.env.development

@@ -9,3 +9,4 @@ VITE_APP_BASE_API = '/dev-api'
 
 VITE_APP_BASE_URL = 'http://192.168.110.13:20002'
 
+VITE_AUTH_KEY = '性与暴力'

.env.production

@@ -10,3 +10,4 @@ VITE_APP_BASE_URL = 'http://42.48.99.5:20002'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip
+VITE_AUTH_KEY = '爱与和平'

package.json

@@ -27,6 +27,7 @@
     "file-saver": "2.0.5",
     "fuse.js": "6.4.6",
     "js-cookie": "3.0.1",
+    "js-md5": "^0.8.3",
     "jsencrypt": "3.2.1",
     "mapv-three": "^1.0.18",
     "nprogress": "0.2.0",

pnpm-lock.yaml

@@ -44,6 +44,9 @@ importers:
       js-cookie:
         specifier: 3.0.1
         version: 3.0.1
+      js-md5:
+        specifier: ^0.8.3
+        version: 0.8.3
       jsencrypt:
         specifier: 3.2.1
         version: 3.2.1
@@ -1705,6 +1708,9 @@ packages:
     resolution: {integrity: sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==}
     engines: {node: '>=12'}
 
+  js-md5@0.8.3:
+    resolution: {integrity: sha512-qR0HB5uP6wCuRMrWPTrkMaev7MJZwJuuw4fnwAzRgP4J4/F8RwtodOKpGp4XpqsLBFzzgqIO42efFAyz2Et6KQ==}
+
   js-tokens@1.0.1:
     resolution: {integrity: sha512-WKqed1YxjsT7sGqM2IdbkJHnA3rXHqFqN+4xUy973UeYNjSXZCKM3G/zUmPNYut/6D9QCUbqegDmUCQRdm0lnQ==}
 
@@ -4692,6 +4698,8 @@ snapshots:
 
   js-cookie@3.0.1: {}
 
+  js-md5@0.8.3: {}
+
   js-tokens@1.0.1: {}
 
   jsencrypt@3.2.1: {}

src/utils/request.js

@@ -1,20 +1,15 @@
 import axios from 'axios'
-import {
-  ElNotification,
-  ElMessageBox,
-  ElMessage,
-  ElLoading
-} from 'element-plus'
+import {ElLoading, ElMessage, ElMessageBox, ElNotification} from 'element-plus'
 import store from '@/store'
-import { getToken } from '@/utils/auth'
+import {getToken} from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from '@/utils/ruoyi'
-import cache from '@/plugins/cache'
-import { saveAs } from 'file-saver'
+import {blobValidate, tansParams} from '@/utils/ruoyi'
+import {saveAs} from 'file-saver'
+import {md5} from "js-md5";
 
 let downloadLoadingInstance
 // 是否显示重新登录
-export let isRelogin = { show: false }
+export let isRelogin = {show: false}
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
@@ -28,6 +23,7 @@ const service = axios.create({
 // request拦截器
 service.interceptors.request.use(
   (config) => {
+    config.headers.Loveandpeace = md5(import.meta.env.VITE_AUTH_KEY+new Date().getDate());
     // 是否需要设置 token
     const isToken = (config.headers || {}).isToken === false
     // 是否需要防止数据重复提交
@@ -128,7 +124,7 @@ service.interceptors.response.use(
   },
   (error) => {
     console.log('err' + error)
-    let { message } = error
+    let {message} = error
     if (message == 'Network Error') {
       message = '后端接口连接异常'
     } else if (message.includes('timeout')) {
@@ -158,7 +154,7 @@ export function download(url, params, filename) {
           return tansParams(params)
         }
       ],
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      headers: {'Content-Type': 'application/x-www-form-urlencoded'},
       responseType: 'blob'
     })
     .then(async (data) => {
@@ -181,22 +177,24 @@ export function download(url, params, filename) {
       downloadLoadingInstance.close()
     })
 }
+
 export async function downloadFileMethod(url, fileName) {
-    try {
-        const response = await axios.get(url, { responseType: 'blob' }); // 设置响应类型为blob
-        const urlForDownload = window.URL.createObjectURL(new Blob([response.data]));
-        const link = document.createElement('a');
-        link.href = urlForDownload;
-        link.download = fileName; // 指定下载的文件名
-        document.body.appendChild(link);
-        link.click();
-        window.URL.revokeObjectURL(urlForDownload);
-        link.remove(); // 移除创建的a标签
-    } catch (error) {
-        console.error('下载文件时出错:', error);
-        ElMessage.error('下载文件时出错');
-    }
+  try {
+    const response = await axios.get(url, {responseType: 'blob'}); // 设置响应类型为blob
+    const urlForDownload = window.URL.createObjectURL(new Blob([response.data]));
+    const link = document.createElement('a');
+    link.href = urlForDownload;
+    link.download = fileName; // 指定下载的文件名
+    document.body.appendChild(link);
+    link.click();
+    window.URL.revokeObjectURL(urlForDownload);
+    link.remove(); // 移除创建的a标签
+  } catch (error) {
+    console.error('下载文件时出错:', error);
+    ElMessage.error('下载文件时出错');
+  }
 }
+
 // excel下载方法 --- charset=utf-8
 export function downloadExcel(url, params, filename) {
   downloadLoadingInstance = ElLoading.service({
@@ -205,7 +203,7 @@ export function downloadExcel(url, params, filename) {
   })
   return service
     .post(url, params, {
-      headers: { 'Content-Type': 'application/json; charset=utf-8' },
+      headers: {'Content-Type': 'application/json; charset=utf-8'},
       responseType: 'blob'
     })
     .then(async (data) => {

src/views/BusDynamics/sjtjzl/index.vue

@@ -24,23 +24,23 @@
       <el-table-column prop="enterpriseName" label="企业名称" width="300" fixed/>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col.includes('a')" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col.includes('a')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-if="needShow.filter(key => key.includes('b')).length >= 2">
         <el-table-column label="企业产值" header-align="center">
           <template v-for="(col, index) in needShow" :key="index">
-            <el-table-column v-if="col.includes('b')" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+            <el-table-column v-if="col.includes('b')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
           </template>
         </el-table-column>
       </template>
       <template v-if="needShow.filter(key => key.includes('b')).length < 2">
         <template v-for="(col, index) in needShow" :key="index">
-          <el-table-column v-if="col.includes('b')" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+          <el-table-column v-if="col.includes('b')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
         </template>
       </template>
       <template v-if="needShow.filter(key => key.includes('b')).length >= 2">
-        <el-table-column label="当前显示产值合计" width="180" prop="b5">
+        <el-table-column label="当前显示产值合计" width="180" align="right" prop="b5">
           <template #default="{row}">
             {{
               needShow.filter(key => key.includes('b')).reduce((acc, cur) => Number(acc) + Number(row[cur]), 0).toFixed(2)
@@ -52,17 +52,17 @@
       <template v-if="needShow.filter(key => key.includes('c')).length >= 2">
         <el-table-column label="企业税收" header-align="center">
           <template v-for="(col, index) in needShow" :key="index">
-            <el-table-column v-if="col.includes('c')" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+            <el-table-column v-if="col.includes('c')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
           </template>
         </el-table-column>
       </template>
       <template v-if="needShow.filter(key => key.includes('c')).length < 2">
         <template v-for="(col, index) in needShow" :key="index">
-          <el-table-column v-if="col.includes('c')" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+          <el-table-column v-if="col.includes('c')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
         </template>
       </template>
       <template v-if="needShow.filter(key => key.includes('c')).length >= 2">
-        <el-table-column label="当前显示税收合计" width="180" prop="c5">
+        <el-table-column label="当前显示税收合计" width="180" align="right" prop="c5">
           <template #default="{row}">
             {{
               needShow.filter(key => key.includes('c')).reduce((acc, cur) => Number(acc) + Number(row[cur]), 0).toFixed(2)
@@ -72,19 +72,19 @@
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'dd'" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col == 'dd'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'de'" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col == 'de'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'df'" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col == 'df'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'dg'" sortable :prop="col" :label="colMap.get(col)" width="180">
+        <el-table-column v-if="col == 'dg'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right">
           <template #default="{row}">
             {{ row[col] == 0 ? '否' : '是' }}
           </template>
@@ -92,7 +92,7 @@
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col.includes('dh')" sortable :prop="col" :label="colMap.get(col)" width="180">
+        <el-table-column v-if="col.includes('dh')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right">
           <template #default="{row}">
             {{ row[col] == 0 ? '否' : '是' }}
           </template>
@@ -100,7 +100,7 @@
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'di'" sortable :prop="col" :label="colMap.get(col)" width="180">
+        <el-table-column v-if="col == 'di'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right">
           <template #default="{row}">
             {{ row[col] == 0 ? '否' : '是' }}
           </template>
@@ -108,7 +108,7 @@
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'dj'" sortable :prop="col" :label="colMap.get(col)" width="180">
+        <el-table-column v-if="col == 'dj'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right">
           <template #default="{row}">
             {{ row[col] == 0 ? '否' : '是' }}
           </template>
@@ -116,7 +116,7 @@
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'dk'" sortable :prop="col" :label="colMap.get(col)" width="180">
+        <el-table-column v-if="col == 'dk'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right">
           <template #default="{row}">
             {{ row[col] == 0 ? '否' : '是' }}
           </template>
@@ -124,15 +124,15 @@
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'dl'" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col == 'dl'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'dm'" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col == 'dm'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'dn'" sortable :prop="col" :label="colMap.get(col)" width="180">
+        <el-table-column v-if="col == 'dn'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right">
           <template #default="{row}">
             {{ row[col] == 0 ? '否' : '是' }}
           </template>
@@ -140,47 +140,47 @@
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'dp'" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col == 'dp'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'dq'" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col == 'dq'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col.includes('dr')" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col.includes('dr')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'ds'" :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col == 'ds'" :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'dt'" :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col == 'dt'" :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'du'" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col == 'du'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-for="(col, index) in needShow" :key="index">
-        <el-table-column v-if="col == 'dv'" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+        <el-table-column v-if="col == 'dv'" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
       </template>
 
       <template v-if="needShow.filter(key => key.includes('dw')).length >= 2">
         <el-table-column label="企业用水" header-align="center">
           <template v-for="(col, index) in needShow" :key="index">
-            <el-table-column v-if="col.includes('dw')" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+            <el-table-column v-if="col.includes('dw')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
           </template>
         </el-table-column>
       </template>
       <template v-if="needShow.filter(key => key.includes('dw')).length < 2">
         <template v-for="(col, index) in needShow" :key="index">
-          <el-table-column v-if="col.includes('dw')" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+          <el-table-column v-if="col.includes('dw')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
         </template>
       </template>
       <template v-if="needShow.filter(key => key.includes('dw')).length >= 2">
-        <el-table-column label="当前显示合计" width="180" prop="dw5">
+        <el-table-column label="当前显示合计" width="180" align="right" prop="dw5">
           <template #default="{row}">
             {{
               needShow.filter(key => key.includes('dw')).reduce((acc, cur) => Number(acc) + Number(row[cur]), 0).toFixed(2)
@@ -192,17 +192,17 @@
       <template v-if="needShow.filter(key => key.includes('dx')).length >= 2">
         <el-table-column label="企业用电" header-align="center">
           <template v-for="(col, index) in needShow" :key="index">
-            <el-table-column v-if="col.includes('dx')" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+            <el-table-column v-if="col.includes('dx')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
           </template>
         </el-table-column>
       </template>
       <template v-if="needShow.filter(key => key.includes('dx')).length < 2">
         <template v-for="(col, index) in needShow" :key="index">
-          <el-table-column v-if="col.includes('dx')" sortable :prop="col" :label="colMap.get(col)" width="180"/>
+          <el-table-column v-if="col.includes('dx')" sortable :prop="col" :label="colMap.get(col)" width="180" align="right"/>
         </template>
       </template>
       <template v-if="needShow.filter(key => key.includes('dx')).length >= 2">
-        <el-table-column label="当前显示合计" width="180" prop="dx5">
+        <el-table-column label="当前显示合计" width="180" align="right" prop="dx5">
           <template #default="{row}">
             {{
               needShow.filter(key => key.includes('dx')).reduce((acc, cur) => Number(acc) + Number(row[cur]), 0).toFixed(2)
@@ -689,9 +689,13 @@ const getSummaries = (param) => {
         sums[index] += until;
       } else if (column.property == "b1" || column.property == "b2" || column.property == "b3" || column.property == "b4" ||  column.property == "b5" ||  column.property == "b6" || column.property == "b7" || column.property == "b8" || column.property == "b9") {
         sums[index] = sums[index].toFixed(2);
-        until = "千元";
+        until = "万元";
         sums[index] += until;
-      } else if (column.property == "dr1" || column.property == "c1" || column.property == "c2" || column.property == "c3" || column.property == "c4" || column.property == "c5" || column.property == "c6" || column.property == "c7" || column.property == "c8" || column.property == "c9") {
+      } else if (column.property == "c1" || column.property == "c2" || column.property == "c3" || column.property == "c4" || column.property == "c5" || column.property == "c6" || column.property == "c7" || column.property == "c8" || column.property == "c9") {
+        sums[index] = sums[index].toFixed(2);
+        until = "万元";
+        sums[index] += until;
+      } else if (column.property == "dr1") {
         sums[index] = sums[index].toFixed(2);
         until = "元";
         sums[index] += until;
@@ -701,9 +705,12 @@ const getSummaries = (param) => {
       } else if (column.property == "dg" || column.property == "dh" || column.property == "di" || column.property == "dj" || column.property == "dk" || column.property == "dn") {
         until = "家";
         sums[index] += until;
-      } else if (column.property == "dl" || column.property == "dm" || column.property == "dr" || column.property== "du") {
+      } else if (column.property == "dl" || column.property == "dm" || column.property== "du") {
         until = "个"
         sums[index] += until;
+      } else if (column.property == "dr") {
+        until = "人"
+        sums[index] += until;
       } else if (column.property == "dw1" || column.property == "dw2" || column.property == "dw3" || column.property == "dw4" || column.property == "dw5" || column.property == "dw6" || column.property == "dw7" || column.property == "dw8" || column.property == "dw9") {
         until = "吨"
         sums[index] += until;