admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-07-10 15:12:16 +08:00
parent 2a00f3362d
commit b93dc0d629
11 changed files with 67 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue
View File

@ -84,15 +84,15 @@
<div class="titcen" style="top: 7%"> <div class="titcen" style="top: 7%">
<div>总投资预算</div> <div>总投资预算</div>
<div>{{ dataObj.totalAmount }}</div> <div>{{ dataObj.totalAmount }}万元</div>
</div> </div>
<div class="titcen" style="top: 40.3%"> <div class="titcen" style="top: 40.3%">
<div>实际投资预算</div> <div>实际投资预算</div>
<div>{{ dataObj.settlementAmount }}</div> <div>{{ dataObj.settlementAmount }}万元</div>
</div> </div>
<div class="titcen" style="top: 73.6%"> <div class="titcen" style="top: 73.6%">
<div>年度投资预算</div> <div>年度投资预算</div>
<div>{{ dataObj.settlementAmountByYear }}</div> <div>{{ dataObj.settlementAmountByYear }}万元</div>
</div> </div>
</div> </div>
<div class="botttworigt"> <div class="botttworigt">
@ -106,19 +106,19 @@
<div class="letcent" style="top: 6%"> <div class="letcent" style="top: 6%">
<div>请款报审</div> <div>请款报审</div>
<div>{{ dataObj.paymentTotal }}</div> <div>{{ dataObj.paymentTotal }}万元</div>
</div> </div>
<div class="letcent" style="top: 31%"> <div class="letcent" style="top: 31%">
<div>审定应付</div> <div>审定应付</div>
<div>{{ dataObj.applyAmountTotal }}</div> <div>{{ dataObj.applyAmountTotal }}万元</div>
</div> </div>
<div class="letcent" style="top: 56%"> <div class="letcent" style="top: 56%">
<div>实际支付</div> <div>实际支付</div>
<div>{{ dataObj.realPayAmountTotal }}</div> <div>{{ dataObj.realPayAmountTotal }}万元</div>
</div> </div>
<div class="letcent" style="top: 81%"> <div class="letcent" style="top: 81%">
<div>年度实际支付</div> <div>年度实际支付</div>
<div>{{ dataObj.realPayAmountByYear }}</div> <div>{{ dataObj.realPayAmountByYear }}万元</div>
</div> </div>
</div> </div>
</div> </div>

7
src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
View File

@ -46,6 +46,11 @@
<el-button class="btnStyle" @click="handleAddItem()">新增</el-button> <el-button class="btnStyle" @click="handleAddItem()">新增</el-button>
<!-- <el-button class="btnStyle">刷新</el-button> --> <!-- <el-button class="btnStyle">刷新</el-button> -->
</template> </template>
<template #slippage="{ row }">
<span :style="{ color: row.slippage ? 'red' : 'var(--el-menu-text-color)' }">{{
row.slippage ? row.slippage : ""
}}</span>
</template>
<!-- 表格操作 --> <!-- 表格操作 -->
<template #operation="scope"> <template #operation="scope">
<el-button class="btnStyle" type="primary" @click="seeGantt"> <el-button class="btnStyle" type="primary" @click="seeGantt">
@ -125,7 +130,7 @@ const columns: ColumnProps[] = [
{ prop: "planEndTime", label: "结束日期" }, { prop: "planEndTime", label: "结束日期" },
{ prop: "unit", label: "申请单位" }, { prop: "unit", label: "申请单位" },
{ prop: "completeRatio", label: "完成百分比(%)" }, { prop: "completeRatio", label: "完成百分比(%)" },
{ prop: "slippage", label: "逾期情况" }, { prop: "slippage", label: "逾期情况(天)" },
{ {
prop: "payTime", prop: "payTime",
label: "时间筛选", label: "时间筛选",

6
src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue
View File

@ -67,6 +67,11 @@
: "" : ""
}}</span> }}</span>
</template> </template>
<template #slippage="{ row }">
<span :style="{ color: row.slippage ? 'red' : 'var(--el-menu-text-color)' }">{{
row.slippage ? row.slippage : ""
}}</span>
</template>
</ProTable> </ProTable>
</div> </div>
<!-- 执法单信息 --> <!-- 执法单信息 -->
@ -166,6 +171,7 @@ const columns: ColumnProps[] = [
prop: "state", prop: "state",
label: "状态" label: "状态"
}, },
{ prop: "slippage", label: "逾期情况(天)" },
{ prop: "operation", label: "操作", fixed: "right", width: 100 } { prop: "operation", label: "操作", fixed: "right", width: 100 }
]; ];
const pageable = ref({ const pageable = ref({

6
src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue
View File

@ -68,6 +68,11 @@
: "" : ""
}}</span> }}</span>
</template> </template>
<template #slippage="{ row }">
<span :style="{ color: row.slippage ? 'red' : 'var(--el-menu-text-color)' }">{{
row.slippage ? row.slippage : ""
}}</span>
</template>
</ProTable> </ProTable>
</div> </div>
<!-- 执法单信息 --> <!-- 执法单信息 -->
@ -135,6 +140,7 @@ const columns: ColumnProps[] = [
prop: "state", prop: "state",
label: "状态" label: "状态"
}, },
{ prop: "slippage", label: "逾期情况(天)" },
{ prop: "operation", label: "操作", fixed: "right", width: 100 } { prop: "operation", label: "操作", fixed: "right", width: 100 }
]; ];
const pageable = ref({ const pageable = ref({

39
src/views/hz-project/largeScreen/largeScreenOne/index.vue
View File

@ -32,32 +32,32 @@
<div class="item"> <div class="item">
<!-- <i class="color1 rect"></i> --> <!-- <i class="color1 rect"></i> -->
<span class="name">申请金额</span> <span class="name">申请金额</span>
<span>{{ dataObj.applyAmountTotal }}</span> <span>{{ dataObj.applyAmountTotal }}万</span>
</div> </div>
<div class="item"> <div class="item">
<!-- <i class="color2 rect"></i> --> <!-- <i class="color2 rect"></i> -->
<span class="name">实际支付</span> <span class="name">实际支付</span>
<span>{{ dataObj.payAmountTotal }}</span> <span>{{ dataObj.payAmountTotal }}万</span>
</div> </div>
<div class="item"> <div class="item">
<!-- <i class="color1 rect"></i> --> <!-- <i class="color1 rect"></i> -->
<span class="name">年度申请金额</span> <span class="name">年度申请金额</span>
<span>{{ dataObj.applyAmountByYear }}</span> <span>{{ dataObj.applyAmountByYear }}万</span>
</div> </div>
<div class="item"> <div class="item">
<!-- <i class="color2 rect"></i> --> <!-- <i class="color2 rect"></i> -->
<span class="name">年度实际支付</span> <span class="name">年度实际支付</span>
<span>{{ dataObj.payAmountByYear }}</span> <span>{{ dataObj.payAmountByYear }}万</span>
</div> </div>
<div class="item"> <div class="item">
<!-- <i class="color1 rect"></i> --> <!-- <i class="color1 rect"></i> -->
<span class="name">当月申请金额</span> <span class="name">当月申请金额</span>
<span>{{ dataObj.applyAmountByMonth }}</span> <span>{{ dataObj.applyAmountByMonth }}万</span>
</div> </div>
<div class="item"> <div class="item">
<!-- <i class="color2 rect"></i> --> <!-- <i class="color2 rect"></i> -->
<span class="name">当月实际支付</span> <span class="name">当月实际支付</span>
<span>{{ dataObj.payAmountByMonth }}</span> <span>{{ dataObj.payAmountByMonth }}万</span>
</div> </div>
</div> </div>
</div> </div>
@ -68,17 +68,8 @@
</div> </div>
<div class="blockContent"> <div class="blockContent">
<!-- <img src="@/assets/images/hzImg/xm/video.png" alt="" width="100%" height="100%" /> --> <!-- <img src="@/assets/images/hzImg/xm/video.png" alt="" width="100%" height="100%" /> -->
<!-- <video style="width: 100%; height: 100%; object-fit: fill" controls :src="videoData.videoUrl"></video> --> <video style="width: 100%; height: 100%; object-fit: fill" controls :src="videoData.videoUrl"></video>
<div ref="playWndBox" class="main" style="width: 300px; height: 300px"> <!-- <div id="playWnd" class="playWnd"></div> -->
<div
id="playWnd"
class="playWnd"
:style="{
height: playWndHeight + 'px',
width: playWndWidth + 'px'
}"
></div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -173,7 +164,9 @@ import projectInfoDialog from "./components/projectInfoDialog.vue";
import { getInspectInfo } from "@/api/modules/projectLargeSreen"; import { getInspectInfo } from "@/api/modules/projectLargeSreen";
import { screenPayment } from "@/api/modules/huizhou"; import { screenPayment } from "@/api/modules/huizhou";
import { getpreviewURL, getConfigInfo } from "@/api/modules/common"; import { getpreviewURL, getConfigInfo } from "@/api/modules/common";
import { GlobalStore } from "@/stores";
const store = GlobalStore();
//获取项目信息 //获取项目信息
const projectData = ref({ const projectData = ref({
latitude: "", latitude: "",
@ -301,6 +294,12 @@ const getInspect = async () => {
qualityData.value[0].value = res.result.qualityCompleted; qualityData.value[0].value = res.result.qualityCompleted;
qualityData.value[1].value = res.result.qualityUnCompleted; qualityData.value[1].value = res.result.qualityUnCompleted;
}; };
watch(
() => store.editPassword,
val => {
val ? oWebControl.JS_HideWnd() : oWebControl.JS_ShowWnd();
}
);
// 安全质量 --- end // 安全质量 --- end
onBeforeUnmount(() => { onBeforeUnmount(() => {
if (oWebControl.value === undefined) { if (oWebControl.value === undefined) {
@ -316,7 +315,7 @@ onMounted(async () => {
await getInspect(); await getInspect();
await getPayMentData(); await getPayMentData();
// 获取视频插件配置信息 // 获取视频插件配置信息
getVideoConfig(); await getVideoConfig();
// 获取页面的实例对象 ee // 获取页面的实例对象 ee
const pageInstance = getCurrentInstance(); const pageInstance = getCurrentInstance();
// 获取dom节点对象 // 获取dom节点对象
@ -354,6 +353,7 @@ onMounted(async () => {
}); });
}); });
const initPlugin = () => { const initPlugin = () => {
console.log(666);
oWebControl = new WebControl({ oWebControl = new WebControl({
szPluginContainer: "playWnd", // 指定容器id szPluginContainer: "playWnd", // 指定容器id
iServicePortStart: 15900, // 指定起止端口号，建议使用该值 iServicePortStart: 15900, // 指定起止端口号，建议使用该值
@ -388,7 +388,6 @@ const initPlugin = () => {
}, },
// 创建WebControl实例失败 // 创建WebControl实例失败
cbConnectError: function () { cbConnectError: function () {
// 这里写创建WebControl实例失败时的处理步骤,下面的代码仅做参看，具体实现步骤根据个人需求进行编写！！！！！！！！
// console.log(0); // console.log(0);
// oWebControl.value = null; // oWebControl.value = null;
// // 程序未启动时执行error函数，采用wakeup来启动程序 // // 程序未启动时执行error函数，采用wakeup来启动程序
@ -425,11 +424,13 @@ const initPlugin = () => {
oWebControl.value = null; oWebControl.value = null;
} }
}); });
console.log(777);
// oWebControl.JS_CuttingPartWindow(500, 500, 500, 500); // oWebControl.JS_CuttingPartWindow(500, 500, 500, 500);
}; };
// 初始化 // 初始化
const init = (callback: (() => void) | undefined) => { const init = (callback: (() => void) | undefined) => {
console.log(objData.value, "6666666");
getPubKey(() => { getPubKey(() => {
let appkey = objData.value.appkey; //综合安防管理平台提供的appkey，必填 let appkey = objData.value.appkey; //综合安防管理平台提供的appkey，必填
let secret = setEncrypt(objData.value.secret); //综合安防管理平台提供的secret，必填 let secret = setEncrypt(objData.value.secret); //综合安防管理平台提供的secret，必填

16
src/views/hz-project/largeScreen/largeScreenOne/style.scss
View File

@ -39,13 +39,11 @@
border: 1px solid rgb(39 88 192 / 60%); border: 1px solid rgb(39 88 192 / 60%);
border-radius: 0; border-radius: 0;
box-shadow: inset 0 0 2px 2px #051220; box-shadow: inset 0 0 2px 2px #051220;
.main { .playWnd {
width: 300px; margin: 30px 0 0 400px;
height: 300px; width: 1000px; /*播放容器的宽和高设定*/
.playWnd { height: 600px;
width: 300px; border: 1px solid red;
height: 300px;
}
} }
} }
.middle-video { .middle-video {
@ -77,9 +75,9 @@
margin-bottom: 0; margin-bottom: 0;
} }
.name { .name {
width: 80px; width: 90px;
display: inline-flex; display: inline-flex;
margin: 0 30px 0 12px; margin: 0 0 0 12px;
} }
.rect { .rect {
display: inline-block; display: inline-block;

4
src/views/hz-project/localeMonitor/realtimeVideo/index.vue
View File

@ -3,7 +3,7 @@
<div style="display: flex; flex: 1"> <div style="display: flex; flex: 1">
<TreeFilter ref="engTree" label="title" :requestApi="engApi" @change="changeTreeFilter" class="treefilter"> </TreeFilter> <TreeFilter ref="engTree" label="title" :requestApi="engApi" @change="changeTreeFilter" class="treefilter"> </TreeFilter>
<!-- <div class="middle-video"> <div class="middle-video">
<div ref="playWndBox" class="main"> <div ref="playWndBox" class="main">
<div <div
id="playWnd" id="playWnd"
@ -14,7 +14,7 @@
}" }"
></div> ></div>
</div> </div>
</div> --> </div>
</div> </div>
</div> </div>
</template> </template>

2
src/views/hz-project/progressManagement/payManagement/components/transformInfo1.vue
View File

@ -108,7 +108,7 @@ const handleSizeChange = async (size: number) => {
getSubItemList(); getSubItemList();
}; };
const getSubItemList = async () => { const getSubItemList = async () => {
const res = await payList({ investmentPaymentId: props.relativeId }); const res = await payList({ contractId: props.relativeId });
if (res) { if (res) {
console.log(res, "------------666"); console.log(res, "------------666");
recordData.value = res.result.records; recordData.value = res.result.records;

5
src/views/hz-project/projectMonitor/progressManagement/index.vue
View File

@ -18,6 +18,9 @@
<span>查看</span> <span>查看</span>
</el-button> </el-button>
</template> </template>
<template #slippage="{ row }">
<span :style="{ color: row.slippage ? 'red' : 'var(--el-menu-text-color)' }">{{ row.slippage }}</span>
</template>
</ProTable> </ProTable>
</div> </div>
</template> </template>
@ -59,7 +62,7 @@ const columns: ColumnProps[] = [
{ prop: "planStartTime", label: "开始日期" }, { prop: "planStartTime", label: "开始日期" },
{ prop: "planEndTime", label: "结束日期" }, { prop: "planEndTime", label: "结束日期" },
{ prop: "completeRatio", label: "完成百分比(%)" }, { prop: "completeRatio", label: "完成百分比(%)" },
{ prop: "slippage", label: "逾期情况" }, { prop: "slippage", label: "逾期情况(天)" },
// { // {
// prop: "state", // prop: "state",
// label: "状态", // label: "状态",

4
src/views/hz-project/projectMonitor/qualityManagement/index.vue
View File

@ -34,6 +34,9 @@
: "" : ""
}}</span> }}</span>
</template> </template>
<template #slippage="{ row }">
<span :style="{ color: row.slippage ? 'red' : 'var(--el-menu-text-color)' }">{{ row.slippage ? row.slippage : "" }}</span>
</template>
</ProTable> </ProTable>
<!-- </div> --> <!-- </div> -->
<transformInfo v-model:detailsDialog="detailsDialog" :relativeId="relativeId" @confirm="confirmReform"></transformInfo> <transformInfo v-model:detailsDialog="detailsDialog" :relativeId="relativeId" @confirm="confirmReform"></transformInfo>
@ -88,6 +91,7 @@ const columns: ColumnProps[] = [
prop: "state", prop: "state",
label: "状态" label: "状态"
}, },
{ prop: "slippage", label: "逾期情况(天)" },
{ prop: "operation", label: "操作", fixed: "right", width: 100 } { prop: "operation", label: "操作", fixed: "right", width: 100 }
]; ];
const detailsDialog = ref(false); const detailsDialog = ref(false);

4
src/views/hz-project/projectMonitor/safetyManagement/index.vue
View File

@ -34,6 +34,9 @@
: "" : ""
}}</span> }}</span>
</template> </template>
<template #slippage="{ row }">
<span :style="{ color: row.slippage ? 'red' : 'var(--el-menu-text-color)' }">{{ row.slippage ? row.slippage : "" }}</span>
</template>
</ProTable> </ProTable>
<!-- </div> --> <!-- </div> -->
<transformInfo v-model:detailsDialog="detailsDialog" :relativeId="relativeId" @confirm="confirmReform"></transformInfo> <transformInfo v-model:detailsDialog="detailsDialog" :relativeId="relativeId" @confirm="confirmReform"></transformInfo>
@ -86,6 +89,7 @@ const columns: ColumnProps[] = [
prop: "state", prop: "state",
label: "状态" label: "状态"
}, },
{ prop: "slippage", label: "逾期情况(天)" },
{ prop: "operation", label: "操作", fixed: "right", width: 100 } { prop: "operation", label: "操作", fixed: "right", width: 100 }
]; ];
const detailsDialog = ref(false); const detailsDialog = ref(false);