diff --git a/css/index/index.css b/css/index/index.css
index 1c9395e..5c6d0d4 100644
--- a/css/index/index.css
+++ b/css/index/index.css
@@ -136,7 +136,8 @@ body {
background-position: center center !important;
background-size: initial;
}
-#logo{
+
+#logo {
background: url("../../img/index/pm10.png") no-repeat 0 0 / 100% 100%;
background-position: center center !important;
background-size: initial;
@@ -154,8 +155,44 @@ body {
height: 14.2%;
background: url("../../img/index/pro_progress.png") no-repeat 0 0 / 100% 100%;
background-position: center center !important;
+ justify-content: space-evenly;
}
+#bidProgressBox {
+ width: 254px;
+ height: 58px;
+ background: url("../../img/index/bid_progress.png") no-repeat 0 0 / 100% 100%;
+ background-position: center center !important;
+ margin-top: 2%;
+ flex-direction: column;
+ letter-spacing: 1px;
+}
+#bidProgressBox p:nth-child(2),
+#signProgressBox p:nth-child(2),
+#proProgressBox p:nth-child(2){
+ font-size: 20px;
+}
+#signProgressBox {
+ width: 254px;
+ height: 58px;
+ background: url("../../img/index/sign_progress.png") no-repeat 0 0 / 100% 100%;
+ background-position: center center !important;
+ margin-top: 2%;
+ flex-direction: column;
+ letter-spacing: 1px;
+}
+
+#proProgressBox {
+ width: 254px;
+ height: 58px;
+ background: url("../../img/index/pro_progress2.png") no-repeat 0 0 / 100% 100%;
+ background-position: center center !important;
+ margin-top: 2%;
+ flex-direction: column;
+ letter-spacing: 1px;
+}
+
+
#pro-start,
#pro-end {
width: 15%;
diff --git a/img/index/bid_progress.png b/img/index/bid_progress.png
new file mode 100644
index 0000000..98e1d9f
Binary files /dev/null and b/img/index/bid_progress.png differ
diff --git a/img/index/pro_progress2.png b/img/index/pro_progress2.png
new file mode 100644
index 0000000..d20eacc
Binary files /dev/null and b/img/index/pro_progress2.png differ
diff --git a/img/index/sign_progress.png b/img/index/sign_progress.png
new file mode 100644
index 0000000..3d82c8b
Binary files /dev/null and b/img/index/sign_progress.png differ
diff --git a/js/pages/index/index.js b/js/pages/index/index.js
index 14a98ad..0465449 100644
--- a/js/pages/index/index.js
+++ b/js/pages/index/index.js
@@ -18,7 +18,8 @@ function loadData() {
loadRealMonitor(montageParam);
loadProRisk(montageParam);
loadProCost(montageParam);
- loadProProgress(montageParam);
+ // loadProProgress(montageParam);
+ loadProSchedule(montageParam);
}
diff --git a/js/pages/index/indexAjax.js b/js/pages/index/indexAjax.js
index 568a146..193b3fb 100644
--- a/js/pages/index/indexAjax.js
+++ b/js/pages/index/indexAjax.js
@@ -163,4 +163,32 @@ function loadProCost(montageParam) {
initEchartsThree([], [],0);
}
}
+}
+
+/* 项目进度 */
+function loadProSchedule(montageParam) {
+ const url = commonUrl + 'screen/largeScreen/xcIndex/getProSchedule?params=' + montageParam;
+ ajaxRequestGet(url, "GET", true, function () {
+ }, function (result) {
+ console.log(result);
+ if (result.code === 200) {
+ setData(result.data);
+ } else if (result.code === 500) {
+ console.error('项目进度:' + result.msg);
+ setData(null);
+ } else if (result.code === 401) {
+ loginout(1);
+ }
+ }, function (xhr, status, error) {
+ errorFn(xhr, status, error)
+ }, aqEnnable);
+ function setData(data) {
+ if (data) {
+ $('#planStartTime').html(data.planStartTime);
+ $('#palnTcTime').html(data.palnTcTime);
+ $('#bidProgress').html(data.bidProgress);
+ $('#signProgress').html(data.signProgress);
+ $('#proProgress').html(data.proProgress);
+ }
+ }
}
\ No newline at end of file
diff --git a/js/pages/index/indexEcharts.js b/js/pages/index/indexEcharts.js
index 40d76cb..a74c9eb 100644
--- a/js/pages/index/indexEcharts.js
+++ b/js/pages/index/indexEcharts.js
@@ -1,5 +1,5 @@
let myChart = echarts.init(document.getElementById('pro-risk'));
-let myChart2 = echarts.init(document.getElementById('pro-progress-echarts'));
+// let myChart2 = echarts.init(document.getElementById('pro-progress-echarts'));
let myChart3 = echarts.init(document.getElementById('pro-cost'));
/* 项目风险 */
diff --git a/js/pages/video/video.js b/js/pages/video/video.js
index 5adcdd3..15acbe6 100644
--- a/js/pages/video/video.js
+++ b/js/pages/video/video.js
@@ -27,11 +27,11 @@ layui.config({
puid = puid.substring(0, puid.length - 2);
if (puid) {
parent.layer.msg("视频加载中,请稍候...", { icon: 16, scrollbar: false, time: 1000, });
- // QXPlayVideo(puid, '0', winDom)
- // playControl();
- let randomNum = Math.floor(Math.random() * 2) + 1;
- console.log(randomNum);
- $('#videoPlayer1').attr('src','../../../video/'+randomNum+'.mp4')
+ QXPlayVideo(puid, '0', winDom)
+ playControl();
+ // let randomNum = Math.floor(Math.random() * 2) + 1;
+ // console.log(randomNum);
+ // $('#videoPlayer1').attr('src','../../../video/'+randomNum+'.mp4')
videoObject.devCode = puid;
} else {
return parent.layer.msg('请选择球机', { icon: 7 });
diff --git a/pages/index/index.html b/pages/index/index.html
index 6558ebb..baef286 100644
--- a/pages/index/index.html
+++ b/pages/index/index.html
@@ -67,7 +67,37 @@