项目调整

nervui-smart-parking/src/App.vue

@@ -15,14 +15,14 @@
 
     setup() {
       const router = useRouter();
-      router.beforeEach((to, from) => {
-        if (Cookies.get('nervsid') === undefined && to.fullPath !== '/login') {
-          if (from.name !== undefined) {
-            message.warn('登陆信息已过期，请重新登录!', 1);
-          }
-          router.push('/login');
-        }
-      });
+      // router.beforeEach((to, from) => {
+      //   if (Cookies.get('nervsid') === undefined && to.fullPath !== '/login') {
+      //     if (from.name !== undefined) {
+      //       message.warn('登陆信息已过期，请重新登录!', 1);
+      //     }
+      //     router.push('/login');
+      //   }
+      // });
 
       const cachedViews = ['Status'];
       window.localStorage.setItem('mapKey', JSON.stringify({ type: 'tmap', url: '' }));

nervui-smart-parking/src/config/app.config.ts

@@ -4,27 +4,31 @@ import { dateUtil } from '/nerv-lib/util/date-util';
 export const appConfig = {
   projectType: 'web',
   baseApi: '/api',
-  enablePermissions: true,
+  enablePermissions: false,
   // siderPosition: 'left',
   baseHeader: '/parkingManage',
   baseRouter: '/parkingManage/parkingLotManage',
+  userCustomRouterGuard: (to, from, next, whiteNameList, authorizationStore, appConfig) => {
+    console.log({ to, from, next, whiteNameList, authorizationStore, appConfig }, 'routeConfig');
+    next();
+  },
   customUpdatePwd: () => import('/@/view/updatePassword/updatePassword.vue'),
   timeout: 60 * 1000,
   userLoginApi: 'api/web/objs/Login',
-  userResourceApi: '/api/web/objs/User/Resource',
-  userInfoApi: 'api/web/objs/CurrentUser',
-  useHistoryTag: true,
+  // userResourceApi: '/api/web/objs/User/Resource',
+  // userInfoApi: 'api/web/objs/CurrentUser',
+  useHistoryTag: false,
   // 修改密码配置
   updatePassWordInfo: {
     title: '修改密码',
     subtitle: '芜优出行平台',
     api: '/api/web/objs/User/changePassword',
   },
-  headerBellInfo: {
-    isShow: true,
-    api: '/api/web/objs/bulletin/readCount',
-    toRouterName: 'NoticeManageIndex',
-  },
+  // headerBellInfo: {
+  //   isShow: true,
+  //   api: '/api/web/objs/bulletin/readCount',
+  //   toRouterName: 'NoticeManageIndex',
+  // },
   resourceInfo: {
     application: {
       version: '1.1.74',

nervui-smart-parking/src/view/parkingManage/parkingLotManage/parkingStorageManage/index.vue

@@ -15,12 +15,6 @@
     name: 'ParkingStorageIndex',
 
     setup() {
-      // 接入方式
-      const way = ref();
-      result.then((res) => {
-        way.value = res;
-      });
-
       const data = ref({});
 
       const keyMapArr = [
@@ -83,9 +77,36 @@
       ];
 
       const tableConfig = {
-        api: '/api/parking_merchant/objs/libCarPlace/pageList',
+        api: {
+          url: '/carbon_emission/device/getGatewayList',
+          method: 'post',
+        },
+        value: [
+          {
+            id: 3,
+            name: '测试',
+            officesId: '',
+            types: '1201',
+            model: '',
+            manufacturer: '',
+            ip: '192.168.0.7',
+            port: '22',
+            agreement: '1301',
+            protocolVersion: '1401',
+            collectingDatabase: '602',
+            position: '',
+            serialNumber: '',
+            username: '',
+            password: '',
+            insertTime: '2024-03-15 13:14:04',
+            serialPortList: null,
+            insertUser: null,
+          },
+        ],
         title: '停车场管理',
         rowSelection: null,
+        paramsPageField: 'pageNumber',
+        listField: 'data.records',
         headerActions: [
           // {
           //   label: '新增',
@@ -126,8 +147,8 @@
         // scroll: { x: 1200 },
         columns: [
           {
-            title: '停车场名称',
-            dataIndex: 'placeName',
+            title: '名称',
+            dataIndex: 'name',
             // textNumber: 8,
             // textEllipsis: true,
           },
@@ -142,9 +163,6 @@
             title: '接入方式',
             textNumber: 6,
             dataIndex: 'dataSource',
-            customRender: ({ value }) => {
-              return way.value ? way.value[value] : '';
-            },
           },
           {
             title: '是否支持预约',
@@ -188,9 +206,6 @@
             // textNumber: 8,
             // textEllipsis: true,
             dataIndex: 'address',
-            customRender: (value) => {
-              return value.record.provinceName + value.record.cityName + value.record.areaName;
-            },
           },
         ],
 
@@ -203,49 +218,6 @@
               name: 'ParkingStorageDetail',
               route: { name: 'ParkingStorageDetail' },
             },
-
-            // {
-            //   label: '编辑',
-
-            //   dynamicParams: 'uuid',
-
-            //   name: 'check',
-
-            //   route: '/operationsManage/operationsManage/edit',
-            // },
-
-            // {
-            //   label: '删除',
-
-            //   dynamicParams: {
-            //     uuidSet: 'uuid[]',
-            //   },
-
-            //   name: 'delete',
-
-            //   confirm: {
-            //     title: '警告',
-
-            //     content: '确认要删除吗?',
-            //   },
-
-            //   isReload: true,
-
-            //   api: '/api/parking_merchant/objs/libCarPlace/delete',
-            // },
-
-            // {
-            //   label: '潮汐时间设置',
-
-            //   dynamicParams: 'uuid',
-
-            //   name: 'check',
-            //   ifShow: (record) => {
-            //     return !record.dataSource;
-            //   },
-
-            //   route: '/operationsManage/operationsManage/timeSetting',
-            // },
           ],
         },
 

nervui-smart-parking/vite.config.ts

@@ -96,10 +96,9 @@ const proxy = {
   //   rewrite: (path) => path.replace(/^\/api\/person/, ''),
   // },
 
-  '/api': {
+  '/carbon_emission': {
     //target: 'https://parking.test.sk1111.cn/',
-    target: 'https://manager.parking.sk1111.cn/',
-    // target: 'https://manager.parking.whcsbc.com/',
+    target: 'http://140.210.143.1:14492',
     changeOrigin: true,
   },
 };