diff --git a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue
index 2e9a317..af36b7a 100644
--- a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue
+++ b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue
@@ -84,15 +84,15 @@
总投资预算
-
{{ dataObj.totalAmount }}
+
{{ dataObj.totalAmount }}万元
实际投资预算
-
{{ dataObj.settlementAmount }}
+
{{ dataObj.settlementAmount }}万元
年度投资预算
-
{{ dataObj.settlementAmountByYear }}
+
{{ dataObj.settlementAmountByYear }}万元
@@ -106,19 +106,19 @@
请款报审
-
{{ dataObj.paymentTotal }}
+
{{ dataObj.paymentTotal }}万元
审定应付
-
{{ dataObj.applyAmountTotal }}
+
{{ dataObj.applyAmountTotal }}万元
实际支付
-
{{ dataObj.realPayAmountTotal }}
+
{{ dataObj.realPayAmountTotal }}万元
年度实际支付
-
{{ dataObj.realPayAmountByYear }}
+
{{ dataObj.realPayAmountByYear }}万元
diff --git a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
index 032f3b3..6a415c7 100644
--- a/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/progressManagement/index.vue
@@ -46,6 +46,11 @@
新增
+
+ {{
+ row.slippage ? row.slippage : ""
+ }}
+
@@ -125,7 +130,7 @@ const columns: ColumnProps[] = [
{ prop: "planEndTime", label: "结束日期" },
{ prop: "unit", label: "申请单位" },
{ prop: "completeRatio", label: "完成百分比(%)" },
- { prop: "slippage", label: "逾期情况" },
+ { prop: "slippage", label: "逾期情况(天)" },
{
prop: "payTime",
label: "时间筛选",
diff --git a/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue b/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue
index 3e5dbfe..118b054 100644
--- a/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/qualityControl/index.vue
@@ -67,6 +67,11 @@
: ""
}}
+
+ {{
+ row.slippage ? row.slippage : ""
+ }}
+
@@ -166,6 +171,7 @@ const columns: ColumnProps[] = [
prop: "state",
label: "状态"
},
+ { prop: "slippage", label: "逾期情况(天)" },
{ prop: "operation", label: "操作", fixed: "right", width: 100 }
];
const pageable = ref({
diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue
index 88bc4db..74e9b0c 100644
--- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.vue
@@ -68,6 +68,11 @@
: ""
}}
+
+ {{
+ row.slippage ? row.slippage : ""
+ }}
+
@@ -135,6 +140,7 @@ const columns: ColumnProps[] = [
prop: "state",
label: "状态"
},
+ { prop: "slippage", label: "逾期情况(天)" },
{ prop: "operation", label: "操作", fixed: "right", width: 100 }
];
const pageable = ref({
diff --git a/src/views/hz-project/largeScreen/largeScreenOne/index.vue b/src/views/hz-project/largeScreen/largeScreenOne/index.vue
index 660590a..33e9118 100644
--- a/src/views/hz-project/largeScreen/largeScreenOne/index.vue
+++ b/src/views/hz-project/largeScreen/largeScreenOne/index.vue
@@ -32,32 +32,32 @@
申请金额
- {{ dataObj.applyAmountTotal }}
+ {{ dataObj.applyAmountTotal }}万
实际支付
- {{ dataObj.payAmountTotal }}
+ {{ dataObj.payAmountTotal }}万
年度申请金额
- {{ dataObj.applyAmountByYear }}
+ {{ dataObj.applyAmountByYear }}万
年度实际支付
- {{ dataObj.payAmountByYear }}
+ {{ dataObj.payAmountByYear }}万
当月申请金额
- {{ dataObj.applyAmountByMonth }}
+ {{ dataObj.applyAmountByMonth }}万
当月实际支付
- {{ dataObj.payAmountByMonth }}
+ {{ dataObj.payAmountByMonth }}万
@@ -68,17 +68,8 @@
@@ -173,7 +164,9 @@ import projectInfoDialog from "./components/projectInfoDialog.vue";
import { getInspectInfo } from "@/api/modules/projectLargeSreen";
import { screenPayment } from "@/api/modules/huizhou";
import { getpreviewURL, getConfigInfo } from "@/api/modules/common";
+import { GlobalStore } from "@/stores";
+const store = GlobalStore();
//获取项目信息
const projectData = ref({
latitude: "",
@@ -301,6 +294,12 @@ const getInspect = async () => {
qualityData.value[0].value = res.result.qualityCompleted;
qualityData.value[1].value = res.result.qualityUnCompleted;
};
+watch(
+ () => store.editPassword,
+ val => {
+ val ? oWebControl.JS_HideWnd() : oWebControl.JS_ShowWnd();
+ }
+);
// 安全质量 --- end
onBeforeUnmount(() => {
if (oWebControl.value === undefined) {
@@ -316,7 +315,7 @@ onMounted(async () => {
await getInspect();
await getPayMentData();
// 获取视频插件配置信息
- getVideoConfig();
+ await getVideoConfig();
// 获取页面的实例对象 ee
const pageInstance = getCurrentInstance();
// 获取dom节点对象
@@ -354,6 +353,7 @@ onMounted(async () => {
});
});
const initPlugin = () => {
+ console.log(666);
oWebControl = new WebControl({
szPluginContainer: "playWnd", // 指定容器id
iServicePortStart: 15900, // 指定起止端口号,建议使用该值
@@ -388,7 +388,6 @@ const initPlugin = () => {
},
// 创建WebControl实例失败
cbConnectError: function () {
- // 这里写创建WebControl实例失败时的处理步骤,下面的代码仅做参看,具体实现步骤根据个人需求进行编写!!!!!!!!
// console.log(0);
// oWebControl.value = null;
// // 程序未启动时执行error函数,采用wakeup来启动程序
@@ -425,11 +424,13 @@ const initPlugin = () => {
oWebControl.value = null;
}
});
+ console.log(777);
// oWebControl.JS_CuttingPartWindow(500, 500, 500, 500);
};
// 初始化
const init = (callback: (() => void) | undefined) => {
+ console.log(objData.value, "6666666");
getPubKey(() => {
let appkey = objData.value.appkey; //综合安防管理平台提供的appkey,必填
let secret = setEncrypt(objData.value.secret); //综合安防管理平台提供的secret,必填
diff --git a/src/views/hz-project/largeScreen/largeScreenOne/style.scss b/src/views/hz-project/largeScreen/largeScreenOne/style.scss
index a00e791..a26d11d 100644
--- a/src/views/hz-project/largeScreen/largeScreenOne/style.scss
+++ b/src/views/hz-project/largeScreen/largeScreenOne/style.scss
@@ -39,13 +39,11 @@
border: 1px solid rgb(39 88 192 / 60%);
border-radius: 0;
box-shadow: inset 0 0 2px 2px #051220;
- .main {
- width: 300px;
- height: 300px;
- .playWnd {
- width: 300px;
- height: 300px;
- }
+ .playWnd {
+ margin: 30px 0 0 400px;
+ width: 1000px; /*播放容器的宽和高设定*/
+ height: 600px;
+ border: 1px solid red;
}
}
.middle-video {
@@ -77,9 +75,9 @@
margin-bottom: 0;
}
.name {
- width: 80px;
+ width: 90px;
display: inline-flex;
- margin: 0 30px 0 12px;
+ margin: 0 0 0 12px;
}
.rect {
display: inline-block;
diff --git a/src/views/hz-project/localeMonitor/realtimeVideo/index.vue b/src/views/hz-project/localeMonitor/realtimeVideo/index.vue
index 9ebb983..7005dff 100644
--- a/src/views/hz-project/localeMonitor/realtimeVideo/index.vue
+++ b/src/views/hz-project/localeMonitor/realtimeVideo/index.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/src/views/hz-project/progressManagement/payManagement/components/transformInfo1.vue b/src/views/hz-project/progressManagement/payManagement/components/transformInfo1.vue
index e562d50..c9938dc 100644
--- a/src/views/hz-project/progressManagement/payManagement/components/transformInfo1.vue
+++ b/src/views/hz-project/progressManagement/payManagement/components/transformInfo1.vue
@@ -108,7 +108,7 @@ const handleSizeChange = async (size: number) => {
getSubItemList();
};
const getSubItemList = async () => {
- const res = await payList({ investmentPaymentId: props.relativeId });
+ const res = await payList({ contractId: props.relativeId });
if (res) {
console.log(res, "------------666");
recordData.value = res.result.records;
diff --git a/src/views/hz-project/projectMonitor/progressManagement/index.vue b/src/views/hz-project/projectMonitor/progressManagement/index.vue
index 05a46bc..7b0158f 100644
--- a/src/views/hz-project/projectMonitor/progressManagement/index.vue
+++ b/src/views/hz-project/projectMonitor/progressManagement/index.vue
@@ -18,6 +18,9 @@
查看
+
+ {{ row.slippage }}
+
@@ -59,7 +62,7 @@ const columns: ColumnProps[] = [
{ prop: "planStartTime", label: "开始日期" },
{ prop: "planEndTime", label: "结束日期" },
{ prop: "completeRatio", label: "完成百分比(%)" },
- { prop: "slippage", label: "逾期情况" },
+ { prop: "slippage", label: "逾期情况(天)" },
// {
// prop: "state",
// label: "状态",
diff --git a/src/views/hz-project/projectMonitor/qualityManagement/index.vue b/src/views/hz-project/projectMonitor/qualityManagement/index.vue
index 1ce7f86..0ec992d 100644
--- a/src/views/hz-project/projectMonitor/qualityManagement/index.vue
+++ b/src/views/hz-project/projectMonitor/qualityManagement/index.vue
@@ -34,6 +34,9 @@
: ""
}}
+
+ {{ row.slippage ? row.slippage : "" }}
+
@@ -88,6 +91,7 @@ const columns: ColumnProps[] = [
prop: "state",
label: "状态"
},
+ { prop: "slippage", label: "逾期情况(天)" },
{ prop: "operation", label: "操作", fixed: "right", width: 100 }
];
const detailsDialog = ref(false);
diff --git a/src/views/hz-project/projectMonitor/safetyManagement/index.vue b/src/views/hz-project/projectMonitor/safetyManagement/index.vue
index c7a384f..73ceb34 100644
--- a/src/views/hz-project/projectMonitor/safetyManagement/index.vue
+++ b/src/views/hz-project/projectMonitor/safetyManagement/index.vue
@@ -34,6 +34,9 @@
: ""
}}
+
+ {{ row.slippage ? row.slippage : "" }}
+
@@ -86,6 +89,7 @@ const columns: ColumnProps[] = [
prop: "state",
label: "状态"
},
+ { prop: "slippage", label: "逾期情况(天)" },
{ prop: "operation", label: "操作", fixed: "right", width: 100 }
];
const detailsDialog = ref(false);