diff --git a/src/components/scOpl/scFire.vue b/src/components/scOpl/scFire.vue index 932dbc4a..5715f5c0 100644 --- a/src/components/scOpl/scFire.vue +++ b/src/components/scOpl/scFire.vue @@ -121,6 +121,16 @@ fit="cover" /> + + + diff --git a/src/views/bigScreen/enpComponents/cems.vue b/src/views/bigScreen/enpComponents/cems.vue index bd36168b..0621347b 100644 --- a/src/views/bigScreen/enpComponents/cems.vue +++ b/src/views/bigScreen/enpComponents/cems.vue @@ -21,25 +21,30 @@ runningStateEnum[scope.row.running_state]?.text }} - - - {{ scope.row.envdata.dust_rtd ? scope.row.envdata.dust_rtd : '-' }} - - - + + {{ scope.row.envdata.so2_zs ? scope.row.envdata.so2_zs : '-' }} - + + 23% + + {{ scope.row.envdata.nox_zs ? scope.row.envdata.nox_zs : '-' }} - + + 36% + + {{ scope.row.envdata.dust_zs ? scope.row.envdata.dust_zs : '-' }} + + + 45% @@ -182,13 +187,13 @@ export default { } }, mounted() { - if (this.directDetail) { + if (this.directDetail) { this.currentEquipmentId = this.eqId; this.currentEquipmentName = this.eqId; this.query.equipment_id = this.eqId; this.$nextTick(() => { this.handleQuery() }) } - + @@ -266,4 +271,4 @@ export default { }, } - \ No newline at end of file + diff --git a/src/views/bigScreen/enpComponents/smartg_carwash.vue b/src/views/bigScreen/enpComponents/smartg_carwash.vue index ab9cc3ba..229608e9 100644 --- a/src/views/bigScreen/enpComponents/smartg_carwash.vue +++ b/src/views/bigScreen/enpComponents/smartg_carwash.vue @@ -12,9 +12,14 @@ - 洗车行为统计 + 洗车行为统计 + + + @@ -87,4 +92,4 @@ export default { }, } } - \ No newline at end of file + diff --git a/src/views/bigScreen/enpComponents/transport.vue b/src/views/bigScreen/enpComponents/transport.vue index e86f753d..43e64cb7 100644 --- a/src/views/bigScreen/enpComponents/transport.vue +++ b/src/views/bigScreen/enpComponents/transport.vue @@ -27,7 +27,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,8 +53,11 @@ - - + + {{ ysdata.crkbh }} {{ ysdata.dzbh }} {{ ysdata.tgfs }} @@ -76,11 +79,27 @@ {{ ysdata.cchwmc }} {{ ysdata.cchwl }} {{ ysdata.cdmc }} - {{ ysdata.jczp }} - {{ ysdata.sdqd }} - {{ ysdata.xsz }} - {{ ysdata.sdtgzp }} + + + + + + + + + + + + + + + + + + + + {{ ysdata.sdqd }} + + 退出 + @@ -363,17 +366,7 @@ - - - {{item.name}} - {{ item.value }} - - + + @@ -616,20 +618,23 @@ export default { show: false, }, data: [ - { value: 2, name: "新能源" }, - { value: 6, name: "其他" }, + { value: 2, name: "国五" }, + { value: 6, name: "国六" }, + { value: 6, name: "清洁运输" }, ], }, }, pieData: [ - { value: 2, name: "新能源" }, - { value: 6, name: "其他" }, + { value: 2, name: "国五" }, + { value: 6, name: "国六" }, + { value: 8, name: "清洁运输" }, + ], containerHeight: null, refValue1: "moocBox1", table1Visible: false, lineData: [], - liData1: ["设备名称", "颗粒物", "SO₂", "NOx" , "氨气"], + liData1: ["设备名称", "颗粒物", "SO₂", "NOx" , "氨"], refValue2: "moocBox2", table2Visible: false, lineData2: [], @@ -638,6 +643,10 @@ export default { table3Visible: false, lineData3: [], liData3: ["设备名称", "PM10", "PM2.5"], + table4Visible: false, + lineData4: [], + refValue4: "moocBox1", + liData4: ["车辆类型", "运行时间","运行里程"], noIndex: true, eqNumData: { sc: 0, @@ -681,6 +690,7 @@ export default { that.addListener(); setTimeout(function () {}, 5000); }); + // that.intervalinfo = setInterval(() => { // that.getleft1Data(); // // that.getleft2Data(); @@ -802,6 +812,7 @@ export default { lineData.push(arr); }); this.lineData2 = lineData; + //console.log(this.lineData2) }); }, //空气微站实时监测---(小微站) @@ -835,18 +846,48 @@ export default { lineData.push(arr); }); this.lineData3 = lineData; + }); }, //今日车辆统计数据 getright2Data() {}, //环卫车作业情况 - getright3Data() {}, + getright3Data() { + + + let lineData = []; + + let arr = [], + obj1 = {}, + obj2 = {}, + obj3 = {}; + obj1.elType = "primary"; + obj1.value = "洒水车"; //设备名称 + obj2.elType = "primary"; + obj2.value ="2024-08-22"; //PM10 + obj3.elType = "primary"; + obj3.value ="23"; //PM2.5 + arr.push(obj1); + arr.push(obj2); + arr.push(obj3); + lineData.push(arr); + + this.lineData4 = lineData; + + + + }, configDark() { this.config.dark = this.config.dark ? false : true; }, backSystem() { this.$router.push({ path: "/dashboard_enp" }); }, + //退出登录 + backlogin(){ + this.$router.push({ path: "/login" }); + + }, closeDialog() { this.elDrawer = false; this.activeIndex = 0; @@ -930,6 +971,7 @@ export default { this.table1Visible = true; this.table2Visible = true; this.table3Visible = true; + this.table4Visible = true; }, // bindBtnClass(index) { // let classInfo = { btns: true, btnsActive: false }; @@ -1178,11 +1220,20 @@ header { background-size: cover; background-image: url("/public/img/enp_blue/user_enp.png"); } +.quit{ + width: 3.5vh; + height: 2.3vh; + margin-top: 1.2vh; + margin-left: 2vh; + background-size: cover; + cursor: pointer; +} .dark_config { width: 2.3vh; height: 2.3vh; margin-top: 0.9vh; margin-left: 2vh; + background-size: cover; } .model { @@ -1441,15 +1492,14 @@ header { /* 车辆统计-start */ .carStaticWrap{ flex-shrink: 1; - width: 150px; + width: 23vh; align-self: center; display: flex; flex-direction: column; } .todyCarItem { - width:75px; + width:22vh; color: white; - font-size: 16px; display: flex; flex-direction: column; } @@ -1458,7 +1508,7 @@ header { text-align: center; } .carStaticNum{ - font-size: 35px; + font-size: 25px; color: #00f6ff; font-weight: bold; display: inline-block; diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue index 81bcb0d4..7db5fb74 100644 --- a/src/views/login/components/passwordForm.vue +++ b/src/views/login/components/passwordForm.vue @@ -133,10 +133,12 @@ export default { that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms)); let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard; - if (this.redirect) { - base_dashboard = this.redirect; - } - else if (base_dashboard == null || base_dashboard == undefined) { + // 去除重定向因客户不理解 + // if (this.redirect) { + // base_dashboard = this.redirect; + // } + // else + if (base_dashboard == null || base_dashboard == undefined) { base_dashboard = '/dashboard' } if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) { diff --git a/src/views/login/components/phoneForm.vue b/src/views/login/components/phoneForm.vue index 47483181..0d30dd3b 100644 --- a/src/views/login/components/phoneForm.vue +++ b/src/views/login/components/phoneForm.vue @@ -102,10 +102,11 @@ export default { that.$TOOL.data.set("USER_INFO", res1); that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms)); let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard; - if (this.redirect) { - base_dashboard = this.redirect; - } - else if (base_dashboard == null || base_dashboard == undefined) { + // if (this.redirect) { + // base_dashboard = this.redirect; + // } + // else + if (base_dashboard == null || base_dashboard == undefined) { base_dashboard = '/dashboard' } if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) { diff --git a/src/views/qm/behavior_form.vue b/src/views/qm/behavior_form.vue index bc25f4c3..6b95f43b 100644 --- a/src/views/qm/behavior_form.vue +++ b/src/views/qm/behavior_form.vue @@ -388,7 +388,7 @@ export default { getUserList() { let that = this; this.$API.system.user.list - .req({ page: 0, posts__name: "检验" }) + .req({ page: 0, posts__code__contains: "check" }) .then((res) => { that.userList = res; }); diff --git a/src/views/qm/first_check.vue b/src/views/qm/first_check.vue index 8257e605..aefbb318 100644 --- a/src/views/qm/first_check.vue +++ b/src/views/qm/first_check.vue @@ -280,7 +280,7 @@ export default { getUserList() { let that = this; this.$API.system.user.list - .req({ page: 0, posts__name: "检验" }) + .req({ page: 0, posts__code__contains: "check" }) .then((res) => { that.userList = res.results; }); diff --git a/src/views/qm/product.vue b/src/views/qm/product.vue index 921cd13a..a582afaf 100644 --- a/src/views/qm/product.vue +++ b/src/views/qm/product.vue @@ -91,7 +91,8 @@ export default { query: { page: 1, page_size: 20, - type: 10, + type: 'prod', + type2: 10, }, ftestWork:'', materialCate:'', diff --git a/src/views/qm/productCheck.vue b/src/views/qm/productCheck.vue index 1a79c1f0..1888a5ce 100644 --- a/src/views/qm/productCheck.vue +++ b/src/views/qm/productCheck.vue @@ -336,8 +336,7 @@ export default { getUserList() { let that = this; this.$API.system.user.list - // .req({ page: 0, posts__name: "检验" }) - .req({ page: 0 }) + .req({ page: 0, posts__code__contains: "check" }) .then((res) => { that.userList = res; }); diff --git a/src/views/wf/ticketdetail.vue b/src/views/wf/ticketdetail.vue index ded02abf..109db132 100644 --- a/src/views/wf/ticketdetail.vue +++ b/src/views/wf/ticketdetail.vue @@ -245,6 +245,12 @@ + + + + + + { - this.operationBtn = res; + that.operationBtn = res; + if(res.length>0){ + for (let i = 0; i < res.length; i++) { + if(res[i].on_submit_func=="apps.opm.services.check_opl_audit_imgs"){ + that.audit_imgs_show = true; + } + if(res[i].on_submit_func=="apps.opm.services.check_opl_work_imgs"){ + that.audit_work_show = true; + } + } + } + }); }, //访客详情 @@ -741,17 +778,24 @@ export default { //入厂项目详情 getRpj() { this.$API.rpm.rpj.item.req(this.projectId).then((res) => { - // debugger; this.itemDetail = res; }); }, //许可证详情 getOpl() { - this.$API.opm.opl.read.req(this.projectId).then((res) => { - debugger; - console.log(res); - this.itemDetail = res; - this.operationId = res.operation; + let that = this; + that.$API.opm.opl.read.req(that.projectId).then((res) => { + that.itemDetail = res; + that.operationId = res.operation; + if(res.audit_imgs.length>0){ + that.audit_imgs = res.audit_imgs; + res.audit_imgs_.forEach((item) => { + let obj = {}; + Object.assign(obj, item); + obj.url = item.file; + that.fileurl.push(obj) + }); + } }); }, showMoreInfo() { @@ -822,6 +866,9 @@ export default { params.ticket_data.close_note = this.form.close_note; params.ticket_data.close_dos = this.form.close_dos; } + if(this.audit_imgs_show){ + params.ticket_data.audit_imgs = this.audit_imgs; + } this.$API.wf.ticket.ticketHandle .req(this.ticketId, params) .then((res) => { diff --git a/src/views/wpm_gx/chart.vue b/src/views/wpm_gx/chart.vue index 3785daae..fb1bdae7 100644 --- a/src/views/wpm_gx/chart.vue +++ b/src/views/wpm_gx/chart.vue @@ -1,14 +1,14 @@ - + @@ -20,13 +20,14 @@ import * as echarts from "echarts"; const updateFrequency = 2000; const dimension = 0; const countryColors = { - 低碳水泥碳减排: "rgb(244,192,0)", - 替代燃料碳减排: "rgb(242,119,36)", - 清洁能源电力碳减排: "rgb(103,169,59)", - 能效提升技术碳减排: "rgb(77,148,211)", - CCUS碳减排: "rgb(159,159,159)", + 水泥碳排放: "rgb(244,192,0)", + 石膏板排放: "rgb(242,119,36)", + 建筑卫生陶瓷排放: "rgb(103,169,59)", + 玻璃排放: "rgb(77,148,211)", + 玻纤排放: "rgb(159,159,159)", + 墙体材料: "rgb(84,112,198)", }; -const years = [2021, 2025, 2030, 2040, 2050, 2060]; +const years = [2022, 2025, 2030, 2040, 2050, 2060]; export default { name: "chart", data() { @@ -40,41 +41,47 @@ export default { let startIndex = 0; let data = [ ["Income", "Life Expectancy", "Population", "Country", "Year"], - [0, 34.05, 0, "低碳水泥碳减排", 2021], - [0, 39, 0, "替代燃料碳减排", 2021], - [0, 32, 0, "清洁能源电力碳减排", 2021], - [0, 32.2, 0, "能效提升技术碳减排", 2021], - [0, 36.57, 0, "CCUS碳减排", 2021], + [12.09, 34.05, 0, "水泥碳排放", 2022], + [1.31, 39, 0, "石膏板排放", 2022], + [1.45, 32, 0, "建筑卫生陶瓷排放", 2022], + [0.36, 32.2, 0, "玻璃排放", 2022], + [0.12, 36.57, 0, "玻纤排放", 2022], + [0.25, 36.57, 0, "墙体材料", 2022], - [6, 34.05, 6, "低碳水泥碳减排", 2025], - [14, 39, 14, "替代燃料碳减排", 2025], - [6, 32, 6, "清洁能源电力碳减排", 2025], - [8, 32.2, 8, "能效提升技术碳减排", 2025], - [3, 36.5, 4, "CCUS碳减排", 2025], + [11.61, 34.05, 6, "水泥碳排放", 2025], + [1.06, 39, 14, "石膏板排放", 2025], + [1.16, 32, 6, "建筑卫生陶瓷排放", 2025], + [0.31, 32.2, 8, "玻璃排放", 2025], + [0.1, 36.5, 4, "玻纤排放", 2025], + [0.23, 36.57, 0, "墙体材料", 2025], - [33, 34.05, 33, "低碳水泥碳减排", 2030], - [26, 39, 26, "替代燃料碳减排", 2030], - [10, 32, 10, "清洁能源电力碳减排", 2030], - [18, 32.2, 18, "能效提升技术碳减排", 2030], - [7, 36.57, 9, "CCUS碳减排", 2030], + [9.32, 34.05, 33, "水泥碳排放", 2030], + [0.88, 39, 26, "石膏板排放", 2030], + [0.95, 32, 10, "建筑卫生陶瓷排放", 2030], + [0.27, 32.2, 18, "玻璃排放", 2030], + [0.08, 36.57, 9, "玻纤排放", 2030], + [0.19, 36.57, 9, "墙体材料", 2030], - [118, 34.05, 78, "低碳水泥碳减排", 2040], - [68, 39, 68, "替代燃料碳减排", 2040], - [17, 32, 17, "清洁能源电力碳减排", 2040], - [18, 32.2, 18, "能效提升技术碳减排", 2040], - [14, 36.57, 19, "CCUS碳减排", 2040], + [4.61, 34.05, 78, "水泥碳排放", 2040], + [0.63, 39, 68, "石膏板排放", 2040], + [0.68, 32, 17, "建筑卫生陶瓷排放", 2040], + [0.22, 32.2, 18, "玻璃排放", 2040], + [0.06, 36.57, 19, "玻纤排放", 2040], + [0.10, 36.57, 19, "墙体材料", 2040], - [157, 34.05, 118, "低碳水泥碳减排", 2050], - [111, 39, 111, "替代燃料碳减排", 2050], - [23, 32, 23, "清洁能源电力碳减排", 2050], - [16, 32.2, 16, "能效提升技术碳减排", 2050], - [41, 36.57, 57, "CCUS碳减排", 2050], + [2.65, 34.05, 118, "水泥碳排放", 2050], + [0.26, 39, 111, "石膏板排放", 2050], + [0.27, 32, 23, "建筑卫生陶瓷排放", 2050], + [0.14, 32.2, 16, "玻璃排放", 2050], + [0.035, 36.57, 57, "玻纤排放", 2050], + [0.055, 36.57, 57, "墙体材料", 2050], - [196, 34.05, 118, "低碳水泥碳减排", 2060], - [177, 39, 117, "替代燃料碳减排", 2060], - [26, 32, 26, "清洁能源电力碳减排", 2060], - [16, 32.2, 16, "能效提升技术碳减排", 2060], - [184, 36.57, 254, "CCUS碳减排", 2060], + [1.94, 34.05, 118, "水泥碳排放", 2060], + [0.04, 39, 117, "石膏板排放", 2060], + [0.0008, 32, 26, "建筑卫生陶瓷排放", 2060], + [0.09, 32.2, 16, "玻璃排放", 2060], + [0.022, 36.57, 254, "玻纤排放", 2060], + [0.034, 36.57, 254, "墙体材料", 2060], ]; let startYear = years[startIndex]; option = { @@ -85,9 +92,11 @@ export default { right: 80, }, xAxis: { - max: "dataMax", + max: "13", + min: "0.0008", position: "top", axisLabel: { + // show: false, formatter: function (n) { return Math.round(n) + ""; }, @@ -177,38 +186,38 @@ export default { myChart.setOption(option); } //折线 - let countries = ["水泥碳排放"]; + let countries = ["建材行业碳排放总量"]; let datasetWithFilters = []; let seriesList = []; let _rawData = [ ["Income", "Country", "Year"], - [575, "水泥碳排放", 2021], - [559, "水泥碳排放", 2025], - [523, "水泥碳排放", 2030], - [386, "水泥碳排放", 2040], - [273, "水泥碳排放", 2050], - [23, "水泥碳排放", 2060], + [15.6, "建材行业碳排放总量", 2022], + [14.2, "建材行业碳排放总量", 2025], + [11.1, "建材行业碳排放总量", 2030], + [5.7, "建材行业碳排放总量", 2040], + [2.4, "建材行业碳排放总量", 2050], + [0.1, "建材行业碳排放总量", 2060], ]; var chartDoms = document.getElementById("mains"); var myCharts = echarts.init(chartDoms); datasetWithFilters.push({ - id: "dataset_水泥碳排放", + id: "dataset_建材行业碳排放总量", fromDatasetId: "dataset_raw", transform: { type: "filter", config: { and: [ { dimension: "Year", gte: 1950 }, - { dimension: "Country", "=": "水泥碳排放" }, + { dimension: "Country", "=": "建材行业碳排放总量" }, ], }, }, }); seriesList.push({ type: "line", - datasetId: "dataset_水泥碳排放", + datasetId: "dataset_建材行业碳排放总量", showSymbol: false, - name: "水泥碳排放", + name: "建材行业碳排放总量", endLabel: { show: true, formatter: function (params) { @@ -257,7 +266,13 @@ export default { }, }, yAxis: { + type:"value", position: "right", + offset:10, + // axisLabel:{ + // align:"left", + + // }, name: "", }, grid: {