Sākums Izpētīt Palīdzība
Pierakstīties
zhilian
/
admin-ui
1
0
Atdalīts 0
Faili Problēmas 0 Izmaiņu pieprasījumi 0 Vikivietne
Pārlūkot izejas kodu

feat:优化变理名称

microrain 11 mēneši atpakaļ
vecāks
26373fd5b3
revīzija
4d4d940840
6 mainītis faili ar 22 papildinājumiem un 22 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 6 6
      .env
  2. 0 0
      public/plugin/rule/assets/index.e78e3f45.js
  3. 1 1
      public/plugin/rule/index.html
  4. 5 5
      src/views/iot/rule-engine/edit.vue
  5. 5 5
      src/views/iot/rule-engine/index.vue
  6. 5 5
      src/views/iot/rule-engine/send.vue

+ 6 - 6
.env
Parādīt failu 

@@ -8,7 +8,7 @@ VITE_OPEN = true
 
 VITE_PUBLIC_PATH = /
 
 
 # 协议 例如 https:
 
-VITE_SERVER_PROTOCOL = '' 
+VITE_SERVER_PROTOCOL = ''
 
 # 网址或ip 如 baidu.com
 
 VITE_SERVER_HOSTNAME = ''
 
 
@@ -30,10 +30,10 @@ VITE_MODBUS_API = '/base-api/modbus'
 
 # ice104协议网关服务
 
 VITE_ICE104_API = '/base-api/ice104'
 
 
-# 规则引擎模式 rulego node-red
 
-VITE_RULE_MODEL = 'node-red'
 
-# rulego api
 
-VITE_RULEGO_SERVER_URL = 'http://127.0.0.1:9090/api/v1'
 
+# 规则引擎模式 sagoo-rule node-red
 
+VITE_RULE_MODEL = 'sagoo-rule'
 
+# sagoo rule api
 
+VITE_RULE_SERVER_URL = 'http://127.0.0.1:9090/api/v1'
 
 
 # 加密公钥, 用双引号，换行符用 \n
 
-VITE_PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwrJzCAJ0aart82Y2B5qo\nsZRv8p1dGX2oLFr1sArJxevW3a1v7cVA0U4WVFJdifDVFpsuich9nsfhUp7CNOZn\na+rNveglzYlrtMhqynYU+bKUBBAmYaVyDHOpxkp86fhp0q7qoX8YoeSvYRaVaPoF\nHRYeahy0d3L+gL8pRhr0k70RZMraC3zzXbuUcM7GNibiKbFiQllhlGlfbV0bmOH8\nLZcwWwv40Ptdd4x2gihn5vmzGdQ1OAf3D6YmtsXf7iMj0H1g5svyHs17ncSN7h9i\nWTrVKcNDxrl1dm4BRsxDJsWenwrIM1WUHuonlbE6OoIJEO25T3ucymzWDzMSWxe3\nsQIDAQAB\n-----END PUBLIC KEY-----"
 
+VITE_PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwrJzCAJ0aart82Y2B5qo\nsZRv8p1dGX2oLFr1sArJxevW3a1v7cVA0U4WVFJdifDVFpsuich9nsfhUp7CNOZn\na+rNveglzYlrtMhqynYU+bKUBBAmYaVyDHOpxkp86fhp0q7qoX8YoeSvYRaVaPoF\nHRYeahy0d3L+gL8pRhr0k70RZMraC3zzXbuUcM7GNibiKbFiQllhlGlfbV0bmOH8\nLZcwWwv40Ptdd4x2gihn5vmzGdQ1OAf3D6YmtsXf7iMj0H1g5svyHs17ncSN7h9i\nWTrVKcNDxrl1dm4BRsxDJsWenwrIM1WUHuonlbE6OoIJEO25T3ucymzWDzMSWxe3\nsQIDAQAB\n-----END PUBLIC KEY-----"

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
public/plugin/rule/assets/index.e78e3f45.js


+ 1 - 1
public/plugin/rule/index.html
Parādīt failu 

@@ -5,7 +5,7 @@
 
     <link rel="icon" href="/plugin/rule/favicon.ico" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <title>Sagoo Rule Editor</title>
 
-    <script type="module" crossorigin src="/plugin/rule/assets/index.5da636ac.js"></script>
 
+    <script type="module" crossorigin src="/plugin/rule/assets/index.e78e3f45.js"></script>
 
     <link rel="stylesheet" href="/plugin/rule/assets/index.ab2b6b07.css">
 
   </head>
 
   <body>

+ 5 - 5
src/views/iot/rule-engine/edit.vue
Parādīt failu 

@@ -35,7 +35,7 @@ const props = defineProps({
 
 	},
 
 	model: {
 
 		type: String,
 
-		default: 'rulego', // rulego node-red
 
+		default: 'sagoo-rule', // sagoo-rule 、node-red
 
 	},
 
 });
 
 
@@ -69,11 +69,11 @@ const onSubmit = async () => {
 
 	await formRef.value.validate();
 
 
 	// 不同引擎，用不同处理方式
 
-	if (props.model === 'rulego') {
 
+	if (props.model === 'sagoo-rule') {
 
 		if (!formData.id) {
 
 			const id = uuid()
 
 			await axios.post(
 
-				import.meta.env.VITE_RULEGO_SERVER_URL + '/rule/' + id,
 
+				import.meta.env.VITE_RULE_SERVER_URL + '/rule/' + id,
 
 				{
 
 					"ruleChain": {
 
 						"id": id,
 
@@ -96,7 +96,7 @@ const onSubmit = async () => {
 
 			formData.flowId = id;
 
 		} else {
 
 			// 找到规则
 
-			const { data } = await axios.get(import.meta.env.VITE_RULEGO_SERVER_URL + '/rule/' + formData.flowId, { headers }).catch(() => {
 
+			const { data } = await axios.get(import.meta.env.VITE_RULE_SERVER_URL + '/rule/' + formData.flowId, { headers }).catch(() => {
 
 				ElMessage.error('规则不存在')
 
 			}) as any
 
 
@@ -105,7 +105,7 @@ const onSubmit = async () => {
 
 			data.ruleChain.additionalInfo.description = formData.expound
 
 
 			// 保存
 
-			await axios.post(import.meta.env.VITE_RULEGO_SERVER_URL + '/rule/' + formData.flowId, data, { headers });
 
+			await axios.post(import.meta.env.VITE_RULE_SERVER_URL + '/rule/' + formData.flowId, data, { headers });
 
 		}
 
 	} else if (props.model === 'node-red') {
 
 		if (!formData.id) {

+ 5 - 5
src/views/iot/rule-engine/index.vue
Parādīt failu 

@@ -49,7 +49,7 @@ import { getToken } from "/@/utils/auth";
 
 
 const editFormRef = ref();
 
 
-// 规则引擎模式 node-red rulego
 
+// 规则引擎模式 node-red、 sagoo-rule
 
 const model = import.meta.env.VITE_RULE_MODEL
 
 
 const { params, tableData, getList, loading } = useSearch<any[]>(api.getList, 'Data', { types: 0 });
 
@@ -101,9 +101,9 @@ const setStatus = async (row: any, status: number) => {
 
 };
 
 
 const edit = async (row: any) => {
 
-	if (model == 'rulego') {
 
+	if (model == 'sagoo-rule') {
 
 		localStorage.setItem('auth-tokens', `{"access_token":"${getToken()}"}`);
 
-		const url = 'http://localhost:3000/plugin/rule/?id=' + row.flowId;
 
+		const url = '/plugin/rule/index.html?id=' + row.flowId;
 
 		window.open(url);
 
 
 	} else if (model == 'node-red') {
 
@@ -120,8 +120,8 @@ const onDel = (row: any) => {
 
 		type: 'warning',
 
 	}).then(async () => {
 
 
-		if (model == 'rulego') {
 
-			await axios.delete(import.meta.env.VITE_RULEGO_SERVER_URL + '/rule/' + row.flowId, { headers }).catch(() => {
 
+		if (model == 'sagoo-rule') {
 
+			await axios.delete(import.meta.env.VITE_RULE_SERVER_URL + '/rule/' + row.flowId, { headers }).catch(() => {
 
 				ElMessage.error('规则不存在')
 
 			})
 
 		} else if (model == 'node-red') {

+ 5 - 5
src/views/iot/rule-engine/send.vue
Parādīt failu 

@@ -55,7 +55,7 @@ import { getToken } from "/@/utils/auth";
 
 
 const editFormRef = ref();
 
 
-// 规则引擎模式 node-red rulego
 
+// 规则引擎模式 node-red sagoo-rule
 
 const model = import.meta.env.VITE_RULE_MODEL
 
 
 const { params, tableData, getList, loading } = useSearch<any[]>(api.getList, 'Data', { types: 1 });
 
@@ -105,9 +105,9 @@ const setStatus = async (row: any, status: number) => {
 
 };
 
 
 const edit = async (row: any) => {
 
-  if (model == 'rulego') {
 
+  if (model == 'sagoo-rule') {
 
     localStorage.setItem('auth-tokens', `{"access_token":"${getToken()}"}`);
 
-    const url = 'http://localhost:3000/plugin/rule/?id=' + row.flowId;
 
+    const url = '/plugin/rule/index.html?id=' + row.flowId;
 
     window.open(url);
 
 
   } else if (model == 'node-red') {
 
@@ -123,8 +123,8 @@ const onDel = (row: any) => {
 
     cancelButtonText: '取消',
 
     type: 'warning',
 
   }).then(async () => {
 
-    if (model == 'rulego') {
 
-      await axios.delete(import.meta.env.VITE_RULEGO_SERVER_URL + '/rule/' + row.flowId, { headers }).catch(() => {
 
+    if (model == 'sagoo-rule') {
 
+      await axios.delete(import.meta.env.VITE_RULE_SERVER_URL + '/rule/' + row.flowId, { headers }).catch(() => {
 
         ElMessage.error('规则不存在')
 
       })
 
     } else if (model == 'node-red') {

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels