路径 样式修改

pages/history/Historymodel.vue

@@ -5,6 +5,7 @@
       title="历史数据"
       @leftClick="devicemenuShow"
       :safeAreaInsetTop="false"
+	  style="margin-top: 30px"
     >
       <view class="u-nav-slot" slot="left">
         <u-icon name="list" size="20"> </u-icon>
@@ -37,13 +38,13 @@
             <u-button
               type="primary"
               shape="circle"
-              text="选择设备"
+              :text="deviceName ? deviceName : '选择设备'"
               @click="deviceShow = true"
             ></u-button>
             <u-button
               type="primary"
               shape="circle"
-              text="间隔时间"
+              :text="lable ? lable : '间隔时间'"
               @click="show = true"
             ></u-button>
             <u-button
@@ -56,7 +57,6 @@
           <u-picker
             :show="deviceShow"
             :columns="[devices]"
-            title="请选择设备"
             @cancel="deviceShow = false"
             @confirm="selectDevice"
             keyName="strinstallpos"
@@ -65,7 +65,6 @@
           <u-picker
             :show="show"
             :columns="timeColumns"
-            title="间隔时间"
             @cancel="show = false"
             keyName="label"
             @confirm="selectSkipTime"
@@ -100,7 +99,7 @@
               <u-col span="2" style="margin-right: 15rpx">
                 <div v-if="item.netStatus == 0" class="error-tag1">
                   <img
-                    src="'../../../../static/model/connectFalse.svg "
+                    src="'/static/model/connectFalse.svg "
                     alt=""
                     class="icon-style"
                   />
@@ -108,7 +107,7 @@
                 </div>
                 <div v-else class="success-tag">
                   <img
-                    src="'../../../../static/model/connectTrue.svg "
+                    src="'/static/model/connectTrue.svg "
                     alt=""
                     class="icon-style"
                   />
@@ -118,7 +117,7 @@
               <u-col span="2">
                 <div v-if="item.readData[warnFlag] == 0" class="success-tag">
                   <img
-                    src="'../../../../static/model/alarmTrue.svg "
+                    src="'/static/model/alarmTrue.svg "
                     alt=""
                     class="icon-style"
                   />
@@ -126,7 +125,7 @@
                 </div>
                 <div v-else class="error-tag">
                   <img
-                    src="'../../../../static/model/alarmFalse.svg "
+                    src="'/static/model/alarmFalse.svg "
                     alt=""
                     class="icon-style"
                   />
@@ -210,7 +209,9 @@ export default {
       StartTime: "", //起始时间
       EndTime: "", //结束时间
       devices: [], //设备类型数组
+      deviceName: "", //设备名称
       timeS: "", //间隔时间
+      lable: "", //间隔时间
       timeColumns: [
         [
           {
@@ -306,6 +307,7 @@ export default {
     selectDevice(e) {
       this.deviceID = e.value[0].id;
       this.deviceType = e.value[0].type;
+      this.deviceName = e.value[0].strinstallpos;
       this.deviceShow = false;
     },
     //选择起始时间
@@ -325,6 +327,7 @@ export default {
     //选择间隔时间
     selectSkipTime(e) {
       this.skip = e.value[0].value;
+      this.lable = e.value[0].label;
       this.show = false;
     },
     //查询历史数据 getDeviceHistory
@@ -371,7 +374,7 @@ export default {
       });
     },
     devicemenuShow(e) {
-      this.menushow = !this.menushow;
+      this.menushow = true;
     },
     menuClick(id) {
       this.TabCur = id;
@@ -392,6 +395,9 @@ export default {
 </script>
 
 <style>
+>>> .u-navbar--fixed {
+  margin-top: 20px;
+}
 .main {
   margin-top: 100rpx;
   display: flex;

pages/home/detail/autodoor/autodoor.vue

@@ -1,7 +1,7 @@
 <template>
   <view style="overflow: auto; height: 100%">
     <!-- 建议放在外层 -->
-    <u-navbar :title="name" @leftClick="backPage" :bgImage="backPic">
+    <u-navbar :title="name" @leftClick="backPage" :bgImage="backPic" style="margin-top: 30px">
       <view class="u-nav-slot" slot="left">
         <u-icon name="arrow-left" size="20"> </u-icon>
       </view>
@@ -167,28 +167,28 @@
                     backgroundImage:
                       item.monitorcode === 'frontRearDP' ||
                       item.monitorcode === 'frontRearDifference'
-                        ? 'url(\'../../../../static/model/Pa.png\')'
+                        ? 'url(\'/static/model/Pa.png\')'
                         : item.monitorcode === 'sourcePressure'
-                        ? 'url(\'../../../../static/model/MPa.png\')'
+                        ? 'url(\'/static/model/MPa.png\')'
                         : item.monitorcode === 'frontGateOpen'
-                        ? 'url(\'../../../../static/model/doorNet.png\')'
+                        ? 'url(\'/static/model/doorNet.png\')'
                         : item.monitorcode === 'rearGateOpen'
-                        ? 'url(\'../../../../static/model/doorNet.png\')'
+                        ? 'url(\'/static/model/doorNet.png\')'
                         : item.monitorcode === 'midGateOpen'
-                        ? 'url(\'../../../../static/model/doorNet.png\')'
+                        ? 'url(\'/static/model/doorNet.png\')'
                         : item.monitorcode === 'warnFlag'
-                        ? 'url(\'../../../../static/model/9432.png\')'
+                        ? 'url(\'/static/model/9432.png\')'
                         : item.monitorcode === 'netStatus'
-                        ? 'url(\'../../../../static/model/9431.png\')'
+                        ? 'url(\'/static/model/9431.png\')'
                         : item.monitorcode === 'm3'
-                        ? 'url(\'../../../../static/model/windM3.png\')'
+                        ? 'url(\'/static/model/windM3.png\')'
                         : item.monitorcode === 'fsectarea'
-                        ? 'url(\'../../../../static/model/duanArea.png\')'
+                        ? 'url(\'/static/model/duanArea.png\')'
                         : item.monitorcode === 'incipientWindSpeed1' ||
                           item.monitorcode === 'incipientWindSpeed2' ||
                           item.monitorcode === 'incipientWindSpeed3' ||
                           item.monitorcode === 'va'
-                        ? 'url(\'../../../../static/model/fengsu.png\')'
+                        ? 'url(\'/static/model/fengsu.png\')'
                         : 'url(\'\')',
                     backgroundSize: '100% 100%',
                   }"
@@ -275,18 +275,22 @@ export default {
 	  fan2State:''
     };
   },
-  onLoad(query) {
-    //保存id到 data 中 可以在整个页面中使用
-    this.itemId = query.id;
-    this.name = query.name;
-    this.TabCur = query.type;
+  onLoad(options) {
+	      // 通过 options 对象获取传递过来的参数
+	      const id = options.id;
+	      const name = options.name;
+	      const type = options.type;
+    this.itemId = id;
+    this.name = name;
+    this.TabCur = type;
     this.ndoorcount = 2;
   },
   components: { doorAnimate, windowAnimate,windrectAnimate,fanlocalAnimate },
   created() {
+	  //保存id到 data 中 可以在整个页面中使用
 	this.getShowList(this.TabCur);
     this.getDeviceInfo(this.itemId);
-    this.getVideoUrlById(this.itemId);
+    // this.getVideoUrlById(this.itemId);
   },
   mounted() {
     this.startTimer();
@@ -323,7 +327,6 @@ export default {
           .then((response) => {
             if (response.data.code == 200) {
               this.typeList = response.data.result.records;
-			  console.log(this.typeList,'ssssssssssssssssc sa a ')
             } else {
               resolve(response);
             }
@@ -455,12 +458,15 @@ export default {
 </script>
 
 <style>
+>>> .u-navbar--fixed {
+	margin-top: 20px;
+}
 passwordPopup {
   height: 300rpx;
   background-color: #fff;
 }
 .top-nav {
-  background-image: url(../../../../static/topnavbar.png);
+  background-image: url(/static/topnavbar.png);
   background-size: cover; /* 背景图片大小适应 */
   height: 100%;
 }
@@ -551,105 +557,9 @@ passwordPopup {
 }
 .right-content {
   width: 50%; /* 右侧内容占据50%宽度 */
-  background-image: url(../../../../static/model/Pa.png);
+  background-image: url(/static/model/Pa.png);
   background-size: 100% 125%;
 }
-
-/*风窗样式*/
-div.autowindow_new {
-  width: 200px;
-  height: 200px;
-  background-image: url(../../../../static/window/window-bk.png);
-  background-size: 100% 100%;
-  perspective: 800px;
-}
-/*风窗1 2 3 4*/
-
-div.window_new_1 {
-  margin-top: 12px;
-  margin-left: 15px;
-  width: 170px;
-  height: 30px;
-  background-color: crimson;
-  box-sizing: border-box;
-  float: left;
-  z-index: 1;
-  /* transition: all 2s; */
-  background-image: url(../../../../static/window/window_new1.png);
-  background-size: 100% 100%;
-}
-div.window_new_2 {
-  margin-top: 2px;
-  margin-left: 15px;
-  width: 170px;
-  height: 29px;
-  background-color: crimson;
-  box-sizing: border-box;
-  float: left;
-  z-index: 1;
-  /* transition: all 2s; */
-  background-image: url(../../../../static/window/window_new1.png);
-  background-size: 100% 100%;
-}
-div.window_new_3 {
-  margin-top: 2px;
-  margin-left: 15px;
-  width: 170px;
-  height: 29px;
-  background-color: crimson;
-  box-sizing: border-box;
-  float: left;
-  z-index: 1;
-  /* transition: all 2s; */
-  background-image: url(../../../../static/window/window_new1.png);
-  background-size: 100% 100%;
-}
-div.window_new_4 {
-  margin-top: 2px;
-  margin-left: 15px;
-  width: 170px;
-  height: 29px;
-  background-color: crimson;
-  box-sizing: border-box;
-  float: left;
-  z-index: 1;
-  /* transition: all 2s; */
-  background-image: url(../../../../static/window/window_new1.png);
-  background-size: 100% 100%;
-}
-div.window_new_5 {
-  margin-top: 2px;
-  margin-left: 15px;
-  width: 170px;
-  height: 29px;
-  background-color: crimson;
-  box-sizing: border-box;
-  float: left;
-  z-index: 1;
-  /* transition: all 2s; */
-  background-image: url(../../../../static/window/window_new1.png);
-  background-size: 100% 100%;
-}
-div.window_new_1 {
-  transition: all 2s ease;
-  transform-origin: center center;
-}
-div.window_new_2 {
-  transition: all 2s ease;
-  transform-origin: center center;
-}
-div.window_new_3 {
-  transition: all 2s ease;
-  transform-origin: center center;
-}
-div.window_new_4 {
-  transition: all 2s ease;
-  transform-origin: center center;
-}
-div.window_new_5 {
-  transition: all 2s ease;
-  transform-origin: center center;
-}
 .btns {
   display: flex;
   margin-top: 15px;

pages/home/detail/doorAnimate/doorAnimate.vue

@@ -327,28 +327,28 @@ div.door1 {
   width: 50%;
   float: left;
   margin-left: 20%;
-  background-image: url(../../../../static/door.png);
+  background-image: url(/static/door.png);
   background-size: 100% 100%;
   perspective: 800px;
 }
 div.door2 {
   width: 50%;
   float: left;
-  background-image: url(../../../../static/door.png);
+  background-image: url(/static/door.png);
   background-size: 100% 100%;
   perspective: 800px;
 }
 div.door3 {
   width: 33.3%;
   float: left;
-  background-image: url(../../../../static/door.png);
+  background-image: url(/static/door.png);
   background-size: 100% 100%;
   perspective: 400px;
 }
 div.door4 {
   width: 50%;
   float: left;
-  background-image: url(../../../../static/door.png);
+  background-image: url(/static/door.png);
   background-size: 100% 100%;
   perspective: 800px;
 }
@@ -364,7 +364,7 @@ div.left_door {
   z-index: 1;
   position: absolute;
   transition: all 2s ease;
-  background-image: url(../../../../static/left.png);
+  background-image: url(/static/left.png);
   background-size: 100% 100%;
 }
 div.right_door {
@@ -377,7 +377,7 @@ div.right_door {
   z-index: 1;
   position: absolute;
   transition: all 2s ease;
-  background-image: url(../../../../static/left.png);
+  background-image: url(/static/left.png);
   background-size: 100% 100%;
 }
 div.left_door {

pages/home/detail/fanlocalAnimate/fanlocalAnimate.vue

@@ -145,7 +145,7 @@ div.pageback {
   width: 100%;
   height: calc(80% - 50px);
   min-height: 350px;
-  background-image: url(../../../../static/fan/page-back.png);
+  background-image: url(/static/fan/page-back.png);
   background-size: 100% 100%;
 }
 div.ventilate {
@@ -155,7 +155,7 @@ div.ventilate {
   height: 80%;
   height: calc(80% - 120px);
   min-height: 330px;
-  background-image: url(../../../../static/fan/localfan-back.png);
+  background-image: url(/static/fan/localfan-back.png);
   background-size: 100% 100%;
 }
 div.arrow1,
@@ -188,7 +188,7 @@ div.arrow10-fan1 {
   float: right;
   z-index: 1;
   transition: all 2s ease;
-  background-image: url(../../../../static/fan/arrow-in.png);
+  background-image: url(/static/fan/arrow-in.png);
   background-size: 100% 100%;
 }
 div.arrow101,
@@ -209,7 +209,7 @@ div.arrow108 {
   float: right;
   z-index: 1;
   transition: all 2s ease;
-  background-image: url(../../../../static/fan/arrow-out.png);
+  background-image: url(/static/fan/arrow-out.png);
   background-size: 100% 100%;
 }
 div.arrow201,
@@ -227,7 +227,7 @@ div.arrow205 {
   float: right;
   z-index: 10;
   transition: all 2s ease;
-  background-image: url(../../../../static/fan/arrow-in.png);
+  background-image: url(/static/fan/arrow-in.png);
   background-size: 100% 100%;
 }
 </style>

pages/home/detail/fanlocalAnimate/fanlocalAnimate2.vue

@@ -114,7 +114,7 @@ div.ventilate {
   height:200px;
   min-height: 200px;
   min-width: 300px;
-  background-image: url(../../../../static/fan/fan.png);
+  background-image: url(/static/fan/fan.png);
   background-size: 100% 100%;
   perspective: 800px;
 }
@@ -162,7 +162,7 @@ div.ventilate {
   min-height: 20px;
   height: 22px;
   width:22px;
-  background-image: url(../../../../static/fan/devFan.png);
+  background-image: url(/static/fan/devFan.png);
   background-size: 100% 100%;
 }
 
@@ -213,7 +213,7 @@ div.arrow10-fan1 {
   float: right;
   z-index: 1;
   transition: all 2s ease;
-  background-image: url(../../../../static/fan/arrow-in.png);
+  background-image: url(/static/fan/arrow-in.png);
   background-size: 100% 100%;
 }
 </style>

pages/home/detail/windowAnimate/windowAnimate.vue

@@ -136,7 +136,7 @@ export default {
 /*风窗样式*/
 div.autowindow_new {
   width: 50%;
-  background-image: url(../../../../static/window/window-bk.png);
+  background-image: url(/static/window/window-bk.png);
   background-size: 100% 100%;
   perspective: 800px;
 }
@@ -152,7 +152,7 @@ div.window_new_1 {
   float: left;
   z-index: 1;
   transition: all 2s;
-  background-image: url(../../../../static/window/window_new1.png);
+  background-image: url(/static/window/window_new1.png);
   background-size: 100% 100%;
 }
 div.window_new_2 {
@@ -165,7 +165,7 @@ div.window_new_2 {
   float: left;
   z-index: 1;
   transition: all 2s;
-  background-image: url(../../../../static/window/window_new1.png);
+  background-image: url(/static/window/window_new1.png);
   background-size: 100% 100%;
 }
 div.window_new_3 {
@@ -178,7 +178,7 @@ div.window_new_3 {
   float: left;
   z-index: 1;
   transition: all 2s;
-  background-image: url(../../../../static/window/window_new1.png);
+  background-image: url(/static/window/window_new1.png);
   background-size: 100% 100%;
 }
 div.window_new_4 {
@@ -191,7 +191,7 @@ div.window_new_4 {
   float: left;
   z-index: 1;
   transition: all 2s;
-  background-image: url(../../../../static/window/window_new1.png);
+  background-image: url(/static/window/window_new1.png);
   background-size: 100% 100%;
 }
 div.window_new_5 {
@@ -204,7 +204,7 @@ div.window_new_5 {
   float: left;
   z-index: 1;
   transition: all 2s;
-  background-image: url(../../../../static/window/window_new1.png);
+  background-image: url(/static/window/window_new1.png);
   background-size: 100% 100%;
 }
 div.window_new_1 {

pages/home/detail/windrectAnimate/windrectAnimate.vue

@@ -78,7 +78,7 @@ export default {
     div.checkwind{
         width: 160px;
         height: 160px;
-        background-image: url(../../../../static/wind.png);
+        background-image: url(/static/wind.png);
         background-size:100% 100%;
         perspective: 800px;
     }
@@ -93,7 +93,7 @@ export default {
         float:left;
         z-index: 1;
         transition:all 2s ease;
-        background-image: url(../../../../static/line.png) ;
+        background-image: url(/static/line.png) ;
         background-size:100% 100%;
     }
     div.checkwind .sub_line{
@@ -116,7 +116,7 @@ export default {
 div.checkwind_ds {
   width: 160px;
   height: 160px;
-  background-image: url(../../../../static/wind.png);
+  background-image: url(/static/wind.png);
   background-size: 100% 100%;
   perspective: 800px;
 }
@@ -131,7 +131,7 @@ div.checkwind_ds .sub_line {
   float: left;
   z-index: 1;
   transition: all 2s ease;
-  background-image: url(../../../../static/line_ds.png);
+  background-image: url(/static/line_ds.png);
   background-size: 100% 100%;
 }
 div.checkwind_ds .sub_line1 {
@@ -143,7 +143,7 @@ div.checkwind_ds .sub_line1 {
   box-sizing: border-box;
   z-index: 4;
   transition: all 2s ease;
-  background-image: url(../../../../static/wind_ds1.png);
+  background-image: url(/static/wind_ds1.png);
   background-size: 100% 100%;
 }
 div.checkwind_ds .sub_line2 {
@@ -155,7 +155,7 @@ div.checkwind_ds .sub_line2 {
   box-sizing: border-box;
   z-index: 4;
   transition: all 2s ease;
-  background-image: url(../../../../static/wind_ds2.png);
+  background-image: url(/static/wind_ds2.png);
   background-size: 100% 100%;
 }
 div.checkwind_ds .sub_line {

pages/home/firstmodel.vue

@@ -5,6 +5,7 @@
       title="设备监测"
       @leftClick="devicemenuShow"
       :safeAreaInsetTop="false"
+      style="margin-top: 30px"
     >
       <view class="u-nav-slot" slot="left">
         <u-icon name="list" size="20"> </u-icon>
@@ -27,7 +28,7 @@
               <u-row gutter="5" customStyle="margin-bottom: 10px">
                 <u-col span="24">
                   <img
-                    style="position: absolute; width: 35rpx; height: 35rpx"
+                    style="position: absolute; width: 18px; height: 18px"
                     class="icon"
                     :src="getIcon(TabCur)"
                     alt="Icon"
@@ -39,7 +40,7 @@
                 <u-col span="3" style="margin-right: 5rpx">
                   <div v-if="item.netStatus == 0" class="error-tag1">
                     <img
-                      src="'../../../../static/model/connectFalse.svg "
+                      src="/static/model/connectFalse.svg"
                       alt=""
                       class="icon-style"
                     />
@@ -47,7 +48,7 @@
                   </div>
                   <div v-else class="success-tag">
                     <img
-                      src="'../../../../static/model/connectTrue.svg "
+                      src="/static/model/connectTrue.svg"
                       alt=""
                       class="icon-style"
                     />
@@ -57,15 +58,16 @@
                 <u-col span="4">
                   <div v-if="item.warnFlag == 0" class="success-tag">
                     <img
-                      src="'../../../../static/model/alarmTrue.svg "
+                      src="/static/model/alarmTrue.svg"
                       alt=""
                       class="icon-style"
                     />
+
                     <span style="float: right">{{ item.warnLevel_str }}</span>
                   </div>
                   <div v-else class="error-tag">
                     <img
-                      src="'../../../../static/model/alarmFalse.svg "
+                      src="/static/model/alarmFalse.svg"
                       alt=""
                       class="icon-style"
                     />
@@ -267,7 +269,7 @@ export default {
       this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60;
     },
     devicemenuShow(e) {
-      this.menushow = !this.menushow;
+      this.menushow = true;
     },
     menuClick(id) {
       this.TabCur = id;
@@ -296,17 +298,9 @@ export default {
 </script>
 
 <style>
-.top-nav {
-  height: 100rpx;
-  line-height: 100rpx;
-  background-color: #2aa9f3;
-  color: #daaaa;
+>>> .u-navbar--fixed {
+  margin-top: 20px;
 }
-
-.top-nav2 {
-  background-color: #ffffff;
-}
-
 .main {
   margin-top: 100rpx;
   display: flex;
@@ -326,8 +320,6 @@ export default {
 .menupage {
   position: absolute;
   z-index: 2;
-  top: 40rpx;
-  height: calc(100% - 40rpx);
   width: 100%;
 }
 
@@ -424,16 +416,16 @@ export default {
 .success-tag {
   border-radius: 10%;
   color: #42c000;
-  line-height: 50rpx;
+  line-height: 25px;
   font-size: 14px;
-  width: 120rpx;
-  height: 50rpx;
-  padding-right: 30rpx;
+  width: 60px;
+  height: 26px;
+  padding-right: 15px;
   background-color: rgba(226, 250, 214);
 }
 
 .icon-style {
-  margin: 15rpx;
+  margin: 7px;
   width: 14px;
   height: 14px;
 }

pages/operation/operationModel.vue

@@ -5,6 +5,7 @@
       title="操作记录"
       @leftClick="devicemenuShow"
       :safeAreaInsetTop="false"
+      style="margin-top: 30px"
     >
       <view class="u-nav-slot" slot="left">
         <u-icon name="list" size="20"> </u-icon>
@@ -30,12 +31,12 @@
               :text="EndTime ? EndTime : '结束时间'"
               @click="dataShow1 = true"
             ></u-button>
-            <u-button
-              type="primary"
-              shape="circle"
-              text="查询"
+            <u-icon
+              size="30"
+              color="#3c9cff"
+              name="search"
               @click="checkHistoryData"
-            ></u-button>
+            ></u-icon>
           </div>
           <u-datetime-picker
             :show="dataShow"
@@ -137,7 +138,7 @@ export default {
       this.dataShow1 = false;
     },
     devicemenuShow(e) {
-      this.menushow = !this.menushow;
+      this.menushow = true;
     },
     menuClick(id) {
       this.TabCur = id;
@@ -174,6 +175,9 @@ export default {
 </script>
 
 <style>
+>>> .u-navbar--fixed {
+  margin-top: 20px;
+}
 .main {
   margin-top: 100rpx;
   display: flex;