diff --git a/css/index/index.css b/css/index/index.css
index a465baa..8280a4e 100644
--- a/css/index/index.css
+++ b/css/index/index.css
@@ -179,4 +179,16 @@ body {
height: 28.2%;
background: url("../../img/index/pro_cost.png") no-repeat 0 0 / 100% 100%;
background-position: center center !important;
+}
+
+img {
+ image-rendering: -moz-crisp-edges;
+ /* Firefox */
+ image-rendering: -o-crisp-edges;
+ /* Opera */
+ image-rendering: -webkit-optimize-contrast;
+ /*Webkit (non-standard naming) */
+ image-rendering: crisp-edges;
+ -ms-interpolation-mode: nearest-neighbor;
+ /* IE (non-standard property) */
}
\ No newline at end of file
diff --git a/js/pages/index/indexAjax.js b/js/pages/index/indexAjax.js
index 42e0a53..b72eebd 100644
--- a/js/pages/index/indexAjax.js
+++ b/js/pages/index/indexAjax.js
@@ -137,11 +137,11 @@ function loadProCost(montageParam) {
const url = commonUrl + 'screen/largeScreen/xcIndex/getProMoney?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);
}
@@ -149,8 +149,12 @@ function loadProCost(montageParam) {
error(xhr, status, error)
}, aqEnnable);
function setData(data) {
- let nameList = ['黄家村', '曹家村', '吕家村', '大草坝村', '庙坡村', '廉家庄村', '莲花池村', '小西关村', '杜家漕村', '栗子园村', '翟家寺村'];
- let valueList = ['2', '3', '1', '1', '2', '2', '2', '6', '5', '3', '2'];
- initEchartsThree(nameList,valueList);
+ if (data) {
+ let nameList = data.time && data.time.length > 0 ? data.time : [];
+ let valueList = data.cost && data.cost.length > 0 ? data.cost : [];
+ initEchartsThree(nameList, valueList,parseFloat(data.proCost.replace('万','')));
+ }else{
+ initEchartsThree([], [],0);
+ }
}
}
\ No newline at end of file
diff --git a/js/pages/index/indexEcharts.js b/js/pages/index/indexEcharts.js
index 849737e..7a579d5 100644
--- a/js/pages/index/indexEcharts.js
+++ b/js/pages/index/indexEcharts.js
@@ -434,7 +434,7 @@ function initEchartsTwo(value2, value) {
}
/* 项目成本 */
-function initEchartsThree(nameListData,valueListData) {
+function initEchartsThree(nameListData,valueListData,proCost) {
let nameList = nameListData;
let valueList = valueListData;
let fontSize = '14', fontFamily = 'Alibaba PuHuiTi R', fontColor = '#fff';
@@ -553,7 +553,7 @@ function initEchartsThree(nameListData,valueListData) {
data: [{
silent: true,
name: "阈值",
- yAxis: 5,//res.targetTwo,
+ yAxis: proCost,//res.targetTwo,
lineStyle: {
color: "#FF8845FF"
},
diff --git a/js/pages/video/video.js b/js/pages/video/video.js
index 40027ad..dd29df2 100644
--- a/js/pages/video/video.js
+++ b/js/pages/video/video.js
@@ -10,4 +10,6 @@ layui.use(['layer', 'form'], function () {
setTimeout(() => {
QXPlayVideo('201115200124261007', '0', winDom)
}, 2000);
+
+ loadVideoTree();
});
diff --git a/js/pages/video/videoAjax.js b/js/pages/video/videoAjax.js
new file mode 100644
index 0000000..5aae72b
--- /dev/null
+++ b/js/pages/video/videoAjax.js
@@ -0,0 +1,21 @@
+/* 球机树 */
+function loadVideoTree() {
+ const bidCode = parent.$('#bidPro').val();
+ const paramData = 'bidCode=' + bidCode + '&roleCode=' + roleCode + '&orgId=' + orgId + '&userId=' + userId;
+ let montageParam = aqEnnable ? encryptCBC(paramData) : ' &' + encryptCBC(paramData);
+ const url = commonUrl + 'screen/largeScreen/video/getVideoTree?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);
+ } else if (result.code === 401) {
+ loginout(1);
+ }
+ }, function (xhr, status, error) {
+ error(xhr, status, error)
+ }, aqEnnable);
+
+}
\ No newline at end of file
diff --git a/pages/video/video.html b/pages/video/video.html
index d6d3520..ec7f8a0 100644
--- a/pages/video/video.html
+++ b/pages/video/video.html
@@ -171,6 +171,7 @@
+