Browse Source

视频监控代码合并

ming 2 years ago
parent
commit
2aaddbef19

+ 6 - 7
src/manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "智慧消防",
-    "appid" : "__UNI__D9E08B3",
+    "appid" : "__UNI__36DE3A0",
     "description" : "智慧消防",
     "versionName" : "2.0",
     "versionCode" : 2,
@@ -146,7 +146,8 @@
         "publicPath" : "./",
         "title" : "智慧消防",
         "router" : {
-            "mode" : "hash"
+            "mode" : "hash",
+            "base" : "./"
         },
         "devServer" : {
             "https" : false,
@@ -164,10 +165,8 @@
         "domain" : "https://qhome.usky.cn/",
         "sdkConfigs" : {
             "maps" : {
-                "amap" : {
-                    "key" : "d4d73a7d572b6ff6028d5f67de62029a",
-                    "securityJsCode" : "be916fcd16d0b33d228c49f0ff096b17",
-                    "serviceHost" : ""
+                "qqmap" : {
+                    "key" : "IQ5BZ-UN7KP-VBDDO-LHYJA-LZSPQ-6KFNJ"
                 }
             }
         },
@@ -180,4 +179,4 @@
     },
     "vueVersion" : "3",
     "locale" : "zh-Hans"
-}
+}

+ 6 - 6
src/pages.json

@@ -311,12 +311,12 @@
         "selectedIconPath": "static/tabBar/home-selected.png",
         "text": "主页"
       },
-      {
-        "pagePath": "pages/analyse/analyse",
-        "iconPath": "static/tabBar/analyse.png",
-        "selectedIconPath": "static/tabBar/analyse-selected.png",
-        "text": "分析"
-      },
+      // {
+      //   "pagePath": "pages/analyse/analyse",
+      //   "iconPath": "static/tabBar/analyse.png",
+      //   "selectedIconPath": "static/tabBar/analyse-selected.png",
+      //   "text": "分析"
+      // },
       {
         "pagePath": "pages/info/info",
         "iconPath": "static/tabBar/info.png",

+ 92 - 12
src/pages/business/mhxf/informationSelect/index.vue

@@ -3,21 +3,37 @@
     <u-tabs :list="list" @click="tabsClick" :current="current"></u-tabs>
   </u-sticky>
 
-  <view class="informationSelect" @touchstart="fingerstart" @touchend="fingerend">
-    <uni-swipe-action>
-      <uni-swipe-action-item style="background-color: #ffffff; padding: 10px">
+  <view class="informationSelect" @touchstart="fingerstart" @touchend="fingerend" style="background-color: #ffffff; padding: 10px">
+    <uni-swipe-action >
+      <uni-swipe-action-item >
         <!-- 各类查询 start -->
         <view class="content1">
           <u-input style="border-radius: 50px; margin-bottom: 10px" @blur="blur" v-model="dataInput" prefixIcon="search" prefixIconStyle="color: #0c7bf9" :placeholder="placeholderText"> </u-input>
           <view style="text-align: center; color: rgb(189, 189, 189); font-size: 14px" v-if="!dataRes">暂无数据</view>
-          <u-row v-for="po in classifyData" :key="po" style="height: 36px; line-height: 36px">
-            <u-col span="4">
-              <view style="text-align: right; padding: 0px 5px 0px 5px">{{ po.title }}</view>
-            </u-col>
-            <u-col span="8">
-              <view style="text-align: left; padding: 0px 5px 0px 5px">{{ po.value }}</view>
-            </u-col>
-          </u-row>
+		   <view v-if="current==8">
+			   <view  class="con" style="">
+				   <view class="time">{{newTime}}</view>
+				   	<video src="http://file.usky.cn/statics/video/20230203.mp4" autoplay :controls="false" :show-center-play-btn="false" :loop="true" style="width:100%"></video>
+				   
+				   
+		   </view>
+		   </view>
+		  <view v-else>
+			  <u-row v-for="po in classifyData" :key="po" style="height: 36px; line-height: 36px">
+			    <u-col span="4">
+			      <view style="text-align: right; padding: 0px 5px 0px 5px">{{ po.title }}</view>
+			    </u-col>
+			    <u-col span="8">
+			      <view style="text-align: left; padding: 0px 5px 0px 5px">{{ po.value }}</view>
+			    </u-col>
+			  </u-row>
+			  
+		  </view>
+		 
+         
+		  
+		
+		  
         </view>
         <!-- 各类查询 end -->
       </uni-swipe-action-item>
@@ -93,6 +109,13 @@ const list = ref([
       // value: 5,
     },
   },
+  {
+    id: 9,
+    name: "视频监控",
+    badge: {
+      // value: 5,
+    },
+  },
 ]);
 
 const startData = ref({
@@ -249,6 +272,13 @@ function goSearch() {
     classifySearch(classifyUrl.value, {
       companyId: dataInput.value,
     });
+  } else if (current.value == 8) {
+    //消防检查信息
+    placeholderText.value = "";
+    // classifyUrl.value = "/service-fire/demFireInspect/fireInspectList";
+    // classifySearch(classifyUrl.value, {
+    //   companyId: dataInput.value,
+    // });
   }
 }
 
@@ -562,6 +592,9 @@ async function classifySearch(URL, params) {
       obj.title = classifyTitle[i];
       obj.value = classifyValue[i];
       classifyData.value.push(obj);
+
+
+      console.log(classifyData.value)
     }
   } else {
   }
@@ -572,6 +605,24 @@ watchEffect(() => {
   goSearch();
 });
 
+
+// start
+
+const newTime=ref("")
+ function getNowTime() {
+	var date = new Date();
+	var time = addZero(date.getFullYear()) + '-' + addZero((date.getMonth() + 1)) + '-' + addZero(date.getDate()) + ' ' + addZero(date.getHours()) + ':' + addZero(date.getMinutes()) + ':' + addZero(date.getSeconds());
+	newTime.value = time;
+}
+//根据自己的需求,看要不要在时间不大于10的时候在前面补0,如果需要直接this.addZero(date.getMinutes()),其它与之相同,如果不需要删掉addZero()方法即可。
+//小于10的拼接上0字符串
+function addZero(s) {
+	return s < 10 ? ('0' + s) : s;
+}
+
+
+// end
+
 // 自定义导航事件
 onNavigationBarButtonTap((e) => {
   if (e.float == "right") {
@@ -582,7 +633,17 @@ onNavigationBarButtonTap((e) => {
   }
 });
 
-onLoad((options) => {});
+onLoad((options) => {
+	
+	getNowTime();//进入页面调用该方法获取当前时间
+	        clearInterval(myTimeDisplay );//销毁之前定时器
+	        var myTimeDisplay = setInterval(() => {
+	           getNowTime(); //每秒更新一次时间
+	        }, 1000);  
+	
+	
+	
+});
 
 onReady(() => {});
 
@@ -590,6 +651,9 @@ onMounted(() => {});
 </script>
 
 <style lang="scss">
+	.uni-swipe {
+	    overflow: visible;
+	}
 	body {
 	  background: #fff;
 	}
@@ -633,6 +697,8 @@ onMounted(() => {});
     }
   }
 }
+
+
 </style>
 
 <style scoped>
@@ -643,7 +709,21 @@ uni-page-refresh,
   background: rgb(241, 241, 241);
 }
 
+.time{
+	position: absolute;
+	z-index: 99999;
+	top: 3px;
+	left: 3px;
+	display: inline-block;
+	color: #fff;
+}
+.con{
+	text-align:center;position:relative
+}
 .whiteBackgroundColor {
   background-color: #ffffff;
 }
+body {
+	  background: #fff;
+	}
 </style>

+ 2 - 2
src/pages/setting/setting.vue

@@ -8,7 +8,7 @@
       </view>
     </view>
     <view class="cu-list menu-avatar padding-lr-sm padding-top-sm">
-      <view class="cu-item margin-bottom-sm" @tap="goMessagePush()">
+     <!-- <view class="cu-item margin-bottom-sm" @tap="goMessagePush()">
         <view class="cu-avatar">
           <image class="image-bg" src="@/static/images/setting/push-icon.png" />
         </view>
@@ -48,7 +48,7 @@
             <text class="icon iconfont margin-right-xs margin-left-lg">&#xe629;</text>
           </view>
         </view>
-      </view>
+      </view> -->
 
       <view class="margin-bottom-sm">
         <u-button @click="loginOut()" text="退出登录"></u-button>

+ 2 - 4
src/utils/api.js

@@ -1,12 +1,10 @@
-const BASE_URL = "http://172.16.120.165:13200/prod-api"; //本地请求地址
-// const BASE_URL = 'http://mobile.usky.cn:8099/prod-api'//线上请求地址
+// const BASE_URL = "http://172.16.120.165:13200/prod-api"; //本地请求地址
+const BASE_URL = 'http://mobile.usky.cn:8099/prod-api'//线上请求地址
 const websiteUrl = "https://qhome.usky.cn";
 
 // 同时发送异步代码的次数,防止一次点击中有多次请求,用于处理
 let ajaxTimes = 0;
 
-console.log(process.env.NODE_ENV)
-
 function myRequest(options) {
   let showLoading = options.showLoading || false;