口罩项目第一版

src/utils/index.js

@@ -1,3 +1,5 @@
+
+
 import Cookies from 'js-cookie'
 import store from '@/store'
 

src/views/modules/monitoring/barrier.vue

@@ -217,7 +217,8 @@
         nowRtspurl:"",
         //设置摄像头切换休眠标识
         flag : false,
-        textStyle : 70,
+        //布控阈值，默认为70
+        textStyle : 70.00,
 			}
 		},
 		mounted() {
@@ -228,6 +229,8 @@
 		created() {
 			// 初始化选择默认卡口
 			this.initGetCameraId()
+      //初始化获取今日抓拍
+      this.initTotal()
 			// 初始化获取4条预警信息
 			// this.initGetWarningPicture()
 		},
@@ -312,22 +315,22 @@
 				this.$http.get(`warning/taskInfo/${cameraId}`).then(res => {
 					if (res.data.code === 0) {
 						this.taskName = res.data.data.taskName
-            this.textStyle = res.data.data.controlThreshold
+            //获取当前布控的阈值
+            this.textStyle = res.data.data.controlThreshold*100;
+            console.log(this.textStyle)
 					} else {
 						this.$message.warning(res.data.message)
 					}
 				})
 			},
 			// 初始化获取 今日抓拍/累计抓拍
-			initTotal(cameraId) {
+			initTotal() {
-				this.$http.get(`/warning/todayBayonet/${this.cameraId}`).then(res => {
+				this.$http.get(`/warning/todayBayonet`).then(res => {
 					if (res.data.code === 0) {
-						// 初始化toDaySnapShot 和 totalSnapShot两个字段与ws推送的这两个字段的json结构不一样（来自潘辉）
+						// 初始化toDaySnapShot 和 totalSnapShot
-						res.data.data.result.toDaySnapShot = res.data.data.toDaySnapShot
+            this.toDaySnapShot = res.data.data.toDaySnapShot;
-						res.data.data.result.totalSnapShot = res.data.data.totalSnapShot
+            this.totalSnapShot = res.data.data.totalSnapShot;
-						this.getPicture(res.data.data.result)
+						// this.getPicture(res.data.data.result)
-					} else {
-						//this.$message.error(res.data.message)
 					}
 				})
 			},
@@ -421,12 +424,15 @@
 			 * @param {Object} wsObj
 			 */
 			getWarningPicture(warningData) {
-        this.toDaySnapShot = this.toDaySnapShot + warningData.length
+        //累积今日抓拍的数量
-        this.totalSnapShot = this.totalSnapShot + warningData.length
+         this.toDaySnapShot = this.toDaySnapShot - 0 + warningData.length
+        // this.totalSnapShot = this.totalSnapShot + warningData.length
 				// warningData大于2说明是人脸比对信息videofacelist，其余则是comparelist
           for (let i = 0; i < warningData.length; i++) {
+            if(warningData[i].rtspUrl == this.nowRtspurl) {
               this.videoFaceList.unshift(warningData[i])
             }
+          }
         // this.videoFaceList = warningData;
         //   console.log("this is videofacelist")
         //   console.log(this.videoFaceList)
@@ -516,7 +522,7 @@
 					this.cameraId = data.id
 					// 三级卡口id用于点击查看全部后绑定区域级联下拉框
 					this.treeArr = data.camera_region_firstlevel.split(",")
-					// 获取任务名称
+					// 获取任务名称,当前布控阈值
 					this.getTaskNameByCameraId(this.cameraId)
 					// 切换摄像头时默认查询一条数据展示
 					//this.initTotal(this.cameraId)

src/views/modules/monitoring/surveillance.vue

@@ -71,12 +71,12 @@
 <!--					</div>-->
 <!--				</el-form-item>-->
 				<el-form-item style="margin-bottom:0px" label="处置类型" prop="disposalType">
-					<el-radio v-model="addForm.disposalType" :label="item.label" v-for="item in warningTypeList" :key="item.value">{{item.label}}</el-radio>
+<!--					<el-radio v-model="addForm.disposalType" :label="item.label" v-for="item in warningTypeList" :key="item.value">{{item.label}}</el-radio>-->
-					<!-- <el-radio v-model="addForm.disposalType" label="1">抓捕类</el-radio>
+<!--					&lt;!&ndash; <el-radio v-model="addForm.disposalType" label="1">抓捕类</el-radio>-->
 					<el-radio v-model="addForm.disposalType" label="2">监控类</el-radio>
-					<el-radio v-model="addForm.disposalType" label="3">提示类</el-radio> -->
+<!--					<el-radio v-model="addForm.disposalType" label="3">提示类</el-radio> &ndash;&gt;-->
 					<p v-if="addForm.disposalType == '1'" class="add_p">严重告警结果,针对需要立即处理的对象</p>
-					<p v-else-if="addForm.disposalType == '2'" class="add_p">普通告警结果，针对需要关注的对象</p>
+					<p v-else-if="addForm.disposalType == '2'" class="add_p">普通监控，针对区域内所有对象</p>
 					<p v-else class="add_p">结果通知，可用于演示或测试使用</p>
 				</el-form-item>
 				<el-form-item label="布控区域" prop="monitorArea">
@@ -168,10 +168,10 @@
 <!--					<img :src="addForm2.imgurl" class="avatar">-->
 <!--				</el-form-item>-->
 				<el-form-item style="margin-bottom:0px" label="处置类型" prop="disposalType">
-					<el-radio v-model="addForm2.disposalType" :label="item.label" v-for="item in warningTypeList" :key="item.value">{{item.label}}</el-radio>
+<!--					<el-radio v-model="addForm2.disposalType" :label="item.label" v-for="item in warningTypeList" :key="item.value">{{item.label}}</el-radio>-->
-					<!-- <el-radio v-model="addForm2.disposalType" label="1">抓捕类</el-radio>
+<!--					&lt;!&ndash; <el-radio v-model="addForm2.disposalType" label="1">抓捕类</el-radio>-->
-					<el-radio v-model="addForm2.disposalType" label="2">监控类型</el-radio>
+					<el-radio v-model="addForm2.disposalType" label="2">监控类</el-radio>
-					<el-radio v-model="addForm2.disposalType" label="3">提示类</el-radio> -->
+<!--					<el-radio v-model="addForm2.disposalType" label="3">提示类</el-radio> &ndash;&gt;-->
 <!--					<p v-if="addForm2.disposalType == '1'" style="margin:0px">严重告警结果,针对需要立即处理的对象</p>-->
 <!--					<p v-else-if="addForm2.disposalType == '2'" style="margin:0px">普通告警结果，针对需要关注的对象</p>-->
 <!--					<p v-else style="margin:0px">结果通知，可用于演示或测试使用</p>-->
@@ -198,6 +198,8 @@
 			</span>
 		</el-dialog>
 
+
+
 		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pages.pageNo"
 		 :page-sizes="[10, 20, 30, 40]" :page-size="pages.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
 		</el-pagination>
@@ -297,7 +299,7 @@
 					}],
 					cameraList: [{
 						required: true,
-						message: '请选择摄像头(如果没有数据可选，请移至资源-摄像头匹配)',
+						message: '请选择摄像头(如果没有数据可选，请移至摄像头管理)',
 						trigger: 'change'
 					}],
 					monitorThreshold: [{
@@ -530,13 +532,18 @@
 					taskName: this.addForm2.taskName,
 					disposalType: this.addForm2.disposalType,
 					remarks: this.addForm2.remarks,
-					idControlTask: this.editorId
+					idControlTask: this.editorId,
+          controlThreshold: this.addForm2.controlThreshold / 100
 				}
 				this.$http.put('/control/updatetask', data)
 					.then(res => {
 						if (res.data.code == 0) {
 							this.addDialogVisible2 = false
 							this.data(this.pages)
+              this.$message({
+                type: "success",
+                message: "修改成功"
+              });
 						}
 
 					})
@@ -549,6 +556,8 @@
 			clickStart(id) {
 				this.$http.post(`/control/resumecontrol/${id}`)
 					.then(res => {
+            console.log("开始")
+            console.log(res.data)
 						if (res.data.code == 0) {
 							this.data(this.pages)
 							this.$message({
@@ -567,6 +576,8 @@
 			clickSuspend(id) {
 				this.$http.post(`/control/suspendcontrol/${id}`)
 					.then(res => {
+            console.log("暂停")
+            console.log(res.data)
 						if (res.data.code == 0) {
 							this.data(this.pages)
 							this.$message({

src/views/modules/monitoring/warning.vue

@@ -29,7 +29,7 @@
 
 
     <el-row :gutter="20" style="margin-top: 20px;">
-      <el-col :span="8" v-for="(item,index) in warningList" :key=index.libId>
+      <el-col :span="8" v-for="(item,index) in warningList" :key=index.time>
         <div style="background-color: #FFF;margin-bottom: 20px;border-radius: 2px;cursor: pointer;" @click="openTask(item)">
           <div style="height:40px;line-height:40px;display:flex;justify-content: space-between;border-bottom: 1px solid #F1F8FF;box-sizing: border-box;">
             <i>
@@ -41,8 +41,8 @@
             <div style="display: flex;align-items: center;height: 150px;margin-left: 30px;">
               <div style="width: 120px;height: 120px;background: #F1F6F9;">
                 <img :src="item.cphoto" alt="目标图片" height="100%">
-                <canvas width=120 height=120 :ref="'warningImage'+index">
+<!--                <canvas width=120 height=120 :ref="'warningImage'+index">-->
-                </canvas>
+<!--                </canvas>-->
               </div>
               <!-- 可考虑用背景图 -->
               <div style="width: 120px;height: 120px;background: #F1F6F9;margin: 0 20px;text-align: center;">
@@ -55,7 +55,8 @@
                 <span><i>相似度：</i><i style="font-size: 30px;font-weight: 600;color: #FF343E;font-family:Bahnschrift;">{{(item.xsd*1).toFixed(2)}}%</i></span>
               </div>
             </div>
-            <div style="position: absolute;top:20px;right: 30px;">
+            <div style="position: absolute;top:20px;right: 5px;">
+              <img  src="../../../assets/img/warning/jk.png" alt="监控">
               <img v-if="item.taskType=='3'" src="../../../assets/img/warning/ts.png" alt="提示">
               <img v-if="item.taskType=='2'" src="../../../assets/img/warning/jk.png" alt="监控">
               <img v-if="item.taskType=='1'" src="../../../assets/img/warning/zb.png" alt="抓捕">
@@ -68,8 +69,9 @@
     <task v-if="taskVisible" ref="task" @refreshTaskList></task>
     <!-- 地图详情 -->
     <warning-map ref="mapRef" @mapRefClick="mapRefClick"> </warning-map>
-    <el-pagination @current-change="handleCurrentChange" :current-page.sync="pageObj.page.pageNo" :page-size="pageObj.page.pageSize"
+    <el-pagination style="margin-top:20px" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageObj.page.pageNo"
-                   layout="total,prev, pager, next, jumper" :total="total">
+                   :page-size="pageObj.page.pageSize" :page-sizes="[9, 12, 15, 18,21,24]"
+                   layout="total,prev, pager, next, jumper,sizes"  :total="total">
     </el-pagination>
   </div>
 </template>
@@ -106,7 +108,8 @@ export default {
       // 任务Id
       taskId: "",
       // 预警列表
-      warningList: this.$route.params.videoFaceList,
+      warningList:[],
+      // this.$route.params.videoFaceList,
       // 详情
       taskVisible: false,
       val: {}
@@ -267,6 +270,11 @@ export default {
       this.getWarningList()
     },
     // 页码
+    // el-pagination
+    handleSizeChange: function(pageSize) {
+      this.pageObj.page.pageSize = pageSize
+      this.handleCurrentChange(this.pageObj.page.pageNo);
+    },
     handleCurrentChange(val) {
       this.pageObj.page.pageNo = val
       let dateArr = this.formData.dateValue