From 91814231b27175707b771cc2872b2ea97c315be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 14 Jan 2025 10:02:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E6=B1=82=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/networkRequest/NetworkRequest.vue | 4 ++--
 ruoyi-ui/src/utils/scrin.js                               | 2 +-
 ruoyi-ui/src/views/system/layoutEdit.vue                  | 2 +-
 ruoyi-ui/src/views/system/layoutModel.vue                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/components/networkRequest/NetworkRequest.vue b/ruoyi-ui/src/components/networkRequest/NetworkRequest.vue
index ae3b170..b757cb2 100644
--- a/ruoyi-ui/src/components/networkRequest/NetworkRequest.vue
+++ b/ruoyi-ui/src/components/networkRequest/NetworkRequest.vue
@@ -358,7 +358,7 @@ export default {
       this.$set(this.requests[k], 'connectionStatus', 0)
       getHistoryData({
         deviceModeId: i.deviceModeId,
-        functionIdentifier: i.functionIdentifier + '1',
+        functionIdentifier: i.functionIdentifier,
         interval: i.interval,
         "sceneId": 144,
         "deviceId": i.deviceId,
@@ -474,7 +474,7 @@ export default {
       if (!this.requests?.[k]?.request) {
         getHistoryData({
           deviceModeId: i.deviceModeId,
-          functionIdentifier: i.functionIdentifier + '1',
+          functionIdentifier: i.functionIdentifier ,
           interval: i.interval,
           "sceneId": 144,
           "deviceId": i.deviceId,
diff --git a/ruoyi-ui/src/utils/scrin.js b/ruoyi-ui/src/utils/scrin.js
index dbc3059..f9d3759 100644
--- a/ruoyi-ui/src/utils/scrin.js
+++ b/ruoyi-ui/src/utils/scrin.js
@@ -30,7 +30,7 @@ const mappingFunction = async (data, method) => {
     if (data.type === 2) {
         let res2 = await getHistoryData({
             deviceModeId: data.deviceModeId,
-            functionIdentifier: data.functionIdentifier + '1',
+            functionIdentifier: data.functionIdentifier ,
             interval: data.interval,
             "sceneId": 144,
             "deviceId": data.deviceId,
diff --git a/ruoyi-ui/src/views/system/layoutEdit.vue b/ruoyi-ui/src/views/system/layoutEdit.vue
index 7b98220..f688a8c 100644
--- a/ruoyi-ui/src/views/system/layoutEdit.vue
+++ b/ruoyi-ui/src/views/system/layoutEdit.vue
@@ -187,7 +187,7 @@
         <el-form-item label="画布背景" label-width="120px">
           <el-upload
             class="avatar-uploader"
-            action="dev-api/basic/hwTemplateAchieve/saveImage"
+            :action="(process.env.NODE_ENV === 'development'?'dev-api':'prod-api')+'/basic/hwTemplateAchieve/saveImage'"
             :headers="{
             authorization:'Bearer ' + getToken()
               }"
diff --git a/ruoyi-ui/src/views/system/layoutModel.vue b/ruoyi-ui/src/views/system/layoutModel.vue
index 3c4a120..7b2f0ca 100644
--- a/ruoyi-ui/src/views/system/layoutModel.vue
+++ b/ruoyi-ui/src/views/system/layoutModel.vue
@@ -81,7 +81,7 @@
         <el-form-item label="背景" label-width="80px">
           <el-upload
             class="avatar-uploader"
-            action="dev-api/basic/hwTemplateAchieve/saveImage"
+            :action="(process.env.NODE_ENV === 'development'?'dev-api':'prod-api')+'/basic/hwTemplateAchieve/saveImage'"
             :headers="{
             authorization:'Bearer ' + getToken()
               }"