From 0d0968ec2d1a39c21e15e447c4f2227f70d6a11b Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期一, 11 十二月 2023 10:38:37 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
web/src/views/SecureManage/RiskGrad/components/TaskPunchcard.vue | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/web/src/views/SecureManage/RiskGrad/components/TaskPunchcard.vue b/web/src/views/SecureManage/RiskGrad/components/TaskPunchcard.vue
index 28afc51..50c2238 100644
--- a/web/src/views/SecureManage/RiskGrad/components/TaskPunchcard.vue
+++ b/web/src/views/SecureManage/RiskGrad/components/TaskPunchcard.vue
@@ -1,6 +1,6 @@
<!-- 安全管理 ==> 风险分级管控 => 区域巡检(任务打卡)-->
<template>
- <div>
+ <div class="wrap">
<div class="main_header">
<div class="header_item">
<span class="header_label">巡检人：</span>
@@ -8,7 +8,7 @@
</div>
<div class="header_item">
<span class="header_label">巡检状态：</span>
- <el-select size="mini" v-model="queryInfo.status">
+ <el-select size="mini" v-model="queryInfo.status" clearable>
<el-option v-for="item in queryStatus" :key="item.value" :label="item.label" :value="item.value"
placeholder="请选择巡检状态"></el-option>
</el-select>
@@ -72,8 +72,6 @@
<el-image class="image" v-for="(item, index) in regionInfos.img" :key="index" :src="item" fit="contain"
:preview-src-list="regionInfos.img"></el-image>
</el-form-item>
-
- <el-form-item label="获取当前位置:">{{ regionInfos.location }}</el-form-item>
</el-form>
</el-dialog>
</div>
@@ -120,7 +118,6 @@
region: '', // 巡检区域
res: '', // 巡检结果
img: '', // 上传的图片
- location: '', // 位置
}
}
},
@@ -230,13 +227,12 @@
this.regionInfos.time = res.data.inspectionTime
this.regionInfos.region = res.data.region
this.regionInfos.res = res.data.result
- this.regionInfos.location = res.data.location
this.regionInfos.img = []
if (res.data.imgPaths) {
let arr = []
res.data.imgPaths.split(',').forEach(item => {
- arr.push(process.env.VUE_APP_BASE_URL + '/' + item)
+ arr.push('https://szpipe.thhy-tj.com/' + item) // 是生产地址
})
this.regionInfos.img.push(...arr)
}
@@ -265,6 +261,17 @@
<style lang="scss" scoped>
@import '@/style/layout-main.scss';
+.wrap {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+
+ .main_content {
+ overflow: hidden;
+ flex: 1;
+ }
+}
+
.rule_form {
color: #fff;
--
Gitblit v1.9.3