Browse Source

提交新版本

lxh 8 months ago
parent
commit
70035c43db

+ 2 - 2
.env.development

@@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理,您可以配置多个 ,请注意,没有换行符
 #VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
-VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://10.10.150.72:9999"],["/webRtc", "http://192.168.183.216:8051"]]
+VITE_PROXY = [["/jeecgsystem","http://182.92.126.35:9999"],["/upload","http://localhost:3300/upload"],["/documents", "http://10.10.150.72:9050"],["/modelreq", "http://182.92.126.35:9999"],["/webRtc", "http://192.168.183.216:8051"]]
 #VITE_PROXY = [["/jeecgsystem","http://192.168.1.8:9999"],["/upload","http://localhost:3300/upload"]]
 
 # 控制台不输出
@@ -18,7 +18,7 @@ VITE_GLOB_API_URL=/modelreq
 
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://10.10.150.72:9999
+VITE_GLOB_DOMAIN_URL=http://182.92.126.35:9999
 # VITE_GLOB_DOMAIN_URL=http://182.92.126.35:9999
 
 # 接口前缀

+ 3 - 3
src/views/vent/monitorManager/alarmMonitor/common/closeWall.vue

@@ -92,8 +92,8 @@
           </div>
         </div>
         <div class="right-echartbox">
-          <canvasZb :widthV="widthV" :heightV="heightV" :coordDw="coordDw" :widthCanvas="widthCanvas"
-            :heightCanvas="heightCanvas"></canvasZb>
+          <warnZb :widthV="widthV" :heightV="heightV" :coordDw="coordDw" :widthCanvas="widthCanvas"
+            :heightCanvas="heightCanvas"></warnZb>
         </div>
 
       </div>
@@ -104,7 +104,7 @@
 <script lang="ts" setup>
 import { onMounted, ref, reactive, watch, defineProps } from 'vue';
 import echartLine1 from './echartLine1.vue';
-import canvasZb from './canvasZb.vue'
+import warnZb from './warnZb.vue'
 
 let props = defineProps({
   listData: Object,

+ 3 - 3
src/views/vent/monitorManager/alarmMonitor/common/warnTargetFire.vue

@@ -10,8 +10,8 @@
             </a-table>
         </div>
         <div class="bot-area">
-            <canvasZb :widthV="widthV" :heightV="heightV" :coordDw="coordDw" :widthCanvas="widthCanvas"
-                :heightCanvas="heightCanvas"></canvasZb>
+            <warnZb :widthV="widthV" :heightV="heightV" :coordDw="coordDw" :widthCanvas="widthCanvas"
+                :heightCanvas="heightCanvas"></warnZb>
         </div>
 
     </div>
@@ -19,7 +19,7 @@
 
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
-import canvasZb from './canvasZb.vue'
+import warnZb from './warnZb.vue'
 
 let widthV = ref('80%')
 let heightV = ref('80%')