Merge branch 'master' of http://182.92.126.35:3000/msx/Vent-App

common/service/config.service.js

@@ -8,7 +8,7 @@ if (process.env.NODE_ENV == "development") {
   // BASE_URL = "http://10.248.135.10:9999"; // 大柳塔进
   // BASE_URL = "http://10.248.135.121:9999"; // 活鸡兔井
   // BASE_URL = "http://10.246.63.125:9999"; // 寸草塔二矿
-  // BASE_URL = "http://10.246.183.35:9999"; // 乌兰木伦
+  BASE_URL = "http://10.246.183.35:9999"; // 乌兰木伦
   // BASE_URL = "http://10.120.120.164:9999"; // 察哈素
   // BASE_URL = "http://182.92.126.35:9999"; // 生产环境
   // BASE_URL = "http://172.16.53.16:9999"; // 

pages/device/index.vue

@@ -1,107 +1,134 @@
 <template>
-	<view>
-		<!-- 建议放在外层 -->
-		<u-navbar 
+  <view>
+    <!-- 建议放在外层 -->
+    <u-navbar
       :bgStatusImage="backPic0"
-      :bgImage="backPic" title="设备中心" @leftClick="devicemenuShow" :safeAreaInsetTop="true">
-			<view class="u-nav-slot" slot="left">
-				<u-icon name="list" size="20"> </u-icon>
-			</view>
-		</u-navbar>
+      :bgImage="backPic"
+      title="设备中心"
+      @leftClick="devicemenuShow"
+      :safeAreaInsetTop="true"
+    >
+      <view class="u-nav-slot" slot="left">
+        <u-icon name="list" size="20"> </u-icon>
+      </view>
+    </u-navbar>
 
-		<view v-if="menushow" class="menupage">
-			<DeviceMenu @menuClick="menuClick"></DeviceMenu>
-		</view>
-		<u-tabs class="devic-box-tab" :current="PageCur" :list="tabList" @click="NavChange"></u-tabs>
-		<view class="">
-			<home cur="home" :showColum="showColum" v-if="PageCur == '0' && !menushow" :key="0" :deviceType="deviceType"
-				@setMenushow="setMenushow"></home>
-			<history :key="1" cur="history" :showColum="showColum" :deviceType="deviceType"
-				v-if="PageCur == '1' && !menushow" @setMenushow="setMenushow"></history>
-			<operation :key="2" :showColum="showColum" :deviceType="deviceType" cur="operation"
-				v-if="PageCur == '2' && !menushow" @setMenushow="setMenushow"></operation>
-		</view>
-	</view>
+    <view v-if="menushow" class="menupage">
+      <DeviceMenu @menuClick="menuClick"></DeviceMenu>
+    </view>
+    <u-tabs
+      class="devic-box-tab"
+      :current="PageCur"
+      :list="tabList"
+      @click="NavChange"
+    ></u-tabs>
+    <view class="">
+      <home
+        cur="home"
+        :showColum="showColum"
+        v-if="PageCur == '0' && !menushow"
+        :key="0"
+        :deviceType="deviceType"
+        @setMenushow="setMenushow"
+      ></home>
+      <history
+        :key="1"
+        cur="history"
+        :showColum="showColum"
+        :deviceType="deviceType"
+        v-if="PageCur == '1' && !menushow"
+        @setMenushow="setMenushow"
+      ></history>
+      <operation
+        :key="2"
+        :showColum="showColum"
+        :deviceType="deviceType"
+        cur="operation"
+        v-if="PageCur == '2' && !menushow"
+        @setMenushow="setMenushow"
+      ></operation>
+    </view>
+  </view>
 </template>
 
 <script>
 import api from "@/api/api";
 import DeviceMenu from "./devicemenu/devicemenu.vue";
 export default {
-	components: {
-		DeviceMenu,
-	},
-	data() {
-		return {
-			backPic0: "url(/static/topnavbar0.png)",
-			backPic: "url(../../static/topnavbar.png)",
-			PageCur: "0",
-			showColum: {},
-			menushow: false,
-			deviceType: '',
-			tabList: [
-				{
-					name: '设备监测'
-				},
-				{
-					name: '历史数据'
-				},
-				{
-					name: '操作记录'
-				},
-			],
-		};
-	},
-	created() {
-		this.getShowColum();
-	},
-	onLoad: function () {
-		this.PageCur = "0";
-	},
-	methods: {
-		NavChange: function (item) {
-			this.PageCur = item.index;
-			this.menushow = false
-		},
-		devicemenuShow(e) {
-			this.menushow = !this.menushow;
-		},
-		menuClick(id) {
-			debugger
-			// this.TabCur = id;
-			this.deviceType = id;
-			this.menushow = false;
-		},
-		getShowColum() {
-			new Promise((resolve, reject) => {
-				api
-					.getShowColum({})
-					.then((response) => {
-						if (response.data.code == 200) {
-							var showlist = response.data.result;
-							this.$store.commit("SET_SHOWCOLUM", showlist);
-							this.showColum = showlist;
-						} else {
-							resolve(response);
-						}
-					})
-					.catch((error) => {
-						console.log("catch===>response", response);
-						reject(error);
-					});
-			});
-		},
-		setMenushow(params) {
-			if (params) {
-				this.menushow = params.menushow
-			}
-		}
-	},
+  components: {
+    DeviceMenu,
+  },
+  data() {
+    return {
+      backPic0: "url(/static/topnavbar0.png)",
+      backPic: "url(../../static/topnavbar.png)",
+      PageCur: "0",
+      showColum: {},
+      menushow: false,
+      deviceType: "",
+      tabList: [
+        {
+          name: "设备监测",
+        },
+        {
+          name: "历史数据",
+        },
+        {
+          name: "操作记录",
+        },
+      ],
+    };
+  },
+  created() {
+    this.getShowColum();
+  },
+  onLoad: function () {
+    this.PageCur = "0";
+  },
+  methods: {
+    NavChange: function (item) {
+      this.PageCur = item.index;
+      this.menushow = false;
+    },
+    devicemenuShow(e) {
+      this.menushow = !this.menushow;
+    },
+    menuClick(id) {
+      debugger;
+      // this.TabCur = id;
+      this.deviceType = id;
+      this.menushow = false;
+    },
+    getShowColum() {
+      new Promise((resolve, reject) => {
+        api
+          .getShowColum({})
+          .then((response) => {
+            if (response.data.code == 200) {
+              var showlist = response.data.result;
+              this.$store.commit("SET_SHOWCOLUM", showlist);
+              this.showColum = showlist;
+            } else {
+              resolve(response);
+            }
+          })
+          .catch((error) => {
+            console.log("catch===>response", response);
+            reject(error);
+          });
+      });
+    },
+    setMenushow(params) {
+      if (params) {
+        this.menushow = params.menushow;
+      }
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .devic-box-tab {
-	// margin-top: 50px;
+  // margin-top: 50px;
 }
 </style>

pages/history/history.vue

@@ -25,14 +25,14 @@
               mode="datetime"
               @cancel="dataShow = false"
               @confirm="selectStartTime"
-              v-model="dataTime"
+              v-model="StartTime"
             ></uni-datetime-picker>
             <uni-datetime-picker
               :show="dataShow1"
               mode="datetime"
               @cancel="dataShow1 = false"
               @confirm="selectEndTime"
-              v-model="dataTime"
+              v-model="EndTime"
             ></uni-datetime-picker>
           </div>
           <div class="btns" style="margin-top: 10px">
@@ -108,50 +108,44 @@
                   <u--text class="timetext" :text="item.ttime"></u--text>
                 </u-col>
               </u-row>
-              <view v-if="colums[TabCur + '_monitor'] != null">
-                <view
-                  class="datacard"
-                  v-for="(showitem, index) in colums[TabCur + '_monitor']"
-                  :key="index"
-                  v-show="showitem.appShow == 1"
-                >
-                  <view class="content">
-                    <view>
-                      <view
-                        v-if="
-                          showitem.datatype == 1 &&
-                          item.readData[showitem.monitorcode] !== null &&
-                          item.readData[showitem.monitorcode] !== undefined
-                        "
-                        class="demo-layout bg-purple-light"
-                        style="margin-top: 10rpx; color: #3787fe"
-                        >{{ item[showitem.monitorcode] }}</view
-                      >
-                      <view
-                        v-else-if="
-                          showitem.datatype == 2 &&
-                          item.readData[showitem.monitorcode] !== null &&
-                          item.readData[showitem.monitorcode] !== undefined
-                        "
-                        class="demo-layout bg-purple-light"
-                        style="color: #3787fe"
-                        >{{ item.readData[showitem.monitorcode] }}</view
-                      >
-                      <view
-                        v-else
-                        class="demo-layout bg-purple-light"
-                        style="color: #3787fe"
-                        >--</view
-                      >
-                      <view
-                        class="demo-layout bg-purple-light"
-                        style="margin-top: 10px; color: #677799"
-                        >{{ showitem.des }}</view
-                      >
-                    </view>
+              <div
+                class="datacard"
+                v-for="(showitem, index) in currentHistory"
+                v-show="showitem.appshow == 1"
+                :key="showitem.id + index"
+              >
+                <div class="content">
+                  <view
+                    v-if="showitem.datatype == 1"
+                    class="demo-layout bg-purple-light"
+                    style="margin-top: 60rpx; color: #3787fe"
+                  >
+                    {{
+                      item[showitem.monitorcode] == null ||
+                      item[showitem.monitorcode] == ""
+                        ? "--"
+                        : item[showitem.monitorcode]
+                    }}
                   </view>
-                </view>
-              </view>
+                  <view
+                    v-else-if="showitem.datatype == 2"
+                    class="demo-layout bg-purple-light"
+                    style="margin-top: 60rpx; color: #3787fe"
+                  >
+                    {{
+                      item.readData[showitem.monitorcode] == null ||
+                      item.readData[showitem.monitorcode] == ""
+                        ? "--"
+                        : item.readData[showitem.monitorcode]
+                    }}
+                  </view>
+                  <view
+                    class="demo-layout bg-purple-light"
+                    style="color: #3787fe"
+                    >{{ showitem.des }}</view
+                  >
+                </div>
+              </div>
             </u-list-item>
           </template>
           <template v-else>
@@ -174,7 +168,7 @@ export default {
       menushow: false,
       TabCur: "gate",
       curlist: [],
-      colums: {},
+      colums: [],
       deviceList: {},
       startDate: null,
       endDate: null,
@@ -240,9 +234,6 @@ export default {
   },
   props: ["showColum", "deviceType"],
   watch: {
-    showColum(data) {
-      this.colums = data;
-    },
     deviceType: {
       async handler(data) {
         if (data) {
@@ -270,9 +261,15 @@ export default {
     this.EndTime = dayjs(endTime).format("YYYY-MM-DD HH:mm:ss");
   },
   mounted() {
-    this.TabCur = "gate";
+    // this.TabCur = deviceType;
     this.loadData(this.TabCur);
   },
+
+  computed: {
+    currentHistory() {
+      return this.colums[this.TabCur + "_history"] || [];
+    },
+  },
   methods: {
     loadData(type) {
       new Promise((resolve, reject) => {
@@ -322,7 +319,7 @@ export default {
       this.StartTime = formattedTime;
       this.dataShow = false;
     },
-    //选择起始时间
+    //选择结束时间
     selectEndTime(e) {
       const endTime = e.value;
       const formattedTime = dayjs(endTime).format("YYYY-MM-DD HH:mm:ss");
@@ -353,7 +350,8 @@ export default {
           .then((response) => {
             debugger;
             if (response.data.code == 200) {
-              this.historyData = response.data.result.datalist.records;
+              const infolist = response.data.result;
+              this.historyData = infolist.datalist.records;
               this.historyData.forEach((item) => {
                 if (item.readData.frontGateOpen == 1) {
                   item.readData.frontGateOpen = "打开";
@@ -450,7 +448,7 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
 .emptyhistory {
   background: url("/static/empty.png") no-repeat;
   background-size: 100% 50%;
@@ -463,6 +461,12 @@ export default {
   line-height: 80vh;
   color: #333;
 }
+.content {
+  width: 100%;
+  display: flex;
+  height: 290rpx;
+  flex-direction: column;
+}
 .main {
   /* margin-top: 100rpx; */
   display: flex;
@@ -501,7 +505,7 @@ export default {
   width: 30%;
   margin: 1%;
   float: left;
-  height: 100rpx;
+  height: 190rpx;
   text-align: center;
   background: linear-gradient(
     to right,

pages/home/detail/autodoor/autodoor.vue

@@ -75,6 +75,7 @@
             :gatestate1="frontGateStatus"
             :gatestate2="midGateStatus"
             :gatestate3="rearGateStatus"
+            :cameralist="cameralist"
             :height="height"
             :doorcount="ndoorcount"
           ></doorAnimate>
@@ -100,7 +101,7 @@
         <div class="flcard" v-if="this.TabCur == 'fanmain'">
           <fanmainAnimate
             ref="fanpage"
-            style="width: 100%; min-width: 550px; height: calc(68vh - 220px)"
+            style="width: 100%"
             :door1="door1"
             :topdoor1="topdoor1"
             :fundoor1="fundoor1"
@@ -131,67 +132,6 @@
             :windowcount="nwindownum"
           ></windowAnimate>
         </div>
-        <div
-          class="flcard"
-          style="height: calc(100vh - 80px); overflow-y: auto; padding: 0px"
-        >
-          <u-row
-            :gutter="0"
-            v-for="(row, index) in rows"
-            style="width: calc(100vw - 50px); float: left"
-            :key="index"
-          >
-            <!-- 循环所有摄像头，根据摄像头个数分行分列 -->
-            <!-- 分列 -->
-            <u-col
-              :span="24"
-              v-for="(item, subindex) in row.list"
-              :key="subindex"
-              style="margin-top: 5px; margin-bottom: 5px"
-              :style="'height:' + height"
-            >
-              <!-- 摄像头标题显示 -->
-              <u-row>
-                <view class="videotitle">
-                  <span>{{ item.name }}</span
-                  ><span v-if="item.netStatus == 0">【网络断开】</span>
-                </view>
-              </u-row>
-
-              <!-- 摄像头展示 -->
-              <view
-                v-if="item.devicekind == 'flv'"
-                style="width: 100%; height: 100%; text-align: center"
-              >
-                <video
-                  :id="'cameraElement' + item.id"
-                  muted
-                  autoplay
-                  controls
-                  width="100%"
-                  height="100%"
-                ></video>
-              </view>
-              <!-- 海康控件展示 -->
-              <iframe
-                v-if="item.devicekind == 'hk'"
-                ref="iframe"
-                frameborder="0"
-                scrolling="yes"
-                style="
-                  z-index: -1;
-                  background-color: transparent;
-                  width: 100%;
-                  height: 100%;
-                  top: 0;
-                  left: 0;
-                  bottom: 0;
-                "
-                :src="item.showurl"
-              ></iframe>
-            </u-col>
-          </u-row>
-        </div>
         <div class="flcard">
           <div class="flex-container">
             <div
@@ -200,7 +140,10 @@
               :key="index"
               v-show="item.appShow == 1"
             >
-              <div class="datacardtime" v-if="item.monitorcode == 'readTime'">
+              <div
+                class="datacardtime"
+                v-if="item.monitorcode == 'readTime' && item.datatype == 1"
+              >
                 <view
                   class="demo-layout bg-purple-light"
                   style="padding: 20rpx; color: #3787fe"
@@ -211,44 +154,60 @@
               <div class="datacard" v-if="item.monitorcode !== 'readTime'">
                 <div class="left-content">
                   <view
-                    v-if="item.monitorcode == 'ndoortype'"
+                    v-if="item.monitorcode == 'ndoortype' && item.datatype == 1"
                     class="demo-layout bg-purple-light"
-                    style="margin-top: 10rpx; color: #3787fe"
+                    style="margin-top: 60rpx; color: #3787fe"
                   >
                     {{
                       tableData[item.monitorcode] == "1"
                         ? "行人"
                         : tableData[item.monitorcode] == "2"
                         ? "行车"
-                        : "-"
+                        : "--"
                     }}
                   </view>
                   <view
-                    v-else-if="item.monitorcode == 'netStatus'"
+                    v-else-if="
+                      item.monitorcode == 'netStatus' && item.datatype == 1
+                    "
                     class="demo-layout bg-purple-light"
-                    style="margin-top: 10rpx; color: #3787fe"
+                    style="margin-top: 60rpx; color: #3787fe"
                   >
                     {{ doorNetStatus == "1" ? "正常" : "异常" }}
                   </view>
                   <view
-                    v-else-if="item.monitorcode == 'warnFlag'"
+                    v-else-if="
+                      item.monitorcode == 'warnFlag' && item.datatype == 1
+                    "
                     class="demo-layout bg-purple-light"
-                    style="margin-top: 10rpx; color: #3787fe"
+                    style="margin-top: 60rpx; color: #3787fe"
                   >
                     {{ warnFlag == "1" ? "正常" : "异常" }}
                   </view>
                   <view
-                    v-else
+                    v-else-if="item.datatype == 1"
                     class="demo-layout bg-purple-light"
-                    style="margin-top: 10rpx; color: #3787fe"
+                    style="margin-top: 60rpx; color: #3787fe"
                   >
                     {{
                       tableData[item.monitorcode] == null ||
                       tableData[item.monitorcode] == ""
-                        ? "-"
+                        ? "--"
                         : tableData[item.monitorcode]
                     }}
                   </view>
+                  <view
+                    v-else-if="item.datatype == 2"
+                    class="demo-layout bg-purple-light"
+                    style="margin-top: 60rpx; color: #3787fe"
+                  >
+                    {{
+                      tableData.readData[item.monitorcode] == null ||
+                      tableData.readData[item.monitorcode] == ""
+                        ? "--"
+                        : tableData.readData[item.monitorcode]
+                    }}
+                  </view>
                   <div class="spacer"></div>
                   <!-- 间距 -->
                   <view
@@ -258,7 +217,7 @@
                     {{ item.des }}
                   </view>
                 </div>
-                <div
+                <!-- <div
                   class="right-content"
                   :style="{
                     backgroundImage:
@@ -289,7 +248,7 @@
                         : 'url(\'\')',
                     backgroundSize: '100% 100%',
                   }"
-                ></div>
+                ></div> -->
               </div>
             </div>
           </div>
@@ -350,11 +309,10 @@ import windowAnimate from "../windowAnimate/windowAnimate.vue";
 import windrectAnimate from "../windrectAnimate/windrectAnimate.vue";
 import fanlocalAnimate from "../fanlocalAnimate/fanlocalAnimate2.vue";
 import fanmainAnimate from "../fanmainAnimate/fanmainAnimate.vue";
-import flvjs from "flv.js";
 export default {
   data() {
     return {
-      tableData: [], //监测数据
+      tableData: {}, //监测数据
       typeList: [], //展示字段
       itemId: "", // 初始化 itemId
       name: "", // 初始化 name
@@ -393,12 +351,6 @@ export default {
       fan2State: "",
       deviceid: "", //ID
       cameralist: [], //摄像数据
-      rows: [], //分行
-      flvPlayer: [],
-      num: 1, //摄像头个数
-      columnNum: 1, //列数
-      columSpan: 24, //列块
-      cameraType: "",
     };
   },
   onLoad(query) {
@@ -476,7 +428,7 @@ export default {
               response.data.result.msgTxt[0].datalist.length > 0
             ) {
               var result = response.data.result.msgTxt[0].datalist[0];
-              this.tableData = result.readData;
+              this.tableData = result;
               if (this.tableData.frontGateOpen == "1") {
                 this.tableData.frontGateOpen = "打开";
               } else {
@@ -529,8 +481,7 @@ export default {
           .then((response) => {
             if (response.data.code == 200) {
               if (response.data.result.records.length > 0) {
-                this.cameralist = response.data.result.records;
-                this.initData();
+                this.cameralist = response.data.result.records[0];
               }
             } else {
               resolve(response);
@@ -541,69 +492,6 @@ export default {
           });
       });
     },
-    initData() {
-      this.num = this.cameralist.length;
-      // 根据总数量  设置行数、列数
-      // 分行分列
-      this.setRows();
-      // if (this.cameraType == "flv") {
-      if (this.cameralist.length > 0) {
-        setTimeout(() => {
-          this.cameralist.forEach((element) => {
-            if (element.netStatus == 1)
-              // 根据id设置每个播放摄像头的地址
-              this.setVideoUrl(element, element.id);
-          });
-        }, 1000);
-        // }
-      }
-      // }
-    },
-
-    // 根据id设置每个播放摄像头的地址
-    setVideoUrl(element, id) {
-      if (flvjs.isSupported()) {
-        var videourl = element.ip;
-        if (videourl == null || videourl.indexOf("http") == -1)
-          videourl = configUrl.getCameraFLV() + id + ".flv";
-        var videoElement = document.getElementById("cameraElement" + id);
-        // 控件设置地址信息
-        var vdo = flvjs.createPlayer({
-          type: "flv",
-          url: videourl,
-        });
-        // 控件绑定
-        vdo.attachMediaElement(videoElement);
-        vdo.load();
-        // 播放
-        vdo.play();
-        this.flvPlayer.push(vdo);
-      }
-    },
-
-    // 每行摄像头分列
-    setRows() {
-      this.rows = [];
-      var index = 0;
-      // 循环行
-      for (var i = 0; i < this.cameralist.length; i++) {
-        // 一行
-        var row1 = {};
-        var rowlist = [];
-        // 根据摄像头信息设置每个摄像头的访问地址
-        if (index == 0)
-          this.cameralist[i].showurl =
-            this.cameralist[i].showurl + "&checkComponent=1";
-        // 每行摄像头信息
-        rowlist.push(this.cameralist[i]);
-        index++;
-        row1.index = i;
-        row1.list = rowlist;
-        // 摄像头行数
-        this.rows.push(row1);
-        console.log(this.rows, "1111111111111111");
-      }
-    },
     //设备控制
     ctrlDevice(pass) {
       let IDString = String(this.itemId); // 将 ID 转换为字符串
@@ -648,27 +536,11 @@ export default {
   destroyed() {
     // 停止定时器
     this.stopTimer();
-    // 控件清除缓存
-    this.flvPlayer.forEach((element) => {
-      element.pause();
-      element.unload();
-      element.detachMediaElement();
-      element.destroy();
-      element = null;
-    });
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.videotitle {
-  z-index: 2;
-  position: absolute;
-  top: 0px;
-  top: 10px;
-  right: 10px;
-  font-size: 16px;
-}
 .top-nav {
   background-image: url(../../../../static/topnavbar.png);
   background-size: cover; /* 背景图片大小适应 */
@@ -727,7 +599,8 @@ export default {
   flex: 1;
   margin: 1%;
   float: left;
-  height: 50rpx;
+  height: 50px;
+  line-height: 29px;
   text-align: center;
   background: linear-gradient(
     to right,
@@ -742,7 +615,7 @@ export default {
   flex: 1;
   margin: 1%;
   float: left;
-  height: 100rpx;
+  height: 180rpx;
   text-align: center;
   background: linear-gradient(
     to right,
@@ -752,7 +625,7 @@ export default {
   );
 }
 .left-content {
-  width: 50%;
+  width: 100%;
   display: flex;
   flex-direction: column;
 }

pages/home/detail/fanmainAnimate/fanmainAnimate.vue

@@ -407,11 +407,11 @@
       >
         <span>2号电机</span>
       </div>
-      <div style="position: absolute; color: #fff; bottom: -3.7%; left: 28.4%">
+      <div style="position: absolute; color: #fff; top: 63%; left: 28.4%">
         <span v-if="topindex == 2">1#风机</span>
         <span v-if="topindex == 1">2#风机</span>
       </div>
-      <div style="position: absolute; color: #fff; bottom: 45.7%; left: 31.4%">
+      <div style="position: absolute; color: #fff; bottom: 63%; left: 31.4%">
         <span v-if="topindex == 2">2#风机</span>
         <span v-if="topindex == 1">1#风机</span>
       </div>
@@ -539,9 +539,6 @@ export default {
 
 <style scoped>
 div.pageback {
-  padding-top: 10px;
-  margin-top: 12px;
-  width: 100vw;
   height: calc(60% - 50px);
   min-height: 350px;
   background-image: url(/static/mainfan/page-back.png);

pages/home/home.vue

@@ -47,7 +47,7 @@
                         alt=""
                         class="icon-style"
                       />
-                      <span style="float: right">连接</span>
+                      <span style="float: right">正常</span>
                     </div>
                     <div v-else class="error-tag">
                       <image
@@ -55,7 +55,9 @@
                         alt=""
                         class="icon-style"
                       />
-                      <span style="float: right">断开</span>
+                      <span style="float: right; text-overflow: ellipsis">{{
+                        item.warnDes
+                      }}</span>
                     </div>
                   </u-col>
                   <u-col span="5">
@@ -78,7 +80,14 @@
                   >
                     <view
                       :class="TabCur"
-                      style="padding-top: 10rpx; padding-bottom: 10rpx"
+                      style="
+                        padding-top: 10rpx;
+                        padding-bottom: 10rpx;
+                        display: flex;
+                        flex-direction: column;
+                        align-items: center;
+                        height: 100%;
+                      "
                     >
                       <view
                         v-if="
@@ -90,7 +99,7 @@
                           margin-top: 10rpx;
                           color: #3787fe;
                           font-size: 30rpx;
-                          margin-top: 5rpx;
+                          margin-top: 20rpx;
                         "
                       >
                         {{
@@ -108,7 +117,7 @@
                           margin-top: 10rpx;
                           color: #3787fe;
                           font-size: 30rpx;
-                          margin-top: 5rpx;
+                          margin-top: 20rpx;
                         "
                       >
                         {{
@@ -124,7 +133,7 @@
                         style="
                           color: #3787fe;
                           font-size: 30rpx;
-                          margin-top: 5rpx;
+                          margin-top: 20rpx;
                         "
                       >
                         {{
@@ -138,9 +147,9 @@
                       <view
                         class="demo-layout bg-purple-light"
                         style="
-                          margin-top: 6rpx;
+                          margin-top: 20rpx;
                           color: #677799;
-                          margin-bottom: 5rpx;
+                          margin-top: 20rpx;
                         "
                       >
                         {{ showitem.des }}
@@ -182,6 +191,7 @@ export default {
       async handler(data) {
         if (data) {
           this.TabCur = data;
+          console.log(this.TabCur, "sssssabafjuabf");
           this.curlist = this.deviceList[this.TabCur];
 
           if (this.curlist == null) {
@@ -297,19 +307,23 @@ export default {
       });
     },
     openNewPage(params) {
-      const reqData = {
-        id: params.deviceID,
-        name: params.strinstallpos,
-        type: this.TabCur,
-      };
-      const reqparams = uni.$u.queryParams(reqData);
-      this.getShowList(this.TabCur).then(() => {
-        if (this.typeList.length > 0) {
-          this.$destroy();
-          uni.navigateTo({
-            url: `/pages/home/detail/autodoor/autodoor${reqparams}`,
-          });
-        }
+      // const reqData = {
+      //   id: params.deviceID,
+      //   name: params.strinstallpos,
+      //   type: this.TabCur,
+      // };
+      // const reqparams = uni.$u.queryParams(reqData);
+      // this.getShowList(this.TabCur).then(() => {
+      //   if (this.typeList.length > 0) {
+      //     this.$destroy();
+      //     uni.navigateTo({
+      //       url: `/pages/home/detail/autodoor/autodoor${reqparams}`,
+      //     });
+      //   }
+      // });
+      this.$destroy();
+      uni.navigateTo({
+        url: `/pages/home/detail/autodoor/autodoor?id=${params.deviceID}&name=${params.strinstallpos}&type=${this.TabCur}`,
       });
     },
   },
@@ -383,7 +397,7 @@ export default {
   width: 30%;
   margin: 1%;
   float: left;
-  height: 105rpx;
+  height: 190rpx;
   text-align: center;
   background: linear-gradient(
     to right,
@@ -427,8 +441,7 @@ export default {
   line-height: 50rpx;
   font-size: 14px;
   text-align: center;
-  float: left;
-  width: 180rpx;
+  width: 240rpx;
   height: 50rpx;
   padding-right: 30rpx;
   background-color: rgba(233, 0, 0, 0.2);
@@ -442,7 +455,6 @@ export default {
   font-size: 14px;
   text-align: center;
   margin-top: 10rpx;
-  float: left;
   width: 120rpx;
   height: 50rpx;
   background-color: rgba(105, 105, 105, 0.2);

pages/operation/operation.vue

@@ -9,14 +9,14 @@
               mode="datetime"
               @cancel="dataShow = false"
               @confirm="selectStartTime"
-              v-model="dataTime"
+              v-model="StartTime"
             ></uni-datetime-picker>
             <uni-datetime-picker
               :show="dataShow1"
               mode="datetime"
               @cancel="dataShow1 = false"
               @confirm="selectEndTime"
-              v-model="dataTime"
+              v-model="EndTime"
             ></uni-datetime-picker>
             <u-icon
               size="30"