Merge branch 'main' of http://123.60.103.97:3000/xuziqiang/SaaS-lib

hx-ai-intelligent/src/config/app.config.ts

@@ -37,13 +37,7 @@ export const appConfig = {
     },
   },
   timeout: 60 * 1000,
-  userLoginApi: () => {
+  userLoginApi: '/carbon-smart/user/login',
-    return {
-      code: 200,
-      success: true,
-      data: { userToken: 123123123 },
-    };
-  },
   userResourceApi: () => {
     return { data: mockResource.menus };
   },

hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts

@@ -7,9 +7,10 @@ export const tableConfig = {
   // api: '/carbon_emission/device/getDeviceList',
   api: origanizemanage.list,
   treeConfig: {
-    dynamicParams: { abc: 'title', key: 'key' },
     defaultExpandAll: true,
-    treeData: data,
+    api: () => {
+      return Promise.resolve(data);
+    },
   },
   params: {
     page: 0,

hx-ai-intelligent/vite.config.ts

@@ -11,5 +11,9 @@ const proxy = {
     target: 'http://140.210.143.1:14492',
     changeOrigin: true,
   },
+  '/carbon-smart': {
+    target: 'http://192.168.100.115:8224/api',
+    changeOrigin: true,
+  },
 };
 export default configFun({ dirname, proxy, serviceMode: 'saas', baseDir: '../' });

lib/component/table/table.vue

@@ -15,7 +15,7 @@
     </div>
     <div class="ns-table-container">
       <div class="ns-part-tree" v-if="!isEmpty(treeConfig)">
-        <ns-tree v-if="getTreeData.length" v-bind="getTreeBindValue" @select="treeSelect" />
+        <ns-tree-api v-bind="getTreeBindValue" @select="treeSelect" />
       </div>
       <div class="ns-part-table">
         <a-spin :spinning="tableState.loading">

lib/component/tree/tree-api.vue

@@ -1,45 +1,41 @@
 <template>
-  <ns-tree v-bind="getBindValue">
+  <ns-tree v-if="treeData.length" v-bind="getBindValue">
     <template #[item]="data" v-for="item in Object.keys($slots)" :key="item">
       <slot :name="item" v-bind="data || {}"></slot>
     </template>
   </ns-tree>
 </template>
-<script lang="ts">
+<script lang="ts" setup>
-  import { computed, defineComponent, ref, unref } from 'vue';
+  import { computed, ref, unref, useAttrs } from 'vue';
   import { TreeDataItem } from 'ant-design-vue/es/tree/Tree';
-  import { http } from '/nerv-lib/util/http';
+  import { useApi } from '/nerv-lib/use/use-api';
+  import { AxiosRequestConfig } from 'axios';
   import { get } from 'lodash-es';
-
+  import { useRoute } from 'vue-router';
-  export default defineComponent({
+  interface Props {
+    api: string | Function | object;
+    params?: object;
+    defaultParams?: object;
+    transform?: Function;
+    resultField?: string;
+    defaultExpandAll?: boolean;
+    blockNode?: boolean;
+  }
+  defineOptions({
     name: 'NsTreeApi',
-    props: {
+  });
-      api: {
+  const props = withDefaults(defineProps<Props>(), {
-        type: String,
+    resultField: 'data',
-        required: true,
+    blockNode: true,
-      },
+    defaultExpandAll: true,
-      params: {
+    transform: (data) => data,
-        type: Object,
+  });
-      },
-      transform: {
-        type: Function,
-        default: null,
-      },
-      resultField: {
-        type: String,
-        default: 'data.data',
-      },
-      defaultExpandAll: {
-        type: Boolean,
-        default: true,
-      },
-      blockNode: {
-        type: Boolean,
-        default: true,
-      },
-    },
-    setup(props, { attrs }) {
   const treeData = ref<TreeDataItem[]>([]);
+  const { httpRequest } = useApi();
+  const requestConfig: AxiosRequestConfig = { method: 'get' };
+  const route = useRoute();
+  const attrs = useAttrs();
+
   const getBindValue = computed(() => ({
     ...attrs,
     ...props,
@@ -47,26 +43,22 @@
   }));
 
   const getData = () => {
-        const { params, transform, resultField } = props;
+    const { api, defaultParams, transform, resultField } = props;
+
     treeData.value = [];
-        http.get(props.api, unref(params)).then((res) => {
+    if (!api) return;
+    httpRequest({
+      api,
+      params: { ...route.params, ...route.query, ...defaultParams },
+      pathParams: { ...route.params, ...route.query },
+      requestConfig,
+    }).then((res) => {
       let data = [];
-          if (resultField) {
       data = get(res, resultField);
-          }
-          if (transform) {
       treeData.value = transform(data);
-          }
     });
   };
 
   getData();
-
-      return {
-        treeData,
-        getBindValue,
-      };
-    },
-  });
 </script>
 <style lang="less" scoped></style>

lib/saas/view/system/login.vue

@@ -85,7 +85,7 @@
         }
         if (userName.value !== '' && password.value !== '') {
           errorShow.value = false;
-          let data = JSON.stringify({ userName: userName.value, password: password.value });
+          let data = JSON.stringify({ accountNo: userName.value, password: password.value });
           // Cookies.set('nervsid', 'mockdata');
           // router.replace({ name: 'root' });
 
@@ -95,7 +95,7 @@
               const res = await configStore.userLogin(JSON.parse(data));
               if (res.success) {
                 if (res.data?.userToken) {
-                  Cookies.set('nervsid', res.data?.userToken);
+                  Cookies.set('token', res.data?.userToken);
                 }
                 const info = await configStore.userInfo();
                 info.success