Explorar el Código

提交设备详情

wangming07 hace 1 mes
padre
commit
10fa393938
Se han modificado 3 ficheros con 21 adiciones y 33 borrados
  1. 1 1
      src/components/js_sdk/index.js
  2. 9 22
      src/pagesA/deviceDetail/deviceDetail.vue
  3. 11 10
      src/utils/globalMqtt.js

+ 1 - 1
src/components/js_sdk/index.js

@@ -8,7 +8,7 @@ http.setConfig(config => {
         //     config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
         // }
         config.baseUrl = "https://radar-power.cn/portal-service-server/";
-        config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
+        // config.baseUrl = "https://api.radar-power.asia:4443/portal-service-server/";
     }
     if (__wxConfig.envVersion == 'trial') {
         // let selectedService = uni.getStorageSync("sercviceChoice")

+ 9 - 22
src/pagesA/deviceDetail/deviceDetail.vue

@@ -10,7 +10,6 @@
                     width: `${length / 200}px`,
                     height: `${width / 200}px`,
                     position: 'relative',
-                    overflow: 'hidden',
                 }"
                 :class="[
                     width < 25500 && length < 25000 ? 'tranStyle' : 'center',
@@ -39,7 +38,7 @@
                         />
                     </view>
                 </view>
-                <template v-if="devType == 'LNB'">
+                <template>
                     <view v-for="item in targetPoints" :key="item.id">
                         <image
                             class="action-icon-M"
@@ -59,18 +58,6 @@
                         />
                     </view>
                 </template>
-                <template v-else>
-                    <image
-                        v-if="actionName"
-                        class="action-icon-G"
-                        :style="{
-                            top: `${top / 200}px`,
-                            left: `${left / 200}px`,
-                        }"
-                        :src="`../../images/furnitures/${actionName}.png`"
-                        mode=""
-                    />
-                </template>
             </view>
 
             <!-- <image
@@ -108,7 +95,7 @@
                 }}</text>
                 <image src="../../static/rightArrow.png"></image>
             </view>
-            <view
+            <!-- <view
                 @click="getFrenEcharts()"
                 class="title"
                 v-if="
@@ -147,7 +134,7 @@
                         style="margin-left: auto; width: 30rpx; height: 30rpx"
                     ></image>
                 </view>
-            </view>
+            </view> -->
 
             <view class="title" v-if="devInfo.installPosition == 'Toilet'">
                 <view class="title-text" style="color: #22dea7"
@@ -364,7 +351,7 @@
     </view>
 </template>
 <script>
-import * as echarts from "../../uni_modules/lime-echart/static/echarts.min";
+// import * as echarts from "../../uni_modules/lime-echart/static/echarts.min";
 import MqttService from "../../utils/globalMqtt.js";
 
 export default {
@@ -1093,10 +1080,10 @@ export default {
             background-image: url("https://hflnxx.oss-cn-shanghai.aliyuncs.com/IMAGE/20250919/toilet_bg.png");
             background-repeat: no-repeat;
             background-position: center;
-            transform: scale(2.2);
+            transform: scale(2.3);
 
             .moduleContent {
-                overflow: hidden;
+                // overflow: hidden;
 
                 // position: relative;
                 view {
@@ -1152,7 +1139,7 @@ export default {
     .notice-info {
         width: 710rpx;
         max-height: 300rpx;
-        overflow: hidden;
+        // overflow: hidden;
         padding: 30rpx 37rpx 10rpx 37rpx;
         background: #ffffff;
         border-radius: 37rpx;
@@ -1196,7 +1183,7 @@ export default {
 
         .stayDetail {
             height: 80rpx;
-            overflow: hidden;
+            // overflow: hidden;
             margin-top: 10rpx;
             margin-bottom: 10rpx;
             padding-left: 20rpx;
@@ -1409,7 +1396,7 @@ export default {
             width: 80%;
             background: #fff;
             border-radius: 16rpx;
-            overflow: hidden;
+            // overflow: hidden;
             animation: fadeIn 0.3s;
 
             .modal-header {

+ 11 - 10
src/utils/globalMqtt.js

@@ -53,16 +53,17 @@ class MqttService {
         const brokerName = 'DATA';
 
         let url = ""
-        if (__wxConfig.envVersion == 'develop') {
-            url = 'wxs://data.radar-power.asia:8084/mqtt/'
-        }
-
-        if (__wxConfig.envVersion == 'trial') {
-            url = 'wxs://data.radar-power.cn/mqtt/';
-        }
-        if (__wxConfig.envVersion == 'release') {
-            url = 'wxs://data.radar-power.cn/mqtt/';
-        }
+        // if (__wxConfig.envVersion == 'develop') {
+        //     url = 'wxs://data.radar-power.asia:8084/mqtt/'
+        // }
+
+        // if (__wxConfig.envVersion == 'trial') {
+        //     url = 'wxs://data.radar-power.cn/mqtt/';
+        // }
+        // if (__wxConfig.envVersion == 'release') {
+        //     url = 'wxs://data.radar-power.cn/mqtt/';
+        // }
+        url = 'wxs://data.radar-power.cn/mqtt/';
 
         const clientId = `xcx_mqtt_data1_${userId}_${Date.now()}`;