admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-03-12 14:13:33 +08:00
parent 84f51bf7bb
commit 6d1b1de3c8
3 changed files with 77 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/modules/headNoise.ts
View File

@ -66,6 +66,10 @@ export const getWorkTicket = (params: {}) => {
export const getWorkTicketDetail = (params: {}) => {
return http.get(BASEURL + `/xmgl/rtWorkTicket/page`, params);
};
//工作票(弹窗数据编辑)
export const editWorkTicketDetail = (params: {}) => {
return http.get(BASEURL + `/xmgl/rtWorkTicket/edit`, params);
};
//风险清册
export const getRiskList = (params: {}) => {
return http.get(BASEURL + `/xmgl/rtRiskInventoryType/tree/page`, params);

14
src/views/sevenLargeScreen/headNoise/centerTop.vue
View File

@ -19,13 +19,13 @@
<div class="gifImg">
<img src="@/assets/images/dustNoise/centerGif.gif" alt="" />
</div>
<div class="menListWd menu">温度:{{ plantCap.temperature ? plantCap.temperature : "--" }}℃</div>
<div class="menListSd menu">湿度:{{ plantCap.humidity ? plantCap.humidity : "--" }}%RH</div>
<div class="menListPm2 menu">PM2.5:{{ plantCap.pm25 ? plantCap.pm25 : "--" }}ug/m³</div>
<div class="menListTs menu">TSP:{{ plantCap.tsp ? plantCap.tsp : "--" }}ug/m³</div>
<div class="menListPm10 menu">PM10:{{ plantCap.pm10 ? plantCap.pm10 : "--" }}ug/m³</div>
<div class="menListZs menu">噪声:{{ plantCap.noise ? plantCap.noise : "--" }}dB</div>
<div class="menListFs menu">风速:{{ plantCap.windspeed ? plantCap.windspeed : "--" }}m/s</div>
<div class="menListWd menu">温度:{{ plantCap.temperature || plantCap.temperature == '0' ? plantCap.temperature : "--" }}℃</div>
<div class="menListSd menu">湿度:{{ plantCap.humidity || plantCap.humidity == '0' ? plantCap.humidity : "--" }}%RH</div>
<div class="menListPm2 menu">PM2.5:{{ plantCap.pm25 || plantCap.pm25 == '0' ? plantCap.pm25 : "--" }}ug/m³</div>
<div class="menListTs menu">TSP:{{ plantCap.tsp || plantCap.tsp == '0' ? plantCap.tsp : "--" }}ug/m³</div>
<div class="menListPm10 menu">PM10:{{ plantCap.pm10 || plantCap.pm10 == '0' ? plantCap.pm10 : "--" }}ug/m³</div>
<div class="menListZs menu">噪声:{{ plantCap.noise || plantCap.noise == '0' ? plantCap.noise : "--" }}dB</div>
<div class="menListFs menu">风速:{{ plantCap.windspeed || plantCap.windspeed == '0' ? plantCap.windspeed : "--" }}m/s</div>
<div class="menListPl menu">喷淋状态: {{ currentDevDetail.sprayStatus == 1 ? "投运" : "未投运" }}</div>
</div>
</div>

81
src/views/sevenLargeScreen/safeRisk/riskManage/work-ticket-dialog.vue
View File

@ -60,7 +60,15 @@
<el-col :span="12">
<div class="col-content">
<span>结束时间</span>
<div class="col-content-item">{{ detailData.endTime || "" }}</div>
<el-date-picker
v-if="isEdit"
v-model="detailData.endTime"
type="datetime"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
:clearable="true"
/>
<div class="col-content-item" v-else>{{ detailData.endTime || "" }}</div>
</div>
</el-col>
<el-col :span="12">
@ -102,7 +110,7 @@
<el-col :span="24">
<div class="col-content">
<span>作业部位</span>
<div class="col-content-item" style="height: 60px;">{{ detailData.workPart || "" }}</div>
<div class="col-content-item" style="height: 60px">{{ detailData.workPart || "" }}</div>
</div>
</el-col>
</el-row>
@ -110,7 +118,7 @@
<el-col :span="24">
<div class="col-content">
<span>地理位置</span>
<div class="col-content-item" style="height: 60px;">{{ detailData.geographicalLocation || "" }}</div>
<div class="col-content-item" style="height: 60px">{{ detailData.geographicalLocation || "" }}</div>
</div>
</el-col>
</el-row>
@ -146,7 +154,7 @@
<el-col :span="24">
<div class="col-content">
<span>主要风险</span>
<div class="col-content-item" style="height: 60px;">{{ detailData.mainRisk || "" }}</div>
<div class="col-content-item" style="height: 60px">{{ detailData.mainRisk || "" }}</div>
</div>
</el-col>
</el-row>
@ -154,13 +162,15 @@
<el-col :span="12">
<div class="col-content">
<span>作业必备条件</span>
<div class="col-content-item" style="height: 60px;">{{ detailData.jobPrerequisite || "" }}</div>
<div class="col-content-item" style="height: 60px">{{ detailData.jobPrerequisite || "" }}</div>
</div>
</el-col>
<el-col :span="12">
<div class="col-content">
<span>作业过程风险控制措施</span>
<div class="col-content-item" style="height: 60px;">{{ detailData.operationProcessRiskControlMeasure || "" }}</div>
<div class="col-content-item" style="height: 60px">
{{ detailData.operationProcessRiskControlMeasure || "" }}
</div>
</div>
</el-col>
</el-row>
@ -168,7 +178,9 @@
<el-col :span="24">
<div class="col-content">
<span>现场风险复测变化情况及补充控制措施</span>
<div class="col-content-item" style="height: 60px;">{{ detailData.riskRetestChangesAndSupplementaryControlMeasure || "" }}</div>
<div class="col-content-item" style="height: 60px">
{{ detailData.riskRetestChangesAndSupplementaryControlMeasure || "" }}
</div>
</div>
</el-col>
</el-row>
@ -179,24 +191,44 @@
<div class="col-content-item">{{ detailData.issueDate || "" }}</div>
</div>
</el-col>
<el-col :span="12">
<el-col :span="6">
<div class="col-content">
<span>工作票</span>
<el-button @click="previewFile()">预览</el-button>
</div>
</el-col>
<el-col :span="6">
<div class="col-content">
<span>操作</span>
<el-button @click="editOperate" v-if="!isEdit">编辑</el-button>
<el-button @click="saveOperate" v-else>保存</el-button>
</div>
</el-col>
</el-row>
</div>
</div>
<div class="right-content">
<ckplayerComp
<el-carousel indicator-position="none" height="450px" v-if="detailData.videoList && detailData.videoList.length > 0">
<el-carousel-item v-for="(item, index) in detailData.videoList" :key="item.id">
<div style="width: 100%; height: 100%">
<ckplayerComp
:name="0"
:poster="''"
:deviceIp="`http://${item.account}:${item.password}`"
:videoUrls="item.serialNumber"
:autoPlay="true"
></ckplayerComp>
</div>
</el-carousel-item>
</el-carousel>
<!-- <ckplayerComp
:name="0"
:poster="''"
:deviceIp="`http://${detailData.videoList[0].account}:${detailData.videoList[0].password}`"
:videoUrls="detailData.videoList[0].serialNumber"
:autoPlay="true"
v-if="detailData.videoList && detailData.videoList.length > 0"
></ckplayerComp>
></ckplayerComp> -->
</div>
</div>
<div class="notoDta" v-else>
@ -214,9 +246,11 @@
<script lang="ts" setup>
import { ref, onMounted, watch } from "vue";
import { GlobalStore } from "@/stores";
import { getWorkTicketDetail } from "@/api/modules/headNoise";
import { getWorkTicketDetail, editWorkTicketDetail } from "@/api/modules/headNoise";
import firstIcon from "@/assets/images/smartPartyBuilding/contentBox.png";
import ckplayerComp from "../../videoManagement/ckplayerComp.vue";
import { ElMessage } from "element-plus";
const isEdit = ref(false);
const detailId = ref("" as any);
const detailData = ref({} as any);
const articleNewList = ref([] as any);
@ -224,7 +258,22 @@ const store = GlobalStore();
const selectTitle = ref("" as any);
let showDialog = ref(false as any);
const postData = ref({} as any);
let dialogTitle = ref("" as any);
// 保存操作
const saveOperate = async () => {
const res: any = await editWorkTicketDetail({ ...detailData });
if (res.success) {
ElMessage({
showClose: true,
message: "操作成功",
type: "success"
});
isEdit.value = false;
}
};
// 编辑操作
const editOperate = () => {
isEdit.value = true;
};
// 预览文件
const previewFile = () => {
let data = JSON.parse(detailData.value.workTicket);
@ -252,7 +301,9 @@ const activeBtn = (item: any) => {
detailId.value = item.id;
detailData.value = item;
}
console.log(detailData.value.videoList[0].serialNumber)
// 取消编辑态
isEdit.value = false;
console.log(detailData.value.videoList[0].serialNumber);
};
const boxStyle = (item: any) => {
if (item.isActive) {
@ -306,8 +357,8 @@ defineExpose({
});
watch(
() => showDialog.value,
(newData) => {
if(newData){
newData => {
if (newData) {
getDataList();
}
}