fix: 修复新版规则引擎的跳转

.env

@@ -16,8 +16,6 @@ VITE_ROUTER_MODE = 'history'
 
 # NGINX 转发路径, 如果不使用nginx 则配置为空 ''
 VITE_NGINX_PROXY = '/base-api'
-# 指数管理服务
-VITE_ASSESS_URL = '/assess/v1'
 # 大屏前端
 VITE_SCREEN_URL = '/plugin/screen/index.html'
 # 组态图前端
@@ -30,7 +28,7 @@ VITE_ICE104_API = '/ice104'
 # 规则引擎模式 sagoo-rule node-red
 VITE_RULE_MODEL = 'sagoo-rule'
 # sagoo rule api
-VITE_RULE_SERVER_URL = '/rule-api'
+VITE_RULE_SERVER_URL = '/rule-api/api/v1/rules/'
 # sagoo media api
 VITE_MEDIA_SERVER_URL = '/media'
 

.env.development

@@ -5,7 +5,7 @@ VITE_NGINX_PROXY = ''
 VITE_SERVER_ORIGIN = 'http://127.0.0.1:8199'
 
 # 规则引擎服务地址
-VITE_RULE_SERVER_URL = 'http://127.0.0.1:9090'
+VITE_RULE_SERVER_URL = 'http://127.0.0.1:9090/api/v1/rules/'
 
 # 流媒体服务地址
 VITE_MEDIA_SERVER_URL = 'http://127.0.0.1:8080'

.env.golocal

@@ -6,5 +6,5 @@ VITE_ROUTER_MODE = 'hash'
 
 VITE_SERVER_ORIGIN = ''
 
-VITE_RULE_SERVER_URL = 'http://127.0.0.1:9090'
+VITE_RULE_SERVER_URL = 'http://127.0.0.1:9090/api/v1/rules/'
 VITE_MEDIA_SERVER_URL = 'http://127.0.0.1:8080'

src/api/modules/assess.ts

@@ -1,8 +1,4 @@
 import { get, post, del, put } from '/@/utils/request';
-import { getOtherServersOrigin } from '/@/utils/origin';
-
-// const baseUrl = getOtherServersOrigin(import.meta.env.VITE_ASSESS_URL);
-const baseUrl = '/totalIndex/assess'
 
 export default {
   getList: (params?: object) => get('/totalIndex/assess/getAll', params),
@@ -11,7 +7,7 @@ export default {
   editItem: (params?: object) => put('/totalIndex/assess/edit', params),
   deleteItem: (params?: object) => del('/totalIndex/assess/delete', params),
   getDataSourceInfo: (params?: object) => get('/totalIndex/dataSetUp/getInfoByItemCodeAndTarget', params),
-  testDataSource: (params?: object) => post(baseUrl + '/datasetup/test', params),
+  testDataSource: (params?: object) => post('/totalIndex/assess/datasetup/test', params),
   addDataSourceInfo: (params?: object) => post('/totalIndex/dataSetUp/add', params),
   editataSourceInfo: (params?: object) => put('/totalIndex/dataSetUp/edit', params),
 }

src/views/iot/rule-engine/edit.vue

@@ -73,7 +73,7 @@ const onSubmit = async () => {
 		if (!formData.id) {
 			const id = uuid()
 			await axios.post(
-				import.meta.env.VITE_RULE_SERVER_URL + '/api/v1/rule/' + id,
+				import.meta.env.VITE_RULE_SERVER_URL + id,
 				{
 					"ruleChain": {
 						"id": id,
@@ -96,7 +96,7 @@ const onSubmit = async () => {
 			formData.flowId = id;
 		} else {
 			// 找到规则
-			const { data } = await axios.get(import.meta.env.VITE_RULE_SERVER_URL + '/api/v1/rule/' + formData.flowId, { headers }).catch(() => {
+			const { data } = await axios.get(import.meta.env.VITE_RULE_SERVER_URL  + formData.flowId, { headers }).catch(() => {
 				ElMessage.error('规则不存在')
 			}) as any
 

src/views/iot/rule-engine/index.vue

@@ -73,7 +73,7 @@ const addOrEdit = async (row?: any) => {
 
 const setStatus = async (row: any, status: number) => {
 	if (model === 'sagoo-rule') {
-		axios.get(`${import.meta.env.VITE_RULE_SERVER_URL}/api/v1/rule/${row.flowId}/${status ? 'enable' : 'stop'}`, { headers })
+		axios.get(`${import.meta.env.VITE_RULE_SERVER_URL}${row.flowId}/${status ? 'enable' : 'stop'}`, { headers })
 			.then(() => {
 				api
 					.setStatus(row.id, status)
@@ -119,7 +119,7 @@ const setStatus = async (row: any, status: number) => {
 const edit = async (row: any) => {
 	if (model == 'sagoo-rule') {
 		localStorage.setItem('auth-tokens', `{"access_token":"${getToken()}"}`);
-		const url = '/plugin/rule/index.html?id=' + row.flowId;
+		const url = '/plugin/rule/index.html#' + row.flowId;
 		window.open(url);
 
 	} else if (model == 'node-red') {
@@ -137,7 +137,7 @@ const onDel = (row: any) => {
 	}).then(async () => {
 
 		if (model == 'sagoo-rule') {
-			await axios.delete(import.meta.env.VITE_RULE_SERVER_URL + '/api/v1/rule/' + row.flowId, { headers }).catch(() => {
+			await axios.delete(import.meta.env.VITE_RULE_SERVER_URL + row.flowId, { headers }).catch(() => {
 				ElMessage.error('规则不存在')
 			})
 		} else if (model == 'node-red') {

src/views/iot/rule-engine/send.vue

@@ -78,7 +78,7 @@ const addOrEdit = async (row?: any) => {
 
 const setStatus = async (row: any, status: number) => {
   if (model === 'sagoo-rule') {
-    axios.get(`${import.meta.env.VITE_RULE_SERVER_URL}/api/v1/rule/${row.flowId}/${status ? 'enable' : 'stop'}`, { headers })
+    axios.get(`${import.meta.env.VITE_RULE_SERVER_URL}${row.flowId}/${status ? 'enable' : 'stop'}`, { headers })
       .then(() => {
         api
           .setStatus(row.id, status)
@@ -123,7 +123,7 @@ const setStatus = async (row: any, status: number) => {
 const edit = async (row: any) => {
   if (model == 'sagoo-rule') {
     localStorage.setItem('auth-tokens', `{"access_token":"${getToken()}"}`);
-    const url = '/plugin/rule/index.html?id=' + row.flowId;
+    const url = '/plugin/rule/index.html#' + row.flowId;
     window.open(url);
 
   } else if (model == 'node-red') {
@@ -140,7 +140,7 @@ const onDel = (row: any) => {
     type: 'warning',
   }).then(async () => {
     if (model == 'sagoo-rule') {
-      await axios.delete(import.meta.env.VITE_RULE_SERVER_URL + '/api/v1/rule/' + row.flowId, { headers }).catch(() => {
+      await axios.delete(import.meta.env.VITE_RULE_SERVER_URL + row.flowId, { headers }).catch(() => {
         ElMessage.error('规则不存在')
       })
     } else if (model == 'node-red') {