Commit cce27b43 authored by 张牧越's avatar 张牧越

样式fix

parent 5e00bd12
...@@ -61,14 +61,18 @@ export default { ...@@ -61,14 +61,18 @@ export default {
(document.body.offsetWidth / designW) * font_rate + "px"; (document.body.offsetWidth / designW) * font_rate + "px";
document.getElementsByTagName("body")[0].style.fontSize = document.getElementsByTagName("body")[0].style.fontSize =
(document.body.offsetWidth / designW) * font_rate + "px"; (document.body.offsetWidth / designW) * font_rate + "px";
// //监测窗口大小变化 //监测窗口大小变化
console.log(document.body.offsetWidth);
var that = this;
window.addEventListener( window.addEventListener(
"onorientationchange" in window ? "orientationchange" : "resize", "onorientationchange" in window ? "orientationchange" : "resize",
function () { function () {
setTimeout(() => {
document.getElementsByTagName("html")[0].style.fontSize = document.getElementsByTagName("html")[0].style.fontSize =
(document.body.offsetWidth / designW) * font_rate + "px"; (document.body.offsetWidth / designW) * font_rate + "px";
document.getElementsByTagName("body")[0].style.fontSize = document.getElementsByTagName("body")[0].style.fontSize =
(document.body.offsetWidth / designW) * font_rate + "px"; (document.body.offsetWidth / designW) * font_rate + "px";
}, 500);
}, },
false false
); );
...@@ -106,7 +110,7 @@ export default { ...@@ -106,7 +110,7 @@ export default {
if (isChrome) { if (isChrome) {
} }
this.bodyScale(); this.bodyScale();
this.getUserInfo(); // this.getUserInfo();
}, },
watch: { watch: {
$route(to, from) { $route(to, from) {
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
:prop="column.prop" :prop="column.prop"
:align="column.align ? column.align : 'center'" :align="column.align ? column.align : 'center'"
:min-width="column.minWidth ? column.minWidth : ''" :min-width="column.minWidth ? column.minWidth : ''"
:sortable="column.sortable"
></el-table-column> ></el-table-column>
<!-- 自定义插槽 --> <!-- 自定义插槽 -->
<el-table-column <el-table-column
...@@ -32,6 +33,7 @@ ...@@ -32,6 +33,7 @@
:prop="column.prop" :prop="column.prop"
:align="column.align ? column.align : 'center'" :align="column.align ? column.align : 'center'"
:min-width="column.minWidth ? column.minWidth : ''" :min-width="column.minWidth ? column.minWidth : ''"
:sortable="column.sortable"
> >
<template #default="scope"> <template #default="scope">
<slot :name="column.prop" :data="scope.row" /> <slot :name="column.prop" :data="scope.row" />
...@@ -167,5 +169,6 @@ export default { ...@@ -167,5 +169,6 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
flex-grow: 1;
} }
</style> </style>
\ No newline at end of file
<template> <template>
<div class="s-table"> <div class="s-table">
<div class="table-headers"> <div class="table-headers">
<div v-if="hasIndex" style="width: 0.4rem">序号</div>
<div style="width: calc(100% - 0.4rem); display: flex">
<div <div
v-for="(header, index) in headers" v-for="(header, index) in headers"
:key="index" :key="index"
...@@ -13,6 +15,7 @@ ...@@ -13,6 +15,7 @@
{{ header.name }} {{ header.name }}
</div> </div>
</div> </div>
</div>
<div <div
class="table-data" class="table-data"
v-infinite-scroll="load" v-infinite-scroll="load"
...@@ -26,6 +29,10 @@ ...@@ -26,6 +29,10 @@
v-for="(row, index) in tableData" v-for="(row, index) in tableData"
:key="index" :key="index"
> >
<div class="table-data-column" v-if="hasIndex" style="width: 0.4rem">
{{ index + 1 }}
</div>
<div style="width: calc(100% - 0.4rem); display: flex">
<div <div
v-for="(header, hIndex) in headers" v-for="(header, hIndex) in headers"
:key="hIndex" :key="hIndex"
...@@ -53,6 +60,7 @@ ...@@ -53,6 +60,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div v-if="tableData.length == 0" class="no-data"> <div v-if="tableData.length == 0" class="no-data">
<div class="inner"> <div class="inner">
<img src="@/assets/images/index/no-data.png" alt="" /> <img src="@/assets/images/index/no-data.png" alt="" />
...@@ -82,6 +90,10 @@ export default { ...@@ -82,6 +90,10 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
hasIndex: {
type: Boolean,
default: true,
},
}, },
data() { data() {
return { return {
......
<template> <template>
<div class="s-table"> <div class="s-table">
<div class="table-headers"> <div class="table-headers">
<div v-if="hasIndex" style="width: 0.4rem">序号</div>
<div style="width: calc(100% - 0.4rem); display: flex">
<div <div
v-for="(header, index) in headers" v-for="(header, index) in headers"
:key="index" :key="index"
...@@ -13,6 +15,7 @@ ...@@ -13,6 +15,7 @@
{{ header.name }} {{ header.name }}
</div> </div>
</div> </div>
</div>
<div <div
class="table-data" class="table-data"
v-infinite-scroll="load" v-infinite-scroll="load"
...@@ -26,6 +29,10 @@ ...@@ -26,6 +29,10 @@
v-for="(row, index) in tableData" v-for="(row, index) in tableData"
:key="index" :key="index"
> >
<div class="table-data-column" v-if="hasIndex" style="width: 0.4rem">
{{ index + 1 }}
</div>
<div style="width: calc(100% - 0.4rem); display: flex">
<div <div
v-for="(header, hIndex) in headers" v-for="(header, hIndex) in headers"
:key="hIndex" :key="hIndex"
...@@ -53,6 +60,7 @@ ...@@ -53,6 +60,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div v-if="tableData.length == 0" class="no-data"> <div v-if="tableData.length == 0" class="no-data">
<div class="inner"> <div class="inner">
...@@ -83,6 +91,10 @@ export default { ...@@ -83,6 +91,10 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
hasIndex: {
type: Boolean,
default: true,
},
}, },
data() { data() {
return { return {
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
> >
{{ zljc_score }} {{ zljc_score }}
</div> </div>
<div class="label">质量检测</div> <div class="label">工程质量</div>
</div> </div>
<div class="points"> <div class="points">
<div <div
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
> >
{{ score_count }} {{ score_count }}
</div> </div>
<div class="label">总得分</div> <div class="label">区域总得分</div>
</div> </div>
</div> </div>
<!-- <div class="switch-buttons"> <!-- <div class="switch-buttons">
...@@ -195,12 +195,9 @@ export default { ...@@ -195,12 +195,9 @@ export default {
props: "project_name", props: "project_name",
width: "70%", width: "70%",
headerStyle: { headerStyle: {
padding: "0 .2rem",
textAlign: "left", textAlign: "left",
}, },
style: { style: {},
padding: "0 .2rem",
},
align: "left", align: "left",
}, },
{ {
...@@ -214,20 +211,29 @@ export default { ...@@ -214,20 +211,29 @@ export default {
{ {
name: "工程名称", name: "工程名称",
props: "project_name", props: "project_name",
width: "70%", width: "45%",
headerStyle: { headerStyle: {
padding: "0 .2rem",
textAlign: "left", textAlign: "left",
}, },
style: { style: {},
padding: "0 .2rem",
},
align: "left", align: "left",
}, },
{ {
name: "质量评定得分", name: "质量评定",
props: "quality_score", props: "quality_score",
width: "30%", width: "20%",
slot: "quality_score",
},
{
name: "质量检测",
props: "quality_score",
width: "20%",
slot: "quality_score",
},
{
name: "总得分",
props: "quality_score",
width: "15%",
slot: "quality_score", slot: "quality_score",
}, },
], ],
...@@ -237,12 +243,9 @@ export default { ...@@ -237,12 +243,9 @@ export default {
props: "project_name", props: "project_name",
width: "70%", width: "70%",
headerStyle: { headerStyle: {
padding: "0 .2rem",
textAlign: "left", textAlign: "left",
}, },
style: { style: {},
padding: "0 .2rem",
},
align: "left", align: "left",
}, },
{ {
...@@ -336,28 +339,25 @@ export default { ...@@ -336,28 +339,25 @@ export default {
props: "project_name", props: "project_name",
width: "40%", width: "40%",
headerStyle: { headerStyle: {
padding: "0 .2rem",
textAlign: "left", textAlign: "left",
}, },
style: { style: {},
padding: "0 .2rem",
},
align: "left", align: "left",
}, },
{ {
name: "工程质量", name: "政府监管",
props: "project_num", props: "project_num",
width: "20%", width: "20%",
slot: "project_num", slot: "project_num",
}, },
{ {
name: "质量评定", name: "工程质量",
props: "score", props: "score",
width: "20%", width: "20%",
slot: "score", slot: "score",
}, },
{ {
name: "总得分", name: "工程总得分",
props: "score_count", props: "score_count",
width: "20%", width: "20%",
slot: "score_count", slot: "score_count",
...@@ -369,12 +369,9 @@ export default { ...@@ -369,12 +369,9 @@ export default {
props: "name", props: "name",
width: "calc(100% / 3)", width: "calc(100% / 3)",
headerStyle: { headerStyle: {
padding: "0 .2rem",
textAlign: "left", textAlign: "left",
}, },
style: { style: {},
padding: "0 .2rem",
},
align: "left", align: "left",
}, },
{ {
...@@ -382,12 +379,9 @@ export default { ...@@ -382,12 +379,9 @@ export default {
props: "value1", props: "value1",
width: "calc(100% / 3)", width: "calc(100% / 3)",
headerStyle: { headerStyle: {
padding: "0 .2rem",
textAlign: "left", textAlign: "left",
}, },
style: { style: {},
padding: "0 .2rem",
},
align: "left", align: "left",
// headerStyle: { // headerStyle: {
// fontSize: "0.13rem", // fontSize: "0.13rem",
...@@ -407,12 +401,9 @@ export default { ...@@ -407,12 +401,9 @@ export default {
width: "70%", width: "70%",
headerStyle: { headerStyle: {
padding: "0 .2rem",
textAlign: "left", textAlign: "left",
}, },
style: { style: {},
padding: "0 .2rem",
},
align: "left", align: "left",
}, },
{ {
...@@ -450,24 +441,16 @@ export default { ...@@ -450,24 +441,16 @@ export default {
name: "工程名称", name: "工程名称",
props: "project_name", props: "project_name",
width: "20%", width: "20%",
headerStyle: { headerStyle: {},
padding: "0 .2rem", style: {},
},
style: {
padding: "0 .2rem",
},
align: "left", align: "left",
}, },
{ {
name: "标段名称", name: "标段名称",
props: "prname", props: "prname",
width: "15%", width: "15%",
headerStyle: { headerStyle: {},
padding: "0 .2rem", style: {},
},
style: {
padding: "0 .2rem",
},
align: "left", align: "left",
}, },
{ {
...@@ -972,7 +955,6 @@ export default { ...@@ -972,7 +955,6 @@ export default {
echarts.registerMap(mapid, baseAreaJson); echarts.registerMap(mapid, baseAreaJson);
var outdata = []; //地图区域挂载数据 var outdata = []; //地图区域挂载数据
mapData.forEach(function (item, index) { mapData.forEach(function (item, index) {
console.log(item);
outdata.push({ outdata.push({
name: item.name, name: item.name,
id: item.id, id: item.id,
...@@ -1085,7 +1067,7 @@ export default { ...@@ -1085,7 +1067,7 @@ export default {
}, },
itemStyle: { itemStyle: {
normal: { normal: {
borderColor: "#2656bb", borderColor: "#6b97f2",
borderWidth: 1, borderWidth: 1,
color: "#032359", color: "#032359",
areaColor: "#23366f", areaColor: "#23366f",
...@@ -1131,7 +1113,6 @@ export default { ...@@ -1131,7 +1113,6 @@ export default {
type: "scatter", type: "scatter",
coordinateSystem: "geo", coordinateSystem: "geo",
symbol: (value, params) => { symbol: (value, params) => {
console.log(value);
if (value[2] < 80) { if (value[2] < 80) {
return ( return (
"image://" + require("@/assets/images/index/icon_hong.png") "image://" + require("@/assets/images/index/icon_hong.png")
...@@ -1149,7 +1130,6 @@ export default { ...@@ -1149,7 +1130,6 @@ export default {
label: { label: {
position: "inside", position: "inside",
formatter: function (params) { formatter: function (params) {
console.log(params);
return `${params.data.name}\n${params.data.value[2]}分`; return `${params.data.name}\n${params.data.value[2]}分`;
}, },
show: true, show: true,
...@@ -1164,8 +1144,11 @@ export default { ...@@ -1164,8 +1144,11 @@ export default {
}; };
myChart.clear(); myChart.clear();
myChart.setOption(option); myChart.setOption(option);
window.addEventListener("resize", function () { window.addEventListener("resize", () => {
myChart.resize(); // myChart.resize();
setTimeout(() => {
this.initMap();
}, 500);
}); });
myChart.off().on("click", (params) => { myChart.off().on("click", (params) => {
if (maplevel == 1 && params.componentType === "series") { if (maplevel == 1 && params.componentType === "series") {
...@@ -1181,7 +1164,6 @@ export default { ...@@ -1181,7 +1164,6 @@ export default {
streetName = params.name.split("|")[0]; streetName = params.name.split("|")[0];
areaGUID = params.name.split("|")[1]; areaGUID = params.name.split("|")[1];
} }
console.log(params);
this.currentCityId = params.data.id; this.currentCityId = params.data.id;
this.currentCityName = params.data.name; this.currentCityName = params.data.name;
this.switchList(1); this.switchList(1);
......
...@@ -4,12 +4,7 @@ ...@@ -4,12 +4,7 @@
<el-form-item label="所在地区:"> <el-form-item label="所在地区:">
<el-select></el-select> <el-select></el-select>
</el-form-item> </el-form-item>
<el-form-item label="政府监管:">
<el-select>
<el-option label="预警" value="1"></el-option>
<el-option label="正常" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工程名称:"> <el-form-item label="工程名称:">
<el-input></el-input> <el-input></el-input>
</el-form-item> </el-form-item>
...@@ -50,11 +45,16 @@ export default { ...@@ -50,11 +45,16 @@ export default {
{ {
label: "工程名称", label: "工程名称",
prop: "project_name", prop: "project_name",
minWidth: "600px", minWidth: "300px",
align: "left", align: "left",
}, },
{ label: "所属地区", prop: "city_name" }, { label: "所属地区", prop: "city_name" },
{ label: "创新创优得分", prop: "quality_score", hasSlot: true }, {
label: "创新创优得分",
prop: "quality_score",
hasSlot: true,
sortable: true,
},
], ],
dateRange: [], dateRange: [],
data: [ data: [
...@@ -157,7 +157,7 @@ export default { ...@@ -157,7 +157,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.search-form { .search-form {
margin: 20px 0 10px 0; margin: 20px 0 0px 0;
} }
.blue { .blue {
......
...@@ -4,24 +4,7 @@ ...@@ -4,24 +4,7 @@
<el-form-item label="所在地区:"> <el-form-item label="所在地区:">
<el-select></el-select> <el-select></el-select>
</el-form-item> </el-form-item>
<el-form-item label="质量检测:">
<el-select>
<el-option label="预警" value="1"></el-option>
<el-option label="正常" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="质量评定:">
<el-select>
<el-option label="预警" value="1"></el-option>
<el-option label="正常" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工程整体:">
<el-select>
<el-option label="预警" value="1"></el-option>
<el-option label="正常" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工程名称:"> <el-form-item label="工程名称:">
<el-input></el-input> <el-input></el-input>
</el-form-item> </el-form-item>
...@@ -67,12 +50,28 @@ export default { ...@@ -67,12 +50,28 @@ export default {
{ {
label: "工程名称", label: "工程名称",
prop: "project_name", prop: "project_name",
minWidth: "600px", minWidth: "300px",
align: "left", align: "left",
}, },
{ label: "所属地区", prop: "city_name" }, { label: "所属地区", prop: "city_name" },
{ label: "质量检测得分", prop: "quality_score", hasSlot: true }, {
{ label: "质量评定得分", prop: "quality_score2", hasSlot: true }, label: "质量检测得分",
prop: "quality_score",
hasSlot: true,
sortable: true,
},
{
label: "质量评定得分",
prop: "quality_score2",
hasSlot: true,
sortable: true,
},
{
label: "总得分",
prop: "quality_score2",
hasSlot: true,
sortable: true,
},
], ],
dateRange: [], dateRange: [],
// api: getWarningList, // api: getWarningList,
...@@ -175,7 +174,7 @@ export default { ...@@ -175,7 +174,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.search-form { .search-form {
margin: 20px 0 10px 0; margin: 20px 0 0px 0;
} }
.blue { .blue {
......
...@@ -4,12 +4,7 @@ ...@@ -4,12 +4,7 @@
<el-form-item label="所在地区:"> <el-form-item label="所在地区:">
<el-select></el-select> <el-select></el-select>
</el-form-item> </el-form-item>
<el-form-item label="工程整体:">
<el-select>
<el-option label="预警" value="1"></el-option>
<el-option label="正常" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工程名称:"> <el-form-item label="工程名称:">
<el-input></el-input> <el-input></el-input>
</el-form-item> </el-form-item>
...@@ -70,15 +65,40 @@ export default { ...@@ -70,15 +65,40 @@ export default {
{ {
label: "工程名称", label: "工程名称",
prop: "project_name", prop: "project_name",
minWidth: "350px", minWidth: "220px",
align: "left", align: "left",
}, },
{ label: "所属地区", prop: "city_name" }, { label: "所属地区", prop: "city_name" },
{ label: "政府监管得分", prop: "quality_score", hasSlot: true }, {
{ label: "质量检测得分", prop: "quality_score1", hasSlot: true }, label: "政府监管得分",
{ label: "质量评定得分", prop: "quality_score2", hasSlot: true }, prop: "quality_score",
{ label: "创新创优得分", prop: "quality_score3", hasSlot: true }, hasSlot: true,
{ label: "整体得分", prop: "quality_score4", hasSlot: true }, sortable: true,
},
{
label: "质量检测得分",
prop: "quality_score1",
hasSlot: true,
sortable: true,
},
{
label: "质量评定得分",
prop: "quality_score2",
hasSlot: true,
sortable: true,
},
{
label: "创新创优得分",
prop: "quality_score3",
hasSlot: true,
sortable: true,
},
{
label: "整体得分",
prop: "quality_score4",
hasSlot: true,
sortable: true,
},
], ],
dateRange: [], dateRange: [],
data: [ data: [
...@@ -231,7 +251,7 @@ export default { ...@@ -231,7 +251,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.search-form { .search-form {
margin: 20px 0 10px 0; margin: 20px 0 0px 0;
} }
.blue { .blue {
......
...@@ -4,12 +4,7 @@ ...@@ -4,12 +4,7 @@
<el-form-item label="所在地区:"> <el-form-item label="所在地区:">
<el-select></el-select> <el-select></el-select>
</el-form-item> </el-form-item>
<el-form-item label="政府监管:">
<el-select>
<el-option label="预警" value="1"></el-option>
<el-option label="正常" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工程名称:"> <el-form-item label="工程名称:">
<el-input></el-input> <el-input></el-input>
</el-form-item> </el-form-item>
...@@ -51,11 +46,16 @@ export default { ...@@ -51,11 +46,16 @@ export default {
{ {
label: "工程名称", label: "工程名称",
prop: "project_name", prop: "project_name",
minWidth: "600px", minWidth: "300px",
align: "left", align: "left",
}, },
{ label: "所属地区", prop: "city_name" }, { label: "所属地区", prop: "city_name" },
{ label: "政府监管得分", prop: "quality_score", hasSlot: true }, {
label: "政府监管得分",
prop: "quality_score",
hasSlot: true,
sortable: true,
},
], ],
dateRange: [], dateRange: [],
data: [ data: [
...@@ -145,7 +145,7 @@ export default { ...@@ -145,7 +145,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.search-form { .search-form {
margin: 20px 0 10px 0; margin: 20px 0 0px 0;
} }
.blue { .blue {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment