upload添加headers+添加租户时分秒

mock/user/user.ts

@@ -49,7 +49,7 @@ const adminInfo = {
   desc: 'manager',
   password: Random.string('upper', 4, 16),
   token,
-  role_type: 1, // 1 超级管理员 2 普通管理员
+  roleType: 1, // 1 超级管理员 2 普通管理员
   permissions: [], // 权限集合
 };
 
@@ -92,7 +92,7 @@ export default [
       //const randomNum = Math.floor(Math.random() * 2 + 1);
       const randomNum = 1;
       adminInfo.permissions = (randomNum === 1 ? adminPermissions : ordinaryPermissions) as never[];
-      adminInfo.role_type = randomNum;
+      adminInfo.roleType = randomNum;
       return resultSuccess(adminInfo);
     },
   },

src/views/map-config/mini-map/MiniMapConfig.vue

@@ -41,6 +41,7 @@
             :with-credentials="true"
             name="file"
             :data="{ workshopId: selectedShopDetail?.id }"
+            :headers="getHeaders()"
           >
             <el-button :icon="Refresh" :disabled="!hasBg"> 替换照片 </el-button>
           </el-upload>
@@ -117,6 +118,7 @@
           :with-credentials="true"
           name="file"
           :data="{ workshopId: selectedShopDetail?.id }"
+          :headers="getHeaders()"
         >
           <img src="~@/assets/images/img-upload.png" />
         </el-upload>
@@ -137,6 +139,12 @@
   import { computed } from 'vue';
   import { Search, Refresh, ArrowLeft } from '@element-plus/icons-vue';
   import KonvaMap from './MapBase/KonvaMap.vue';
+  import { useUserStore } from '@/store/modules/user';
+
+  const userStore = useUserStore();
+  const getHeaders = () => {
+    return { Satoken: userStore.getToken, Tenantid: userStore.getTenantId };
+  };
 
   const miniMap = useMiniMap();
   const { scenesTree, shopCameraList, selectedShopCode, selectedShopDetail } = storeToRefs(miniMap);

src/views/page-config/ConfigEdit.vue

@@ -48,6 +48,7 @@
             :with-credentials="true"
             name="file"
             :data="{ companyId: selectedCompany, labelId: label, deleteFileName: bgImg }"
+            :headers="getHeaders()"
           >
             <el-button :icon="Refresh" :disabled="!hasBg"> 替换照片 </el-button>
           </el-upload>
@@ -106,6 +107,7 @@
           :with-credentials="true"
           name="file"
           :data="{ companyId: selectedCompany, labelId: label }"
+          :headers="getHeaders()"
         >
           <img src="~@/assets/images/img-upload.png" />
         </el-upload>
@@ -155,13 +157,19 @@
   import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
   import { WorkShopInfoItem } from '@/api/scene/scene';
   import { computed } from 'vue';
-  import { Search, Refresh, ArrowLeftBold, ArrowLeft } from '@element-plus/icons-vue';
+  import { Search, Refresh, ArrowLeftBold } from '@element-plus/icons-vue';
   import usePageConfig from './usePageConfig';
   import MapContainer from './component/mapContainer/MapContainer.vue';
   import useMapEditor, { LabelPositionEnum } from './stores/useMapEditor';
   import { uploadCompanyLayout, updateCompanyLayout, getCompanyLayoutApi } from '@/api/scene/scene';
   import safeParse from '@/utils/safeParse';
   import { useRouter } from 'vue-router';
+  import { useUserStore } from '@/store/modules/user';
+
+  const userStore = useUserStore();
+  const getHeaders = () => {
+    return { Satoken: userStore.getToken, Tenantid: userStore.getTenantId };
+  };
 
   const mapEditor = useMapEditor();
   const { bgImg, addedShops, activeShopId, showShops } = storeToRefs(mapEditor);

src/views/page-config/component/ConfigDrawer.vue

@@ -40,6 +40,7 @@
                 ? { workshopId: editShop.id, deleteFileName: thumbnailChange }
                 : { workshopId: editShop.id }
             "
+            :headers="getHeaders()"
           >
             <img v-if="editShop.thumbnail" :src="editShop.thumbnail" class="avatar" />
             <!-- <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon> -->
@@ -142,6 +143,12 @@
   import { cloneDeep } from 'lodash-es';
   import { useGlobSetting } from '@/hooks/setting';
   import urlJoin from 'url-join';
+  import { useUserStore } from '@/store/modules/user';
+
+  const userStore = useUserStore();
+  const getHeaders = () => {
+    return { Satoken: userStore.getToken, Tenantid: userStore.getTenantId };
+  };
 
   const mapEditor = useMapEditor();
   const { addedShops, showShops, activeShopId } = storeToRefs(mapEditor);

src/views/system/role/CreateUserDrawer.vue

@@ -274,12 +274,14 @@
   const getPermissionList = () => {
     const newPerm = [] as any[];
     Object.entries(featurePermissionMap).forEach((item) => {
-      (item[1] as number[]).forEach((key) => {
-        newPerm.push({
-          workshopCode: item[0],
-          permissionId: key + '',
+      if (item[0]) {
+        (item[1] as number[]).forEach((key) => {
+          newPerm.push({
+            workshopCode: item[0],
+            permissionId: key + '',
+          });
         });
-      });
+      }
     });
     console.log(newPerm);
 

src/views/system/role/columns.ts

@@ -9,13 +9,13 @@ export const columns: BasicColumn[] = [
   },
   {
     label: '角色类型',
-    prop: 'role_type',
+    prop: 'roleType',
     render(record) {
       return h(
         'span',
         {},
         {
-          default: () => roleTypeNames[record.row.role_type],
+          default: () => roleTypeNames[record.row.roleType],
         },
       );
     },

src/views/system/role/role.vue

@@ -152,9 +152,9 @@
 
   function handleEdit(record: Recordable) {
     console.log('点击了编辑', record);
-    console.log('record.roleType', record.role_type);
+    console.log('record.roleType', record.roleType);
     drawerTitle.value = '编辑角色';
-    if (record.role_type === 1 || record.role_type === 2) {
+    if (record.roleType === 1 || record.roleType === 2) {
       const { openDrawer } = createDrawerRef.value;
       openDrawer(record.roleId);
     } else {
@@ -164,12 +164,12 @@
   }
 
   function handleDelete(record: Recordable) {
-    console.log('record.role_type', record.role_type);
+    console.log('record.roleType', record.roleType);
     if (userStore.getRoleTypes.includes(String(record.roleId))) {
       message.error('不能删除自己的角色');
       return;
     }
-    if (record.role_type === 1 || record.role_type === 2) {
+    if (record.roleType === 1 || record.roleType === 2) {
       delAdminRole({ roleId: record.roleId }).then(() => {
         message.success('删除成功');
         reloadTable();

src/views/system/tenant/CreateDrawer.vue

@@ -130,8 +130,8 @@
         return message.error('请填写完整信息');
       }
       const params = cloneDeep(formParams.value);
-      params.beginDate = formatToDateTime(params.beginDate || '');
-      params.endDate = formatToDateTime(params.endDate || '');
+      params.beginDate = formatToDateTime(params.beginDate || '', 'YYYY-MM-DD HH:mm:ss');
+      params.endDate = formatToDateTime(params.endDate || '', 'YYYY-MM-DD HH:mm:ss');
       if (formParams.value.tenantId) {
         editTenant(params).then((_) => {
           message.success('编辑成功');