Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
fix bar dar
This commit is contained in:
commit
27c736d080
|
@ -121,6 +121,16 @@
|
||||||
fit="cover"
|
fit="cover"
|
||||||
/>
|
/>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="开始照片:" span=2 v-if="form.work_imgs&&form.work_imgs.length>0">
|
||||||
|
<el-image
|
||||||
|
v-for = "item in form.work_imgs_"
|
||||||
|
:key = "item.id"
|
||||||
|
style="margin-right: 8px;height: 146px;height:146px;"
|
||||||
|
:src="item.path"
|
||||||
|
:preview-src-list="[item.path]"
|
||||||
|
fit="cover"
|
||||||
|
/>
|
||||||
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="作业照片:" span=2 v-if="form.work_imgs&&form.work_imgs.length>0">
|
<el-descriptions-item label="作业照片:" span=2 v-if="form.work_imgs&&form.work_imgs.length>0">
|
||||||
<el-image
|
<el-image
|
||||||
v-for = "item in form.work_imgs_"
|
v-for = "item in form.work_imgs_"
|
||||||
|
|
|
@ -150,8 +150,8 @@ export default {
|
||||||
}],
|
}],
|
||||||
activeName:10,
|
activeName:10,
|
||||||
tabOptions:[
|
tabOptions:[
|
||||||
{ label: "进出厂车辆运输台账", name: 10 },
|
{ label: "进出厂运输车辆台账", name: 10 },
|
||||||
{ label: "进出厂车辆运输台账", name: 20 },
|
{ label: "厂内运输车辆台账", name: 20 },
|
||||||
{ label: "非道路移动机械电子台账", name: 30 },
|
{ label: "非道路移动机械电子台账", name: 30 },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -160,7 +160,10 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
|
|
||||||
|
|
||||||
|
//返回地图
|
||||||
|
backtoMap() {
|
||||||
|
this.$emit('close')
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -21,25 +21,30 @@
|
||||||
runningStateEnum[scope.row.running_state]?.text }}</el-tag>
|
runningStateEnum[scope.row.running_state]?.text }}</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="颗粒物实测(mg/m3)" width="180">
|
|
||||||
<template #default="scope">
|
<el-table-column label="SO2(mg/m3)" width="130">
|
||||||
{{ scope.row.envdata.dust_rtd ? scope.row.envdata.dust_rtd : '-' }}
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="SO2(mg/m3)" width="160">
|
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
{{ scope.row.envdata.so2_zs ? scope.row.envdata.so2_zs : '-' }}
|
{{ scope.row.envdata.so2_zs ? scope.row.envdata.so2_zs : '-' }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="NOX(mg/m3)" width="160">
|
<el-table-column label="SO2达标率(%)" width="130">
|
||||||
|
23%
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="NOX(mg/m3)" width="130">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
{{ scope.row.envdata.nox_zs ? scope.row.envdata.nox_zs : '-' }}
|
{{ scope.row.envdata.nox_zs ? scope.row.envdata.nox_zs : '-' }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="颗粒物折算(mg/m3)" width="180">
|
<el-table-column label="NOX达标率(%)" width="130">
|
||||||
|
36%
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="颗粒物(mg/m3)" width="130">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
{{ scope.row.envdata.dust_zs ? scope.row.envdata.dust_zs : '-' }}
|
{{ scope.row.envdata.dust_zs ? scope.row.envdata.dust_zs : '-' }}
|
||||||
</template>
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="颗粒物达标率(%)" width="130">
|
||||||
|
45%
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="温度(℃)">
|
<el-table-column label="温度(℃)">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
|
|
|
@ -12,9 +12,14 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header class="searchWrap">
|
<el-header class="searchWrap">
|
||||||
<div class="left-panel">
|
<div class="left-panel">
|
||||||
<div class="left-panel">洗车行为统计</div>
|
<div class="left-panel">洗车行为统计
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
|
<el-date-picker v-model="timeRange" type="datetimerange" range-separator="至"
|
||||||
|
start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery" style="width: 100%"
|
||||||
|
clearable />
|
||||||
<el-select v-model="query.station" placeholder="洗车台" @change="handleQuery" clearable>
|
<el-select v-model="query.station" placeholder="洗车台" @change="handleQuery" clearable>
|
||||||
<el-option v-for="item in stationOptions" :key="item" :label="item.name"
|
<el-option v-for="item in stationOptions" :key="item" :label="item.name"
|
||||||
:value="item.id"></el-option>
|
:value="item.id"></el-option>
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
<el-date-picker v-model="timeRange" type="datetimerange" range-separator="至"
|
<el-date-picker v-model="timeRange" type="datetimerange" range-separator="至"
|
||||||
start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery" style="width: 100%"
|
start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery" style="width: 100%"
|
||||||
clearable />
|
clearable />
|
||||||
<el-select v-model="query.type" placeholder="出入类型" clearable @change="handleQuery">
|
<el-select v-model="query.type" placeholder="车辆类型" clearable @change="handleQuery">
|
||||||
<el-option v-for="item in typeOptions" :key="item.id" :label="item.name" :value="item.id">
|
<el-option v-for="item in typeOptions" :key="item.id" :label="item.name" :value="item.id">
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
@ -44,7 +44,7 @@
|
||||||
<el-table-column prop="dzbh" label="道闸编号"></el-table-column>
|
<el-table-column prop="dzbh" label="道闸编号"></el-table-column>
|
||||||
<el-table-column prop="dtgfs" label="抬杆方式"></el-table-column>
|
<el-table-column prop="dtgfs" label="抬杆方式"></el-table-column>
|
||||||
<el-table-column prop="jcsj" label="进厂时间"></el-table-column>
|
<el-table-column prop="jcsj" label="进厂时间"></el-table-column>
|
||||||
<el-table-column prop="ccsj" label="出场时间"></el-table-column>
|
<el-table-column prop="ccsj" label="出厂时间"></el-table-column>
|
||||||
<el-table-column prop="gcllx" label="车俩类型"></el-table-column>
|
<el-table-column prop="gcllx" label="车俩类型"></el-table-column>
|
||||||
<el-table-column prop="hclys" label="车辆颜色"></el-table-column>
|
<el-table-column prop="hclys" label="车辆颜色"></el-table-column>
|
||||||
<el-table-column prop="cph" label="车牌号"></el-table-column>
|
<el-table-column prop="cph" label="车牌号"></el-table-column>
|
||||||
|
@ -53,8 +53,11 @@
|
||||||
<el-table-column prop="fdjhm" label="发动机号码"></el-table-column>
|
<el-table-column prop="fdjhm" label="发动机号码"></el-table-column>
|
||||||
|
|
||||||
</scTable>
|
</scTable>
|
||||||
<el-dialog width="650px" v-model="dialogFormVisible" title="车辆运输台账详情" >
|
<el-dialog width="650px" style="border-color: var(--el-border-color-light);
|
||||||
<el-descriptions :column="2" width="600px">
|
background: rgb(4, 50, 83);
|
||||||
|
background-color: rgb(4, 50, 83);
|
||||||
|
box-shadow: inset 0px 0px 30px 15px rgb(7, 79, 109)" v-model="dialogFormVisible" title="车辆运输台账详情" >
|
||||||
|
<el-descriptions :column="3" width="600px">
|
||||||
<el-descriptions-item label="出入口编号">{{ ysdata.crkbh }}</el-descriptions-item>
|
<el-descriptions-item label="出入口编号">{{ ysdata.crkbh }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="道闸编号">{{ ysdata.dzbh }}</el-descriptions-item>
|
<el-descriptions-item label="道闸编号">{{ ysdata.dzbh }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="抬杆方式">{{ ysdata.tgfs }}</el-descriptions-item>
|
<el-descriptions-item label="抬杆方式">{{ ysdata.tgfs }}</el-descriptions-item>
|
||||||
|
@ -76,11 +79,27 @@
|
||||||
<el-descriptions-item label="出厂运输货物名称">{{ ysdata.cchwmc }}</el-descriptions-item>
|
<el-descriptions-item label="出厂运输货物名称">{{ ysdata.cchwmc }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="出厂运输货物量">{{ ysdata.cchwl }}</el-descriptions-item>
|
<el-descriptions-item label="出厂运输货物量">{{ ysdata.cchwl }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="车队名称">{{ ysdata.cdmc }}</el-descriptions-item>
|
<el-descriptions-item label="车队名称">{{ ysdata.cdmc }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="进厂照片">{{ ysdata.jczp }}</el-descriptions-item>
|
|
||||||
<el-descriptions-item label="随车清单">{{ ysdata.sdqd }}</el-descriptions-item>
|
|
||||||
<el-descriptions-item label="行驶证">{{ ysdata.xsz }}</el-descriptions-item>
|
|
||||||
<el-descriptions-item label="手动抬杆照片">{{ ysdata.sdtgzp }}</el-descriptions-item>
|
|
||||||
|
|
||||||
|
<el-descriptions-item label="进厂照片">
|
||||||
|
<div class="demo-image__preview">
|
||||||
|
<el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
|
||||||
|
</el-image>
|
||||||
|
</div>
|
||||||
|
</el-descriptions-item>
|
||||||
|
|
||||||
|
<el-descriptions-item label="行驶证">
|
||||||
|
<div class="demo-image__preview">
|
||||||
|
<el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
|
||||||
|
</el-image>
|
||||||
|
</div>
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="手动抬杆照片">
|
||||||
|
<div class="demo-image__preview">
|
||||||
|
<el-image style="width: 100px; height: 100px" :src="url" :preview-src-list="srcList">
|
||||||
|
</el-image>
|
||||||
|
</div>
|
||||||
|
</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="随车清单">{{ ysdata.sdqd }}</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<div class="dialog-footer">
|
<div class="dialog-footer">
|
||||||
|
@ -104,7 +123,7 @@ export default {
|
||||||
tgfs:"自动",
|
tgfs:"自动",
|
||||||
jcsj:"2024-08-02",
|
jcsj:"2024-08-02",
|
||||||
ccsj:"2024-08-02",
|
ccsj:"2024-08-02",
|
||||||
cllx:"运输车辆",
|
cllx:"罐车",
|
||||||
clys:"白色",
|
clys:"白色",
|
||||||
cph:"Ad1233",
|
cph:"Ad1233",
|
||||||
zcdjsj:"",
|
zcdjsj:"",
|
||||||
|
@ -112,8 +131,8 @@ export default {
|
||||||
clppxh:"",
|
clppxh:"",
|
||||||
fdjhm:"",
|
fdjhm:"",
|
||||||
rllx:"",
|
rllx:"",
|
||||||
pfjd:"",
|
pfjd:"国五",
|
||||||
syxz:"",
|
syxz:"汽油",
|
||||||
lxzt:"",
|
lxzt:"",
|
||||||
jcyshwmc:"",
|
jcyshwmc:"",
|
||||||
jchwl:"",
|
jchwl:"",
|
||||||
|
@ -151,6 +170,11 @@ export default {
|
||||||
timeOptions: ['日', '月', '年'],
|
timeOptions: ['日', '月', '年'],
|
||||||
apiObj: this.$API.enp.vehicle_access,
|
apiObj: this.$API.enp.vehicle_access,
|
||||||
params: {},
|
params: {},
|
||||||
|
url: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
|
||||||
|
srcList: [
|
||||||
|
'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
|
||||||
|
|
||||||
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
|
@ -192,6 +192,9 @@
|
||||||
@click="configDark" size="small"></el-button>
|
@click="configDark" size="small"></el-button>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="quit" @click="backlogin">
|
||||||
|
退出
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
|
@ -363,17 +366,7 @@
|
||||||
<div style="display: flex">
|
<div style="display: flex">
|
||||||
<div class="chart" id="pieChart"></div>
|
<div class="chart" id="pieChart"></div>
|
||||||
<div class="carStaticWrap">
|
<div class="carStaticWrap">
|
||||||
<div style="display:flex">
|
|
||||||
<div
|
|
||||||
class="todyCarItem"
|
|
||||||
v-for="item in pieData"
|
|
||||||
:key="item"
|
|
||||||
>
|
|
||||||
<span class="carStaticText" style="color: #d5d5d5">{{item.name}}</span>
|
|
||||||
<span class="carStaticNum">{{ item.value }}</span
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div style="display:flex">
|
<div style="display:flex">
|
||||||
<div
|
<div
|
||||||
class="todyCarItem"
|
class="todyCarItem"
|
||||||
|
@ -397,6 +390,15 @@
|
||||||
src="img/enp_blue/block_title.png"
|
src="img/enp_blue/block_title.png"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
<scScrollTavle
|
||||||
|
v-if="table4Visible"
|
||||||
|
:tableHeight="containerHeight"
|
||||||
|
:rowData="lineData4"
|
||||||
|
:titleData="liData4"
|
||||||
|
:refValue="refValue4"
|
||||||
|
class="bigScreenTable"
|
||||||
|
:noIndex="noIndex"
|
||||||
|
></scScrollTavle>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- 左右两条边框线 -->
|
<!-- 左右两条边框线 -->
|
||||||
|
@ -616,20 +618,23 @@ export default {
|
||||||
show: false,
|
show: false,
|
||||||
},
|
},
|
||||||
data: [
|
data: [
|
||||||
{ value: 2, name: "新能源" },
|
{ value: 2, name: "国五" },
|
||||||
{ value: 6, name: "其他" },
|
{ value: 6, name: "国六" },
|
||||||
|
{ value: 6, name: "清洁运输" },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
pieData: [
|
pieData: [
|
||||||
{ value: 2, name: "新能源" },
|
{ value: 2, name: "国五" },
|
||||||
{ value: 6, name: "其他" },
|
{ value: 6, name: "国六" },
|
||||||
|
{ value: 8, name: "清洁运输" },
|
||||||
|
|
||||||
],
|
],
|
||||||
containerHeight: null,
|
containerHeight: null,
|
||||||
refValue1: "moocBox1",
|
refValue1: "moocBox1",
|
||||||
table1Visible: false,
|
table1Visible: false,
|
||||||
lineData: [],
|
lineData: [],
|
||||||
liData1: ["设备名称", "颗粒物", "SO₂", "NOx" , "氨气"],
|
liData1: ["设备名称", "颗粒物", "SO₂", "NOx" , "氨"],
|
||||||
refValue2: "moocBox2",
|
refValue2: "moocBox2",
|
||||||
table2Visible: false,
|
table2Visible: false,
|
||||||
lineData2: [],
|
lineData2: [],
|
||||||
|
@ -638,6 +643,10 @@ export default {
|
||||||
table3Visible: false,
|
table3Visible: false,
|
||||||
lineData3: [],
|
lineData3: [],
|
||||||
liData3: ["设备名称", "PM10", "PM2.5"],
|
liData3: ["设备名称", "PM10", "PM2.5"],
|
||||||
|
table4Visible: false,
|
||||||
|
lineData4: [],
|
||||||
|
refValue4: "moocBox1",
|
||||||
|
liData4: ["车辆类型", "运行时间","运行里程"],
|
||||||
noIndex: true,
|
noIndex: true,
|
||||||
eqNumData: {
|
eqNumData: {
|
||||||
sc: 0,
|
sc: 0,
|
||||||
|
@ -681,6 +690,7 @@ export default {
|
||||||
that.addListener();
|
that.addListener();
|
||||||
setTimeout(function () {}, 5000);
|
setTimeout(function () {}, 5000);
|
||||||
});
|
});
|
||||||
|
|
||||||
// that.intervalinfo = setInterval(() => {
|
// that.intervalinfo = setInterval(() => {
|
||||||
// that.getleft1Data();
|
// that.getleft1Data();
|
||||||
// // that.getleft2Data();
|
// // that.getleft2Data();
|
||||||
|
@ -802,6 +812,7 @@ export default {
|
||||||
lineData.push(arr);
|
lineData.push(arr);
|
||||||
});
|
});
|
||||||
this.lineData2 = lineData;
|
this.lineData2 = lineData;
|
||||||
|
//console.log(this.lineData2)
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//空气微站实时监测---(小微站)
|
//空气微站实时监测---(小微站)
|
||||||
|
@ -835,18 +846,48 @@ export default {
|
||||||
lineData.push(arr);
|
lineData.push(arr);
|
||||||
});
|
});
|
||||||
this.lineData3 = lineData;
|
this.lineData3 = lineData;
|
||||||
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//今日车辆统计数据
|
//今日车辆统计数据
|
||||||
getright2Data() {},
|
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() {
|
configDark() {
|
||||||
this.config.dark = this.config.dark ? false : true;
|
this.config.dark = this.config.dark ? false : true;
|
||||||
},
|
},
|
||||||
backSystem() {
|
backSystem() {
|
||||||
this.$router.push({ path: "/dashboard_enp" });
|
this.$router.push({ path: "/dashboard_enp" });
|
||||||
},
|
},
|
||||||
|
//退出登录
|
||||||
|
backlogin(){
|
||||||
|
this.$router.push({ path: "/login" });
|
||||||
|
|
||||||
|
},
|
||||||
closeDialog() {
|
closeDialog() {
|
||||||
this.elDrawer = false;
|
this.elDrawer = false;
|
||||||
this.activeIndex = 0;
|
this.activeIndex = 0;
|
||||||
|
@ -930,6 +971,7 @@ export default {
|
||||||
this.table1Visible = true;
|
this.table1Visible = true;
|
||||||
this.table2Visible = true;
|
this.table2Visible = true;
|
||||||
this.table3Visible = true;
|
this.table3Visible = true;
|
||||||
|
this.table4Visible = true;
|
||||||
},
|
},
|
||||||
// bindBtnClass(index) {
|
// bindBtnClass(index) {
|
||||||
// let classInfo = { btns: true, btnsActive: false };
|
// let classInfo = { btns: true, btnsActive: false };
|
||||||
|
@ -1178,11 +1220,20 @@ header {
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
background-image: url("/public/img/enp_blue/user_enp.png");
|
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 {
|
.dark_config {
|
||||||
width: 2.3vh;
|
width: 2.3vh;
|
||||||
height: 2.3vh;
|
height: 2.3vh;
|
||||||
margin-top: 0.9vh;
|
margin-top: 0.9vh;
|
||||||
margin-left: 2vh;
|
margin-left: 2vh;
|
||||||
|
background-size: cover;
|
||||||
}
|
}
|
||||||
|
|
||||||
.model {
|
.model {
|
||||||
|
@ -1441,15 +1492,14 @@ header {
|
||||||
/* 车辆统计-start */
|
/* 车辆统计-start */
|
||||||
.carStaticWrap{
|
.carStaticWrap{
|
||||||
flex-shrink: 1;
|
flex-shrink: 1;
|
||||||
width: 150px;
|
width: 23vh;
|
||||||
align-self: center;
|
align-self: center;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
.todyCarItem {
|
.todyCarItem {
|
||||||
width:75px;
|
width:22vh;
|
||||||
color: white;
|
color: white;
|
||||||
font-size: 16px;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
@ -1458,7 +1508,7 @@ header {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
.carStaticNum{
|
.carStaticNum{
|
||||||
font-size: 35px;
|
font-size: 25px;
|
||||||
color: #00f6ff;
|
color: #00f6ff;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|
|
@ -133,10 +133,12 @@ export default {
|
||||||
that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms));
|
that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms));
|
||||||
|
|
||||||
let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard;
|
let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard;
|
||||||
if (this.redirect) {
|
// 去除重定向因客户不理解
|
||||||
base_dashboard = this.redirect;
|
// if (this.redirect) {
|
||||||
}
|
// base_dashboard = this.redirect;
|
||||||
else if (base_dashboard == null || base_dashboard == undefined) {
|
// }
|
||||||
|
// else
|
||||||
|
if (base_dashboard == null || base_dashboard == undefined) {
|
||||||
base_dashboard = '/dashboard'
|
base_dashboard = '/dashboard'
|
||||||
}
|
}
|
||||||
if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) {
|
if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) {
|
||||||
|
|
|
@ -102,10 +102,11 @@ export default {
|
||||||
that.$TOOL.data.set("USER_INFO", res1);
|
that.$TOOL.data.set("USER_INFO", res1);
|
||||||
that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms));
|
that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms));
|
||||||
let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard;
|
let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard;
|
||||||
if (this.redirect) {
|
// if (this.redirect) {
|
||||||
base_dashboard = this.redirect;
|
// base_dashboard = this.redirect;
|
||||||
}
|
// }
|
||||||
else if (base_dashboard == null || base_dashboard == undefined) {
|
// else
|
||||||
|
if (base_dashboard == null || base_dashboard == undefined) {
|
||||||
base_dashboard = '/dashboard'
|
base_dashboard = '/dashboard'
|
||||||
}
|
}
|
||||||
if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) {
|
if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) {
|
||||||
|
|
|
@ -388,7 +388,7 @@ export default {
|
||||||
getUserList() {
|
getUserList() {
|
||||||
let that = this;
|
let that = this;
|
||||||
this.$API.system.user.list
|
this.$API.system.user.list
|
||||||
.req({ page: 0, posts__name: "检验" })
|
.req({ page: 0, posts__code__contains: "check" })
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
that.userList = res;
|
that.userList = res;
|
||||||
});
|
});
|
||||||
|
|
|
@ -280,7 +280,7 @@ export default {
|
||||||
getUserList() {
|
getUserList() {
|
||||||
let that = this;
|
let that = this;
|
||||||
this.$API.system.user.list
|
this.$API.system.user.list
|
||||||
.req({ page: 0, posts__name: "检验" })
|
.req({ page: 0, posts__code__contains: "check" })
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
that.userList = res.results;
|
that.userList = res.results;
|
||||||
});
|
});
|
||||||
|
|
|
@ -91,7 +91,8 @@ export default {
|
||||||
query: {
|
query: {
|
||||||
page: 1,
|
page: 1,
|
||||||
page_size: 20,
|
page_size: 20,
|
||||||
type: 10,
|
type: 'prod',
|
||||||
|
type2: 10,
|
||||||
},
|
},
|
||||||
ftestWork:'',
|
ftestWork:'',
|
||||||
materialCate:'',
|
materialCate:'',
|
||||||
|
|
|
@ -336,8 +336,7 @@ export default {
|
||||||
getUserList() {
|
getUserList() {
|
||||||
let that = this;
|
let that = this;
|
||||||
this.$API.system.user.list
|
this.$API.system.user.list
|
||||||
// .req({ page: 0, posts__name: "检验" })
|
.req({ page: 0, posts__code__contains: "check" })
|
||||||
.req({ page: 0 })
|
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
that.userList = res;
|
that.userList = res;
|
||||||
});
|
});
|
||||||
|
|
|
@ -245,6 +245,12 @@
|
||||||
</el-checkbox>
|
</el-checkbox>
|
||||||
</el-checkbox-group>
|
</el-checkbox-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="审批图片" v-if="audit_imgs_show" required>
|
||||||
|
<sc-upload-multiple v-model="fileurl" @imagesDel="imagesDel" @imagesChange="imagesChange" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="开始图片" v-if="audit_work_show" required>
|
||||||
|
<sc-upload-multiple v-model="fileurl2" @imagesDel="imagesDel2" @imagesChange="imagesChange2" draggable :limit="9" tip="最多上传9个文件,单个文件不要超过10M,请上传图像格式文件"></sc-upload-multiple>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="处理意见">
|
<el-form-item label="处理意见">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="form.suggestion"
|
v-model="form.suggestion"
|
||||||
|
@ -510,11 +516,15 @@ export default {
|
||||||
employeeLists: [],
|
employeeLists: [],
|
||||||
operationBtn: [],
|
operationBtn: [],
|
||||||
routepackes: [],
|
routepackes: [],
|
||||||
|
fileurl:[],
|
||||||
|
fileurl2:[],
|
||||||
form: {
|
form: {
|
||||||
suggestion: "",
|
suggestion: "",
|
||||||
close_note: "",
|
close_note: "",
|
||||||
close_dos: [],
|
close_dos: [],
|
||||||
},
|
},
|
||||||
|
audit_imgs:[],
|
||||||
|
work_imgs:[],
|
||||||
addForm: {
|
addForm: {
|
||||||
suggestion: "",
|
suggestion: "",
|
||||||
toadd_user: "",
|
toadd_user: "",
|
||||||
|
@ -529,6 +539,8 @@ export default {
|
||||||
showLimited: false,
|
showLimited: false,
|
||||||
limitedDeliver: false,
|
limitedDeliver: false,
|
||||||
limitedUserSelect: false,
|
limitedUserSelect: false,
|
||||||
|
audit_imgs_show:false,
|
||||||
|
audit_work_show:false,
|
||||||
purpose_: {
|
purpose_: {
|
||||||
10: "参观",
|
10: "参观",
|
||||||
20: "拜访",
|
20: "拜访",
|
||||||
|
@ -594,6 +606,18 @@ export default {
|
||||||
this.getBtns();
|
this.getBtns();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
imagesDel(index){
|
||||||
|
this.audit_imgs.splice(index,1)
|
||||||
|
},
|
||||||
|
imagesChange(data){
|
||||||
|
this.audit_imgs = data;
|
||||||
|
},
|
||||||
|
imagesDel2(index){
|
||||||
|
this.work_imgs.splice(index,1)
|
||||||
|
},
|
||||||
|
imagesChange2(data){
|
||||||
|
this.work_imgs = data;
|
||||||
|
},
|
||||||
itemDetailEdtil() {
|
itemDetailEdtil() {
|
||||||
let itemDetail = this.itemDetail;
|
let itemDetail = this.itemDetail;
|
||||||
if (this.cateType === "opl") {
|
if (this.cateType === "opl") {
|
||||||
|
@ -715,10 +739,23 @@ export default {
|
||||||
},
|
},
|
||||||
//获取应有的流转
|
//获取应有的流转
|
||||||
getBtns() {
|
getBtns() {
|
||||||
this.$API.wf.ticket.ticketTransitions
|
let that = this;
|
||||||
.req(this.ticketId)
|
that.audit_imgs_show = false;
|
||||||
|
that.$API.wf.ticket.ticketTransitions
|
||||||
|
.req(that.ticketId)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
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() {
|
getRpj() {
|
||||||
this.$API.rpm.rpj.item.req(this.projectId).then((res) => {
|
this.$API.rpm.rpj.item.req(this.projectId).then((res) => {
|
||||||
// debugger;
|
|
||||||
this.itemDetail = res;
|
this.itemDetail = res;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
//许可证详情
|
//许可证详情
|
||||||
getOpl() {
|
getOpl() {
|
||||||
this.$API.opm.opl.read.req(this.projectId).then((res) => {
|
let that = this;
|
||||||
debugger;
|
that.$API.opm.opl.read.req(that.projectId).then((res) => {
|
||||||
console.log(res);
|
that.itemDetail = res;
|
||||||
this.itemDetail = res;
|
that.operationId = res.operation;
|
||||||
this.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() {
|
showMoreInfo() {
|
||||||
|
@ -822,6 +866,9 @@ export default {
|
||||||
params.ticket_data.close_note = this.form.close_note;
|
params.ticket_data.close_note = this.form.close_note;
|
||||||
params.ticket_data.close_dos = this.form.close_dos;
|
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
|
this.$API.wf.ticket.ticketHandle
|
||||||
.req(this.ticketId, params)
|
.req(this.ticketId, params)
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
<template>
|
<template>
|
||||||
<el-main>
|
<el-main>
|
||||||
<el-card>
|
<el-card>
|
||||||
<div id="main" style="width: 1000px; height: 500px"></div>
|
<div id="main" style="width: 1200px; height: 500px"></div>
|
||||||
<div
|
<div
|
||||||
id="mains"
|
id="mains"
|
||||||
style="
|
style="
|
||||||
width: 1000px;
|
width: 1200px;
|
||||||
height: 500px;
|
height: 500px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 185px;
|
top: 155px;
|
||||||
"
|
"
|
||||||
></div>
|
></div>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
@ -20,13 +20,14 @@ import * as echarts from "echarts";
|
||||||
const updateFrequency = 2000;
|
const updateFrequency = 2000;
|
||||||
const dimension = 0;
|
const dimension = 0;
|
||||||
const countryColors = {
|
const countryColors = {
|
||||||
低碳水泥碳减排: "rgb(244,192,0)",
|
水泥碳排放: "rgb(244,192,0)",
|
||||||
替代燃料碳减排: "rgb(242,119,36)",
|
石膏板排放: "rgb(242,119,36)",
|
||||||
清洁能源电力碳减排: "rgb(103,169,59)",
|
建筑卫生陶瓷排放: "rgb(103,169,59)",
|
||||||
能效提升技术碳减排: "rgb(77,148,211)",
|
玻璃排放: "rgb(77,148,211)",
|
||||||
CCUS碳减排: "rgb(159,159,159)",
|
玻纤排放: "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 {
|
export default {
|
||||||
name: "chart",
|
name: "chart",
|
||||||
data() {
|
data() {
|
||||||
|
@ -40,41 +41,47 @@ export default {
|
||||||
let startIndex = 0;
|
let startIndex = 0;
|
||||||
let data = [
|
let data = [
|
||||||
["Income", "Life Expectancy", "Population", "Country", "Year"],
|
["Income", "Life Expectancy", "Population", "Country", "Year"],
|
||||||
[0, 34.05, 0, "低碳水泥碳减排", 2021],
|
[12.09, 34.05, 0, "水泥碳排放", 2022],
|
||||||
[0, 39, 0, "替代燃料碳减排", 2021],
|
[1.31, 39, 0, "石膏板排放", 2022],
|
||||||
[0, 32, 0, "清洁能源电力碳减排", 2021],
|
[1.45, 32, 0, "建筑卫生陶瓷排放", 2022],
|
||||||
[0, 32.2, 0, "能效提升技术碳减排", 2021],
|
[0.36, 32.2, 0, "玻璃排放", 2022],
|
||||||
[0, 36.57, 0, "CCUS碳减排", 2021],
|
[0.12, 36.57, 0, "玻纤排放", 2022],
|
||||||
|
[0.25, 36.57, 0, "墙体材料", 2022],
|
||||||
|
|
||||||
[6, 34.05, 6, "低碳水泥碳减排", 2025],
|
[11.61, 34.05, 6, "水泥碳排放", 2025],
|
||||||
[14, 39, 14, "替代燃料碳减排", 2025],
|
[1.06, 39, 14, "石膏板排放", 2025],
|
||||||
[6, 32, 6, "清洁能源电力碳减排", 2025],
|
[1.16, 32, 6, "建筑卫生陶瓷排放", 2025],
|
||||||
[8, 32.2, 8, "能效提升技术碳减排", 2025],
|
[0.31, 32.2, 8, "玻璃排放", 2025],
|
||||||
[3, 36.5, 4, "CCUS碳减排", 2025],
|
[0.1, 36.5, 4, "玻纤排放", 2025],
|
||||||
|
[0.23, 36.57, 0, "墙体材料", 2025],
|
||||||
|
|
||||||
[33, 34.05, 33, "低碳水泥碳减排", 2030],
|
[9.32, 34.05, 33, "水泥碳排放", 2030],
|
||||||
[26, 39, 26, "替代燃料碳减排", 2030],
|
[0.88, 39, 26, "石膏板排放", 2030],
|
||||||
[10, 32, 10, "清洁能源电力碳减排", 2030],
|
[0.95, 32, 10, "建筑卫生陶瓷排放", 2030],
|
||||||
[18, 32.2, 18, "能效提升技术碳减排", 2030],
|
[0.27, 32.2, 18, "玻璃排放", 2030],
|
||||||
[7, 36.57, 9, "CCUS碳减排", 2030],
|
[0.08, 36.57, 9, "玻纤排放", 2030],
|
||||||
|
[0.19, 36.57, 9, "墙体材料", 2030],
|
||||||
|
|
||||||
[118, 34.05, 78, "低碳水泥碳减排", 2040],
|
[4.61, 34.05, 78, "水泥碳排放", 2040],
|
||||||
[68, 39, 68, "替代燃料碳减排", 2040],
|
[0.63, 39, 68, "石膏板排放", 2040],
|
||||||
[17, 32, 17, "清洁能源电力碳减排", 2040],
|
[0.68, 32, 17, "建筑卫生陶瓷排放", 2040],
|
||||||
[18, 32.2, 18, "能效提升技术碳减排", 2040],
|
[0.22, 32.2, 18, "玻璃排放", 2040],
|
||||||
[14, 36.57, 19, "CCUS碳减排", 2040],
|
[0.06, 36.57, 19, "玻纤排放", 2040],
|
||||||
|
[0.10, 36.57, 19, "墙体材料", 2040],
|
||||||
|
|
||||||
[157, 34.05, 118, "低碳水泥碳减排", 2050],
|
[2.65, 34.05, 118, "水泥碳排放", 2050],
|
||||||
[111, 39, 111, "替代燃料碳减排", 2050],
|
[0.26, 39, 111, "石膏板排放", 2050],
|
||||||
[23, 32, 23, "清洁能源电力碳减排", 2050],
|
[0.27, 32, 23, "建筑卫生陶瓷排放", 2050],
|
||||||
[16, 32.2, 16, "能效提升技术碳减排", 2050],
|
[0.14, 32.2, 16, "玻璃排放", 2050],
|
||||||
[41, 36.57, 57, "CCUS碳减排", 2050],
|
[0.035, 36.57, 57, "玻纤排放", 2050],
|
||||||
|
[0.055, 36.57, 57, "墙体材料", 2050],
|
||||||
|
|
||||||
[196, 34.05, 118, "低碳水泥碳减排", 2060],
|
[1.94, 34.05, 118, "水泥碳排放", 2060],
|
||||||
[177, 39, 117, "替代燃料碳减排", 2060],
|
[0.04, 39, 117, "石膏板排放", 2060],
|
||||||
[26, 32, 26, "清洁能源电力碳减排", 2060],
|
[0.0008, 32, 26, "建筑卫生陶瓷排放", 2060],
|
||||||
[16, 32.2, 16, "能效提升技术碳减排", 2060],
|
[0.09, 32.2, 16, "玻璃排放", 2060],
|
||||||
[184, 36.57, 254, "CCUS碳减排", 2060],
|
[0.022, 36.57, 254, "玻纤排放", 2060],
|
||||||
|
[0.034, 36.57, 254, "墙体材料", 2060],
|
||||||
];
|
];
|
||||||
let startYear = years[startIndex];
|
let startYear = years[startIndex];
|
||||||
option = {
|
option = {
|
||||||
|
@ -85,9 +92,11 @@ export default {
|
||||||
right: 80,
|
right: 80,
|
||||||
},
|
},
|
||||||
xAxis: {
|
xAxis: {
|
||||||
max: "dataMax",
|
max: "13",
|
||||||
|
min: "0.0008",
|
||||||
position: "top",
|
position: "top",
|
||||||
axisLabel: {
|
axisLabel: {
|
||||||
|
// show: false,
|
||||||
formatter: function (n) {
|
formatter: function (n) {
|
||||||
return Math.round(n) + "";
|
return Math.round(n) + "";
|
||||||
},
|
},
|
||||||
|
@ -177,38 +186,38 @@ export default {
|
||||||
myChart.setOption(option);
|
myChart.setOption(option);
|
||||||
}
|
}
|
||||||
//折线
|
//折线
|
||||||
let countries = ["水泥碳排放"];
|
let countries = ["建材行业碳排放总量"];
|
||||||
let datasetWithFilters = [];
|
let datasetWithFilters = [];
|
||||||
let seriesList = [];
|
let seriesList = [];
|
||||||
let _rawData = [
|
let _rawData = [
|
||||||
["Income", "Country", "Year"],
|
["Income", "Country", "Year"],
|
||||||
[575, "水泥碳排放", 2021],
|
[15.6, "建材行业碳排放总量", 2022],
|
||||||
[559, "水泥碳排放", 2025],
|
[14.2, "建材行业碳排放总量", 2025],
|
||||||
[523, "水泥碳排放", 2030],
|
[11.1, "建材行业碳排放总量", 2030],
|
||||||
[386, "水泥碳排放", 2040],
|
[5.7, "建材行业碳排放总量", 2040],
|
||||||
[273, "水泥碳排放", 2050],
|
[2.4, "建材行业碳排放总量", 2050],
|
||||||
[23, "水泥碳排放", 2060],
|
[0.1, "建材行业碳排放总量", 2060],
|
||||||
];
|
];
|
||||||
var chartDoms = document.getElementById("mains");
|
var chartDoms = document.getElementById("mains");
|
||||||
var myCharts = echarts.init(chartDoms);
|
var myCharts = echarts.init(chartDoms);
|
||||||
datasetWithFilters.push({
|
datasetWithFilters.push({
|
||||||
id: "dataset_水泥碳排放",
|
id: "dataset_建材行业碳排放总量",
|
||||||
fromDatasetId: "dataset_raw",
|
fromDatasetId: "dataset_raw",
|
||||||
transform: {
|
transform: {
|
||||||
type: "filter",
|
type: "filter",
|
||||||
config: {
|
config: {
|
||||||
and: [
|
and: [
|
||||||
{ dimension: "Year", gte: 1950 },
|
{ dimension: "Year", gte: 1950 },
|
||||||
{ dimension: "Country", "=": "水泥碳排放" },
|
{ dimension: "Country", "=": "建材行业碳排放总量" },
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
seriesList.push({
|
seriesList.push({
|
||||||
type: "line",
|
type: "line",
|
||||||
datasetId: "dataset_水泥碳排放",
|
datasetId: "dataset_建材行业碳排放总量",
|
||||||
showSymbol: false,
|
showSymbol: false,
|
||||||
name: "水泥碳排放",
|
name: "建材行业碳排放总量",
|
||||||
endLabel: {
|
endLabel: {
|
||||||
show: true,
|
show: true,
|
||||||
formatter: function (params) {
|
formatter: function (params) {
|
||||||
|
@ -257,7 +266,13 @@ export default {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
yAxis: {
|
yAxis: {
|
||||||
|
type:"value",
|
||||||
position: "right",
|
position: "right",
|
||||||
|
offset:10,
|
||||||
|
// axisLabel:{
|
||||||
|
// align:"left",
|
||||||
|
|
||||||
|
// },
|
||||||
name: "",
|
name: "",
|
||||||
},
|
},
|
||||||
grid: {
|
grid: {
|
||||||
|
|
Loading…
Reference in New Issue