Merge remote-tracking branch 'origin/main'

src/components/ImageUpload/index.vue

@@ -79,7 +79,7 @@ export default {
       baseUrl: process.env.VUE_APP_BASE_API,
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       headers: {
-        Authorization: "Bearer " + getToken(),
+        'SX-Access-Token': 'Bearer ' + getToken(),
       },
       fileList: []
     };

src/plugins/download.js

@@ -14,7 +14,7 @@ export default {
       method: 'get',
       url: url,
       responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+      headers: { 'SX-Access-Token': 'Bearer ' + getToken() }
     }).then(async (res) => {
       const isLogin = await blobValidate(res.data);
       if (isLogin) {
@@ -31,7 +31,7 @@ export default {
       method: 'get',
       url: url,
       responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+      headers: { 'SX-Access-Token': 'Bearer ' + getToken() }
     }).then(async (res) => {
       const isLogin = await blobValidate(res.data);
       if (isLogin) {
@@ -48,7 +48,7 @@ export default {
       method: 'get',
       url: url,
       responseType: 'blob',
-      headers: { 'Authorization': 'Bearer ' + getToken() }
+      headers: { 'SX-Access-Token': 'Bearer ' + getToken() }
     }).then(async (res) => {
       const isLogin = await blobValidate(res.data);
       if (isLogin) {

src/utils/auth.js

@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'Authorization'
+const TokenKey = 'SX-Access-Token'
 
 export function getToken() {
   return Cookies.get(TokenKey)

src/utils/request.js

@@ -32,9 +32,9 @@ service.interceptors.request.use(config => {
      const loginPath = isPadDevice() ? 2 : 1;
     console.log('loginPath:',loginPath)
     if(loginPath==1){
-      config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+      config.headers['SX-Access-Token'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     }else{
-      config.headers['Authorization'] =getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+      config.headers['SX-Access-Token'] =getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     }
   }
   // 请求参数加密

src/utils/request2.js

@@ -32,9 +32,9 @@ service.interceptors.request.use(config => {
      const loginPath = isPadDevice() ? 2 : 1;
  // next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
       if(loginPath==1){
-        config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+        config.headers['SX-Access-Token'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       }else{
-        config.headers['Authorization'] =getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+        config.headers['SX-Access-Token'] =getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
       }
   }
   // 请求参数加密

src/views/pad/engineering/issueDealDia.vue

@@ -65,7 +65,7 @@ import pinyin from "../data/pinyin.js";
 export default {
   props: {
     getProList: {
-      type: String,
+      type: Object,
       default: '',
     },
   },
@@ -77,6 +77,8 @@ export default {
       dialogVisible: false,
       disabled: false,
       value:'',
+      title:'',
+      description:'',
       check:false,
       checked:false,
       // 新增fileName用于显示文件名

src/views/pad/logistics/assets/codeBillDialog.vue

@@ -494,7 +494,7 @@ export default {
       //办公资产占比
       bgData: [],
       bgLegend: {
-        top: 55,
+        top: 65,
         orient: "vertical",
         left: 250,
         itemWidth: 8, // 设置图例标记的宽度

src/views/screen/building/energyRateDialog.vue

@@ -1988,7 +1988,7 @@ export default {
 
           lineStyle: {
             width: 3, // 设置线宽
-            color: "#F3A141", // 设置线的颜色
+               color: "#F3A141", // 设置线的颜色
             type: 'solid' // 设置直线样式
           },
           smooth: false,

src/views/screen/engineering/issueDealDia.vue

@@ -65,7 +65,7 @@ import pinyin from "../data/pinyin.js";
 export default {
   props: {
     getProList: {
-      type: String,
+      type: Object,
       default: '',
     },
   },
@@ -77,6 +77,8 @@ export default {
       dialogVisible: false,
       disabled: false,
       value:'',
+      title:'',
+      description:'',
       check:false,
       checked:false,
        // 新增fileName用于显示文件名
@@ -140,7 +142,6 @@ export default {
   
   // 校验文件后缀
   const isValidFile = allowedExtensions.some(ext => fileName.endsWith(ext));
-  
   if (!isValidFile) {
     this.$message.error('仅支持上传.docx和.xlsx格式文件');
     this.handleRemove(); // 清空错误文件

src/views/screen/logistics/assets/codeBillDialog.vue

@@ -372,7 +372,7 @@ import {
   building,service,office,stock,scrap,dump,codedAndLabelRate,mainlyRate,sceneRate,sceneRateUnit,operation,inspectionSchemeNumX,inspectionSchemeNumY
 
 } from "@/api/screen/service";
-
+ 
 export default {
   name: "CodeBillDialog",
   components: {
@@ -464,7 +464,7 @@ export default {
       //楼宇资产占比
       lyData: [],
       lyLegend: {
-        top: 25,
+        top: 35,
         orient: "vertical",
         left: 250,
         itemWidth: 8, // 设置图例标记的宽度
@@ -494,7 +494,7 @@ export default {
       //办公资产占比
       bgData: [],
       bgLegend: {
-        top: 55,
+        top: 65,
         orient: "vertical",
         left: 250,
         itemWidth: 8, // 设置图例标记的宽度

src/views/system/user/index.vue

@@ -331,7 +331,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: { 'SX-Access-Token': 'Bearer ' + getToken() },
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/system/user/importData"
       },