Merge branch 'master' of http://8.141.155.183:3000/bjquanjiang/pinganxiaoyuan

monitorMobile/api/monitor/index.js

@@ -0,0 +1,25 @@
+import http from '@/http/api.js'
+// 获取监控分组
+export const groupList = (params) => {
+	return http.request({
+		url: '/api/business/cameraGroup/getNoPageList',
+		method: 'get',
+		params
+	})
+}
+// 获取监控列表
+export const list = (params) => {
+	return http.request({
+		url: '/api/business/cameraInfo/getPageList',
+		method: 'get',
+		params
+	})
+}
+// 停止视频流获取
+export const stopUrl = (params) => {
+	return http.request({
+		url: '/api/business/deviceApi/getStopVideoLive',
+		method: 'get',
+		params
+	})
+}

monitorMobile/api/warn/index.js

@@ -0,0 +1,25 @@
+import http from '@/http/api.js'
+// 获取预警列表
+export const page = (params) => {
+	return http.request({
+		url: '/api/business/warn/getList',
+		method: 'get',
+		params
+	})
+}
+// 获取预警详情
+export const detail = (params) => {
+	return http.request({
+		url: '/api/business/warn/getInfo',
+		method: 'get',
+		params
+	})
+}
+// 获取预警类型
+export const warnType = (params) => {
+	return http.request({
+		url: '/api/business/warn/getAlarmType',
+		method: 'get',
+		params
+	})
+}

monitorMobile/pages/earlyWarning/components/warningInfo.vue

@@ -174,10 +174,10 @@
 				<u-loadmore :status="status" />
 			</u-list>
 		</view>
-		<selectSearch ref="selectSearchBox" :cellVisible="false" :v-model="searchForm.alarmType"
+		<selectSearch ref="selectSearchBox" :cellVisible="false" v-model="searchForm.alarmType"
 			:options="warnOption" :title.sync="searchForm.$alarmType" placeholder="预警类型" search-placeholder="预警类型" />
-		<selectRadio ref="selectRadioBox" :cellVisible="false" :value.sync="searchForm.warnHand"
-			:options="handOption" title="处理状态" />
+		<selectRadio ref="selectRadioBox" :cellVisible="false" v-model="searchForm.warnHand"
+			:options="handOption" placeholder="处理状态" />
 	</view>
 </template>