feat: 优化租户，指数管理 api 配置文件

src/api/ice104/index.ts

@@ -1,11 +1,4 @@
-/*
- * @Author: vera_min vera_min@163.com
- * @Date: 2023-10-23 22:45:52
- * @LastEditors: vera_min vera_min@163.com
- * @LastEditTime: 2023-10-25 10:20:08
- * @FilePath: /sagoo-admin-ui/src/api/ice104/index.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
+
 import { get, post, del, put,file } from '/@/utils/request_ice104';
 
 export default {

src/api/modules/assess.ts

@@ -0,0 +1,14 @@
+import { get, post, del, put } from '/@/utils/request';
+import { getOtherServersOrigin } from '/@/utils/origin';
+
+const baseUrl = getOtherServersOrigin(import.meta.env.VITE_ASSESS_URL);
+
+export default {
+  getList: (params?: object) => get(baseUrl + '/setup', params),
+  setItem: (params?: object) => post(baseUrl + '/setup', params),
+  deleteItem: (params?: object) => del(baseUrl + '/setup', params),
+  getDataSourceInfo: (params?: object) => get(baseUrl + '/datasetup/target', params),
+  testDataSource: (params?: object) => post(baseUrl + '/datasetup/test', params),
+  addDataSourceInfo: (params?: object) => post(baseUrl + '/datasetup', params),
+  editataSourceInfo: (params?: object) => put(baseUrl + '/datasetup', params),
+}

src/api/modules/index.ts

@@ -1,28 +0,0 @@
-import { get, post, del, put } from '/@/utils/request';
-import { getOtherServersOrigin } from '/@/utils/origin';
-
-const baseUrl = getOtherServersOrigin(import.meta.env.VITE_ASSESS_URL);
-
-export default {
-  // 租户管理
-  tenant: {
-    getAll: () => get('/tenant/getAll'),
-    list: (params: object) => get('/tenant/list', params),
-    get: (code: string) => get('/tenant/getInfoByCode', { code }),
-    add: (data: object) => post('/tenant/add', data),
-    del: (ids: number[]) => del('/tenant/del', { ids }),
-    edit: (data: object) => put('/tenant/edit', data),
-    editStatus: (id: number, status: number) => put('/tenant/editStatus', { id, status }),
-    addItem: (data: object) => post('/device/add', data),
-    getFlowDataByDateRange: (data: object) => post('/sim/collect/flow_date', data),
-  },
-  assess: {
-    getList: (params?: object) => get(baseUrl + '/setup', params),
-    setItem: (params?: object) => post(baseUrl + '/setup', params),
-    deleteItem: (params?: object) => del(baseUrl + '/setup', params),
-    getDataSourceInfo: (params?: object) => get(baseUrl + '/datasetup/target', params),
-    testDataSource: (params?: object) => post(baseUrl + '/datasetup/test', params),
-    addDataSourceInfo: (params?: object) => post(baseUrl + '/datasetup', params),
-    editataSourceInfo: (params?: object) => put(baseUrl + '/datasetup', params),
-  }
-}

src/api/iotCard/index.ts → src/api/modules/iotCard.ts

@@ -1,12 +1,3 @@
-
-/*
- * @Author: vera_min vera_min@163.com
- * @Date: 2023-10-23 22:45:52
- * @LastEditors: vera_min vera_min@163.com
- * @LastEditTime: 2023-10-25 10:20:08
- * @FilePath: /sagoo-admin-ui/src/api/ice104/index.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import { get, post, del, put } from '/@/utils/request';
 
 export default {

src/api/modules/tenant.ts

@@ -0,0 +1,13 @@
+import { get, post, del, put } from '/@/utils/request';
+
+export default {
+  getAll: () => get('/tenant/getAll'),
+  list: (params: object) => get('/tenant/list', params),
+  get: (code: string) => get('/tenant/getInfoByCode', { code }),
+  add: (data: object) => post('/tenant/add', data),
+  del: (ids: number[]) => del('/tenant/del', { ids }),
+  edit: (data: object) => put('/tenant/edit', data),
+  editStatus: (id: number, status: number) => put('/tenant/editStatus', { id, status }),
+  addItem: (data: object) => post('/device/add', data),
+  getFlowDataByDateRange: (data: object) => post('/sim/collect/flow_date', data),
+}

src/api/network/index.ts

@@ -1,11 +1,3 @@
-/*
- * @Author: vera_min vera_min@163.com
- * @Date: 2022-09-05 08:41:57
- * @LastEditors: vera_min vera_min@163.com
- * @LastEditTime: 2022-09-07 08:35:57
- * @FilePath: /sagoo-admin-ui/src/api/network/index.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import { get, post, del, put } from '/@/utils/request';
 
 export default {

src/hooks/useCommonIce104.ts

@@ -1,11 +1,3 @@
-/*
- * @Author: vera_min vera_min@163.com
- * @Date: 2023-10-24 11:43:07
- * @LastEditors: vera_min vera_min@163.com
- * @LastEditTime: 2023-10-25 08:56:08
- * @FilePath: /sagoo-admin-ui/src/hooks/useCommonIce104.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import { reactive, ref } from 'vue'
 
 export default function () {

src/views/iot/device/channel/index.vue

@@ -1,11 +1,3 @@
-<!--
- * @Author: vera_min vera_min@163.com
- * @Date: 2023-10-23 09:09:35
- * @LastEditors: vera_min vera_min@163.com
- * @LastEditTime: 2023-10-23 17:46:43
- * @FilePath: /sagoo-admin-ui/src/views/iot/device/channel/index.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
 <template>
 	<div class="page">
 		<el-card shadow="nover">

src/views/iot/ice104/device/detail.vue

@@ -1,11 +1,3 @@
-<!--
- * @Author: vera_min vera_min@163.com
- * @Date: 2023-10-23 17:05:57
- * @LastEditors: vera_min vera_min@163.com
- * @LastEditTime: 2023-10-25 10:11:06
- * @FilePath: /sagoo-admin-ui/src/views/iot/ice104/index.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
 <template>
 	<div class="page border bg padding page-full Ipt-2">
 		<el-tabs v-model="activeName">

src/views/iot/ice104/device/index.vue

@@ -1,11 +1,3 @@
-<!--
- * @Author: vera_min vera_min@163.com
- * @Date: 2023-10-23 17:05:57
- * @LastEditors: vera_min vera_min@163.com
- * @LastEditTime: 2023-10-25 10:11:06
- * @FilePath: /sagoo-admin-ui/src/views/iot/ice104/index.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
 <template>
 	<div class="page">
 		<el-card shadow="nover">

src/views/iot/ice104/template/detail.vue

@@ -1,11 +1,3 @@
-<!--
- * @Author: vera_min vera_min@163.com
- * @Date: 2023-10-23 17:05:57
- * @LastEditors: vera_min vera_min@163.com
- * @LastEditTime: 2023-10-25 10:11:06
- * @FilePath: /sagoo-admin-ui/src/views/iot/ice104/index.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
 <template>
 	<div class="page bg padding Ipt-2 page-full">
 		<el-tabs v-model="activeName">

src/views/iot/ice104/template/index.vue

@@ -1,11 +1,4 @@
-<!--
- * @Author: vera_min vera_min@163.com
- * @Date: 2023-10-23 17:05:57
- * @LastEditors: vera_min vera_min@163.com
- * @LastEditTime: 2023-10-25 10:29:58
- * @FilePath: /sagoo-admin-ui/src/views/iot/ice104/index.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
+
 <template>
 	<div class="page">
 		<el-card shadow="nover">

src/views/iot/network/tunnel/component/serverDetail.vue

@@ -1,12 +1,3 @@
-<!--
- * @Author: vera_min vera_min@163.com
- * @Date: 2022-09-05 08:41:57
- * @LastEditors: vera_min vera_min@163.com
- * @LastEditTime: 2022-09-06 17:18:49
- * @FilePath: /sagoo-admin-ui/src/views/network/tunnel/component/serverDetail.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
-<!-- 服务器详情页 -->
 <template>
   <el-descriptions :column="2" border>
     <el-descriptions-item>

src/views/modules/assess/component/detailItem.vue

@@ -76,7 +76,7 @@
 <script lang="ts">
 import { reactive, toRefs, onMounted, defineComponent } from 'vue';
 
-import api from '/@/api/modules';
+import api from '/@/api/modules/assess';
 
 // 定义接口来定义对象的类型
 interface RuleFormRow {
@@ -108,7 +108,7 @@ export default defineComponent({
     });
     // 打开弹窗
     const openDialog = (row: any) => {
-      api.assess.getList({ itemcode: row.item_code }).then((res: any) => {
+      api.getList({ itemcode: row.item_code }).then((res: any) => {
         state.ruleForm = res
         state.isShowDialog = true;
 

src/views/modules/assess/component/editItem.vue

@@ -54,7 +54,7 @@ import AddSign from './addSign.vue';
 import SetTask from './setTask.vue';
 
 
-import api from '/@/api/modules';
+import api from '/@/api/modules/assess';
 
 // 定义接口来定义对象的类型
 interface DeptData {
@@ -132,7 +132,7 @@ export default defineComponent({
 		// 打开弹窗
 		const openDialog = (row: any) => {
 			if (row) {
-				api.assess.getList({ itemcode: row.item_code }).then((res: any) => {
+				api.getList({ itemcode: row.item_code }).then((res: any) => {
 					state.ruleForm = res;
 					state.tableData.data = res.targets
 					state.isShowDialog = true;
@@ -164,7 +164,7 @@ export default defineComponent({
 				if (valid) {
 					state.ruleForm.targets = state.tableData.data
 
-					api.assess.setItem(state.ruleForm).then((res: any) => {
+					api.setItem(state.ruleForm).then((res: any) => {
 						ElMessage.success('提交成功');
 						emit('fetchList');
 						closeDialog(); // 关闭弹窗

src/views/modules/assess/component/setTask.vue

@@ -152,7 +152,7 @@ import { reactive, toRefs, onMounted, defineComponent, ref } from 'vue';
 import type { FormInstance, FormRules } from 'element-plus';
 import { ElMessage } from 'element-plus';
 
-import api from '/@/api/modules';
+import api from '/@/api/modules/assess';
 
 // 定义接口来定义对象的类型
 interface RuleFormRow {
@@ -216,7 +216,7 @@ export default defineComponent({
 		};
 		// 新增数据
 		const addDataSourceInfo = (params: any) => {
-			api.assess.addDataSourceInfo(params).then(() => {
+			api.addDataSourceInfo(params).then(() => {
 				ElMessage.success('数据提交成功');
 				closeDialog();
 				state.isShow = false
@@ -224,7 +224,7 @@ export default defineComponent({
 		};
 		// 编辑数据
 		const editataSourceInfo = (params: any) => {
-			api.assess.editataSourceInfo(params).then((res: any) => {
+			api.editataSourceInfo(params).then((res: any) => {
 				ElMessage.success('数据提交成功');
 				closeDialog();
 				state.isShow = false
@@ -243,7 +243,7 @@ export default defineComponent({
 				uri: state.ruleForm.uri,
 				object: state.ruleForm.object
 			}
-			api.assess.testDataSource(params).then((res: any) => {
+			api.testDataSource(params).then((res: any) => {
 				state.testRes = res
 			});
 		};
@@ -254,7 +254,7 @@ export default defineComponent({
 				target_name: row.name,
 			};
 			state.item_code = item_code;
-			api.assess.getDataSourceInfo(params).then((res: any) => {
+			api.getDataSourceInfo(params).then((res: any) => {
 				if (res) {
 					// 编辑
 					state.ruleForm = res;

src/views/modules/assess/index.vue

@@ -43,7 +43,7 @@ import EditOrAddItem from './component/editItem.vue';
 
 import DetailItem from './component/detailItem.vue';
 
-import api from '/@/api/modules';
+import api from '/@/api/modules/assess';
 
 // 定义接口来定义对象的类型
 interface TableDataRow {
@@ -111,7 +111,7 @@ export default defineComponent({
     };
     const fetchList = () => {
       state.tableData.loading = true
-      api.assess.getList().then((res: any) => {
+      api.getList().then((res: any) => {
         state.tableData.data = res;
         // state.tableData.total = res.total;
       }).finally(() => state.tableData.loading = false)
@@ -136,7 +136,7 @@ export default defineComponent({
         type: 'warning',
       })
         .then(() => {
-          api.assess.deleteItem({ itemcode: row.item_code }).then(() => {
+          api.deleteItem({ itemcode: row.item_code }).then(() => {
             fetchList()
             ElMessage.success('删除成功');
           });

src/views/modules/iotCard/dashboard.vue

@@ -104,7 +104,7 @@
 <script lang="ts" setup>
 import { ref, reactive, nextTick, watch, markRaw } from "vue"
 import { formatSize } from "/@/utils/common";
-import api from '/@/api/iotCard';
+import api from '/@/api/modules/iotCard';
 import { useStore } from '/@/store/index';
 import * as echarts from 'echarts';
 import dayjs from 'dayjs';

src/views/modules/iotCard/index/detail.vue

@@ -249,7 +249,7 @@
 <script lang="ts" setup>
 import { ref, reactive, nextTick, watch, markRaw } from "vue";
 import { formatSize } from "/@/utils/common";
-import api from '/@/api/iotCard';
+import api from '/@/api/modules/iotCard';
 import { useStore } from '/@/store/index';
 import { useRoute } from 'vue-router';
 import * as echarts from 'echarts';

src/views/modules/iotCard/index/index.vue

@@ -53,7 +53,7 @@
 </template>
 
 <script lang="ts" setup>
-import api from '/@/api/iotCard';
+import api from '/@/api/modules/iotCard';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { useSearch } from "/@/hooks/useCommon"
 import { useRouter } from 'vue-router';

src/views/modules/iotCard/platformManage/addOrEditItem.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script lang="ts" setup>
-import api from '/@/api/iotCard';
+import api from '/@/api/modules/iotCard';
 import { ref, unref } from 'vue';
 import { ElMessage } from 'element-plus';
 

src/views/modules/iotCard/platformManage/index.vue

@@ -51,7 +51,7 @@
 </template>
 
 <script lang="ts" setup>
-import api from '/@/api/iotCard';
+import api from '/@/api/modules/iotCard';
 import { defineAsyncComponent, ref } from 'vue';
 import { ElMessageBox, ElMessage, formatter } from 'element-plus';
 import { useSearch } from "/@/hooks/useCommon"

src/views/modules/tenant/edit.vue

@@ -37,7 +37,7 @@
 
 <script lang="ts" setup>
 import { ref, reactive } from 'vue';
-import api from '/@/api/modules';
+import api from '/@/api/modules/tenant';
 import { ruleRequired } from '/@/utils/validator';
 import { ElMessage, UploadProps } from 'element-plus';
 import UploadVue from '/@/components/upload/index.vue';
@@ -66,7 +66,7 @@ const ruleForm = {
 const onSubmit = async () => {
 	await formRef.value.validate();
 
-	const theApi = formData.id ? api.tenant.edit : api.tenant.add;
+	const theApi = formData.id ? api.edit : api.add;
 
 	await theApi(formData);
 

src/views/modules/tenant/index.vue

@@ -70,7 +70,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 import EditForm from './edit.vue'
-import api from '/@/api/modules'
+import api from '/@/api/modules/tenant'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import { useSearch } from '/@/hooks/useCommon'
 
@@ -78,7 +78,7 @@ const editFormRef = ref()
 const queryRef = ref()
 const ids = ref<number[]>([])
 
-const { params, tableData, getList, loading } = useSearch(api.tenant.list, 'Data', { name: '', keyWord: '', status: -1 })
+const { params, tableData, getList, loading } = useSearch(api.list, 'Data', { name: '', keyWord: '', status: -1 })
 
 getList()
 
@@ -101,7 +101,7 @@ const onDel = (row: any) => {
 		cancelButtonText: '取消',
 		type: 'warning',
 	}).then(async () => {
-		await api.tenant.del([row.id as number])
+		await api.del([row.id as number])
 		ElMessage.success('删除成功')
 		getList()
 	})
@@ -116,7 +116,7 @@ const handleStatusChange = (row: any) => {
 		type: 'warning',
 	})
 		.then(function () {
-			return api.tenant.editStatus(row.id, row.status);
+			return api.editStatus(row.id, row.status);
 		})
 		.then(() => {
 			ElMessage.success(text + '成功');