diff --git a/public/ly.glb b/public/ly.glb new file mode 100644 index 00000000..a495eb0d Binary files /dev/null and b/public/ly.glb differ diff --git a/src/components/scScrollTable.vue b/src/components/scScrollTable.vue index 814c6840..31a31331 100644 --- a/src/components/scScrollTable.vue +++ b/src/components/scScrollTable.vue @@ -1,251 +1,324 @@ \ No newline at end of file +.scrollTableBody { + /* overflow: scroll; + overflow-x: scroll; */ + overflow-y: scroll; +} +.scrollTableBody::-webkit-scrollbar { + width: 1px; +} +/* +.scrollTableBody::-webkit-scrollbar-thumb { + background: linear-gradient(to bottom right, #4d7fff 0%, #1a56ff 100%); + border-radius: 5px; +} + +.scrollTableBody::-webkit-scrollbar-track { + background-color: #ddd; + border: 1px solid #ccc; +} + +.scrollTableBody::-webkit-scrollbar-button { + background-color: #4d7fff; + border-radius: 5px; +} */ + +/* .scrollTableBody::-webkit-scrollbar-button:hover { + background-color: #999999; +} */ + diff --git a/src/views/bigScreen/cesiumtest.vue b/src/views/bigScreen/cesiumtest.vue index 3c2ea4b8..1e291ccd 100644 --- a/src/views/bigScreen/cesiumtest.vue +++ b/src/views/bigScreen/cesiumtest.vue @@ -438,15 +438,17 @@ export default { }); this.viewer = viewer; // 关闭时间对模型明暗的影响 -// viewer.scene.light = new Cesium.DirectionalLight({ -// direction: new Cesium.Cartesian3(0.354925, -0.890918, -0.283358) -// }) + // viewer.scene.light = new Cesium.DirectionalLight({ + // direction: new Cesium.Cartesian3(0.354925, -0.890918, -0.283358) + // }) viewer.scene.light = new Cesium.SunLight(); viewer.scene.globe.enableLighting = true; viewer.shadows = false; //时间轴暂停,并将时间设置在某个固定时刻 - viewer.clock.shouldAnimate = false;//时间轴动画停止 - viewer.clock.currentTime = Cesium.JulianDate.fromIso8601("2023-09-01T06:00:00Z");//这个UTC时间对应的北京时间是14时 + viewer.clock.shouldAnimate = false; //时间轴动画停止 + viewer.clock.currentTime = Cesium.JulianDate.fromIso8601( + "2023-09-01T06:00:00Z" + ); //这个UTC时间对应的北京时间是14时 if (Cesium.FeatureDetection.supportsImageRenderingPixelated()) { //判断是否支持图像渲染像素化处理 @@ -578,7 +580,7 @@ export default { getChartTime() { let endDate = new Date(); endDate.setTime(endDate.getTime() - 1000 * 60); - endDate.setSeconds(0); + endDate.setSeconds(0); let startDate = new Date(); startDate.setTime(endDate.getTime() - 1000 * 3600 * 6); startDate.setSeconds(0); @@ -1089,11 +1091,11 @@ export default { .bottomMenu_item > .el-checkbox__input.is-checked > .el-checkbox__inner { width: 20px; height: 20px; - background-color: #1ca50a; - border-color: #1ca50a; + background-color: #faed1f; + border-color: #faed1f; } .bottomMenu_item > .el-checkbox__input.is-checked + .el-checkbox__label { - color: #1ca50a; + color: #faed1f; } .bottomMenu_item > .el-checkbox__input.is-checked .el-checkbox__inner::after { height: 11px; diff --git a/src/views/bigScreen/cesiumtest_ly.vue b/src/views/bigScreen/cesiumtest_ly.vue new file mode 100644 index 00000000..00b66d2c --- /dev/null +++ b/src/views/bigScreen/cesiumtest_ly.vue @@ -0,0 +1,1137 @@ + + + diff --git a/src/views/bigScreen/index_enp_blue.vue b/src/views/bigScreen/index_enp_blue.vue index 50d0911f..35ac2d91 100644 --- a/src/views/bigScreen/index_enp_blue.vue +++ b/src/views/bigScreen/index_enp_blue.vue @@ -657,17 +657,17 @@ export default { { value: 2, name: "新能源" }, { value: 6, name: "其他" }, ], - containerHeight: 100, + containerHeight: null, refValue1: "moocBox1", - table1Visible: true, + table1Visible: false, lineData: [], liData1: ["设备名称", "颗粒物", "SO₂", "NOx"], refValue2: "moocBox2", - table2Visible: true, + table2Visible: false, lineData2: [], liData2: ["设备名称", "TSP测量值"], refValue3: "moocBox3", - table3Visible: true, + table3Visible: false, lineData3: [], liData3: ["设备名称", "PM10", "PM2.5"], noIndex: true, @@ -691,15 +691,15 @@ export default { mounted() { let that = this; that.initDomStyle(); - that.getleft1Data(); - that.getleft2Data(); - that.getleft3Data(); - that.getright1Data(); - that.getright2Data(); - that.getright3Data(); - that.initCharts(); - that.addListener(); that.$nextTick(() => { + that.getleft1Data(); + that.getleft2Data(); + that.getleft3Data(); + that.getright1Data(); + that.getright2Data(); + that.getright3Data(); + that.initCharts(); + that.addListener(); setTimeout(function () {}, 5000); }); // that.intervalinfo = setInterval(() => { @@ -936,13 +936,14 @@ export default { } } let containerHeight = - document.getElementsByClassName("panel1")[0].clientHeight; - debugger; - // console.log('containerHeight', containerHeight); + document.getElementsByClassName("panel1")[0].clientHeight - 70; that.containerHeight = containerHeight; if (this.engine != null) { this.engine.resize(); } + this.table1Visible = true; + this.table2Visible = true; + this.table3Visible = true; }, // bindBtnClass(index) { // let classInfo = { btns: true, btnsActive: false }; @@ -1114,7 +1115,7 @@ header { width: 100%; text-align: center; line-height: 6.3vh; - font-weight: bold; + font-weight: bold; color: #ffffff; position: absolute; top: 0; diff --git a/src/views/enm_limestone/handoverLog.vue b/src/views/enm_limestone/handoverLog.vue index 1cc0d7b7..a0ffc9a8 100644 --- a/src/views/enm_limestone/handoverLog.vue +++ b/src/views/enm_limestone/handoverLog.vue @@ -255,12 +255,17 @@ export default { options: [], optionsShift: [], teamOptions: [], + exportLoading: false, limitedExport: false, reportItem: {}, sflogexpList: [], + timeStamp: null, }; }, mounted() { + let that = this; + var nowDate = new Date(); + that.timeStamp = nowDate.getTime(); this.$API.mtm.mgroup.list .req({ page: 0, search: "石灰石破碎" }) .then((res) => { @@ -289,6 +294,8 @@ export default { this.$refs.table.queryData(this.query); }, sflog_export() { + let nowDate = new Date(); + this.timeStamp = nowDate.getTime(); this.limitedExport = true; }, rowClick(row) {