xiaohaizhao 1 éve
szülő
commit
f695c5898d

+ 9 - 2
packageA/facility/modules/list.vue

@@ -34,13 +34,15 @@ export default {
                     "condition": "",
                     "status": ""
                 }
-            }
+            },
         }
     },
     methods: {
         init(forcedUpdating = true) {
             this.uninitialized = false;
             this.getlist(forcedUpdating);
+
+
         },
         getlist(init) {
             let content = this.content;
@@ -50,7 +52,7 @@ export default {
             }
             if (content.pageNumber > content.pageTotal) return;
             this.$Http.basic({
-                "id": 20230615153202,
+                "id": 20230711144102,
                 content
             }).then(res => {
                 console.log("设备列表", res)
@@ -74,6 +76,11 @@ export default {
                     }
                     return v
                 })
+
+
+
+
+
                 this.list = res.pageNumber == 1 ? res.data : this.list.concat(res.data)
                 this.content = content;
             })

+ 1 - 1
pages/facility/index.vue

@@ -96,7 +96,7 @@ export default {
         },
         getlist() {
             this.$Http.basic({
-                "id": 20230615153202,
+                "id": 20230711144102,
                 "content": {
                     "pageNumber": 1,
                     "pageSize": 99999,

+ 10 - 4
pages/facility/modules/control.vue

@@ -1,6 +1,7 @@
 <template>
-    <view v-show="show">
+    <view class="container" v-show="show">
         <prodnum-06 v-if="detail.prodnum == '06'" :control="control" />
+        <prodnum-MT03 v-else-if="detail.prodnum == 'MT03'" :control="control" />
     </view>
 </template>
 
@@ -61,11 +62,11 @@ export default {
                     "w_deviceid": this.detail.w_deviceid,
                 }).then(res => {
                     if (res == true) {
-                        uni.showModal({
+                        /* uni.showModal({
                             title: "通知",
                             content: '设备控制参数已更新',
                             showCancel: false,
-                        })
+                        }) */
                         this.getControl(true);
                     }
                 })
@@ -78,4 +79,9 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.container {
+    width: 355px;
+    margin: 0 auto;
+}
+</style>

+ 3 - 5
pages/facility/my-map.vue

@@ -1,7 +1,7 @@
 <template>
-	<My_listbox ref="box" :pullDown="false"><!--  :latitude="latitude" :longitude="longitude" -->
-		<map name="map" style="width: 100%;height: 100vh;" show-location :markers="markers" :include-points="markers"
-			@markertap="onMarkerTap" @callouttap='usePort == "h5" ? onMarkerTap() : toDetail()'>
+	<My_listbox ref="box" :pullDown="false"><!-- :latitude="latitude" :longitude="longitude"  -->
+		<map name="map" style="width: 100%;height: 100vh;" scale="4" show-location :markers="markers"
+			:include-points="markers" @markertap="onMarkerTap" @callouttap='usePort == "h5" ? onMarkerTap() : toDetail()'>
 			<cover-view slot="callout">
 				<cover-view class="customCallout" v-for="item in markers" :key="item.id" :marker-id="item.id">
 					<cover-view class="title">
@@ -71,8 +71,6 @@ export default {
 	data() {
 		return {
 			uninitialized: true,
-			latitude: 30.746129,
-			longitude: 120.755486,
 			information: [],
 			facility: {},
 			h5Popup: false,