Skip to content

Q
quality-dynamic
Commit b632451c authored by 张牧越's avatar 张牧越
Browse files
Options

fix

parent e1ba11c1
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 53 deletions
package-lock.json
View file @ b632451c
......@@ -21,6 +21,7 @@
"videojs-contrib-hls": "^5.15.0",
"vue": "^2.6.14",
"vue-calendar-component": "^2.8.2",
"vue-count-to": "^1.0.13",
"vue-router": "^3.5.2",
"vue-seamless-scroll": "^1.1.23",
"vue-video-player": "^5.0.1",
......@@ -13496,6 +13497,11 @@
"integrity": "sha512-LluhjWTZmpGl3tiXg51EciF+T70IN/9t6UvfmgluJBqxbrb6OV9i7L5lTd+OKtcTeghDkhcBmYhtTxxU4w/8sQ==",
"dev": true
},
"node_modules/vue-count-to": {
"version": "1.0.13",
"resolved": "https://registry.npmmirror.com/vue-count-to/-/vue-count-to-1.0.13.tgz",
"integrity": "sha512-6R4OVBVNtQTlcbXu6SJ8ENR35M2/CdWt3Jmv57jOUM+1ojiFmjVGvZPH8DfHpMDSA+ITs+EW5V6qthADxeyYOQ=="
},
"node_modules/vue-eslint-parser": {
"version": "8.3.0",
"resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz",
......@@ -24742,6 +24748,11 @@
"integrity": "sha512-LluhjWTZmpGl3tiXg51EciF+T70IN/9t6UvfmgluJBqxbrb6OV9i7L5lTd+OKtcTeghDkhcBmYhtTxxU4w/8sQ==",
"dev": true
},
"vue-count-to": {
"version": "1.0.13",
"resolved": "https://registry.npmmirror.com/vue-count-to/-/vue-count-to-1.0.13.tgz",
"integrity": "sha512-6R4OVBVNtQTlcbXu6SJ8ENR35M2/CdWt3Jmv57jOUM+1ojiFmjVGvZPH8DfHpMDSA+ITs+EW5V6qthADxeyYOQ=="
},
"vue-eslint-parser": {
"version": "8.3.0",
"resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz",
src/assets/common/element.less
View file @ b632451c
......@@ -173,7 +173,7 @@
}
.search-form .el-form-item__label {
font-size: 14px;
font-size: 12px;
color: #60FFF6;
padding-left: 8px;
}
......
src/components/Header.vue
View file @ b632451c
......@@ -10,7 +10,7 @@
<div class="right-nav">
<span @click="returnManage">
<img src="@/assets/images/return_icon.jpg" alt="" />
返回管理端
功能入口
</span>
<!-- <img :src="userInfo.op_avatar" alt="" />
{{ userInfo.op_name }} -->
......
src/components/common/DialogApiDataTable.vue
View file @ b632451c
......@@ -13,6 +13,7 @@
label="序号"
type="index"
align="center"
width="80"
></el-table-column>
<template v-for="(column, cIndex) in columns">
<!-- 无插槽 -->
......
src/utils/request.js
View file @ b632451c
......@@ -42,7 +42,6 @@ const request = axios.create({
request.interceptors.request.use(
config => {
console.log(config)
// const Authorization = localStorage.getItem('maToken')
// if (Authorization) {
// config.headers['Authorization'] = Authorization
......
src/views/DataStatis/Index.vue
View file @ b632451c
......@@ -79,32 +79,19 @@
<span class="show-more" @click="showCityList">查看更多</span>
</template>
<div class="get-points">
<div class="points">
<div
class="grade"
:style="{ color: zfjg_score < 80 ? '#f86262' : '#5aefd1' }"
>
{{ zfjg_score }}
</div>
<div class="label">政府监管</div>
</div>
<div class="points">
<div
class="grade"
:style="{ color: zljc_score < 80 ? '#f86262' : '#5aefd1' }"
>
{{ zljc_score }}
</div>
<div class="label">工程质量</div>
</div>
<div class="points">
<div
class="grade"
:style="{ color: score_count < 80 ? '#f86262' : '#5aefd1' }"
>
{{ score_count }}
<div class="label">区域总得分：</div>
<countTo
ref="countTo"
:startVal="0"
:endVal="score_count"
:duration="3000"
></countTo>
</div>
<div class="label">区域总得分</div>
</div>
</div>
<!-- <div class="switch-buttons">
......@@ -119,7 +106,7 @@
</div>
</div> -->
<STable2
:style="{ marginTop: '.1rem', height: 'calc(100% - 1rem)' }"
:style="{ marginTop: '.1rem', height: 'calc(100% - .6rem)' }"
:headers="header4_1"
:table-data="data4"
>
......@@ -129,22 +116,37 @@
:style="{
color: scope.row.regulation_score < 80 ? '#f86262' : '',
}"
>{{ scope.row.regulation_score }}</span
>
<countTo
:startVal="0"
:endVal="Number(scope.row.regulation_score)"
:duration="3000"
></countTo>
</span>
</template>
<template v-if="scope.header.slot == 'quality_total_score'">
<span
:style="{
color: scope.row.quality_total_score < 80 ? '#f86262' : '',
}"
>{{ scope.row.quality_total_score }}</span
>
<countTo
:startVal="0"
:endVal="Number(scope.row.quality_total_score)"
:duration="3000"
></countTo
></span>
</template>
<template v-if="scope.header.slot == 'total_score'">
<span
:style="{ color: scope.row.total_score < 80 ? '#f86262' : '' }"
>{{ scope.row.total_score }}</span
>
<countTo
:startVal="0"
:endVal="Number(scope.row.total_score)"
:duration="3000"
></countTo
></span>
</template>
</template>
</STable2>
......@@ -201,12 +203,14 @@ import zhejiangMapData from "@/assets/data/mapData.json";
import Section2 from "@/components/common/Section2.vue";
import STable2 from "@/components/common/STable2.vue";
import ProjectList from "@/views/DataStatis/project/Index.vue";
import CountTo from "vue-count-to";
export default {
name: "DataStatis",
components: {
Section2,
STable2,
ProjectList,
CountTo,
},
data() {
return {
......@@ -514,6 +518,7 @@ export default {
zljc_score: 0,
score_count: 0,
projectListVisible: false,
showNumber: false,
};
},
methods: {
......@@ -729,16 +734,17 @@ export default {
switchList(type) {
this.activeTab = type;
this.data4 = [];
this.showNumber = false;
getProjectList({ city_id: this.currentCityId, limit: 20 }, false).then(
(res) => {
this.data4 = res.data.data;
}
);
getScoreStatusByCity(this.currentCityId).then((res) => {
this.zfjg_score = res.data.zfjg_score;
this.zljc_score = res.data.zljc_score;
this.score_count = res.data.score_count;
this.$nextTick(() => {
this.showNumber = true;
});
});
// if (type == 1) {
......@@ -976,8 +982,9 @@ export default {
show: false,
},
itemStyle: {
areaColor: "#2a5dc6",
areaColor: "#5677ef",
borderColor: "#14ddf5",
borderWidth: 2,
},
},
itemStyle: {
......@@ -1066,9 +1073,13 @@ export default {
});
myChart.off().on("click", (params) => {
if (maplevel == 1 && params.componentType === "series") {
if (this.currentCityName == params.data.name) {
this.currentCityName = "";
return;
}
var streetName = null;
var areaGUID = null;
console.log(params);
if (params.seriesType == "map") {
// 地图
streetName = params.data.name;
......@@ -1248,29 +1259,33 @@ export default {
justify-content: space-around;
margin-top: 10px;
.points {
width: calc(100% / 3 - calc(8px / 3));
background: url("@/assets/images/index/grade-bg.png");
width: 100%;
background: url("@/assets/images/value_bg.png");
background-repeat: no-repeat;
background-size: 100% 100%;
margin-right: 4px;
height: 80px;
height: 40px;
&:last-child {
margin-right: 0;
}
.label {
width: 70%;
margin: 0 auto;
text-align: center;
line-height: 36px;
line-height: 40px;
color: #bdcae4;
border-top: 1px solid rgba(255, 255, 255, 0.7);
font-size: 14px;
display: inline-block;
vertical-align: top;
}
.grade {
line-height: 44px;
text-align: center;
font-size: 24px;
font-size: 20px;
text-align: center;
line-height: 40px;
font-weight: bold;
}
span {
line-height: 40px;
}
}
}
......
src/views/DataStatis/project/CXCY.vue
View file @ b632451c
......@@ -2,7 +2,7 @@
<div class="dialog-body-container">
<el-form inline :model="searchForm" class="search-form">
<el-form-item label="所在地区：">
<el-select v-model="searchForm.city_id">
<el-select v-model="searchForm.city_id" size="small">
<el-option
v-for="city in cities"
:label="city.name"
......@@ -13,10 +13,12 @@
</el-form-item>
<el-form-item label="工程名称：">
<el-input v-model="searchForm.project_name"></el-input>
<el-input v-model="searchForm.project_name" size="small"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button type="primary" @click="handleSearch" size="small"
>查询</el-button
>
</el-form-item>
</el-form>
<DialogApiDataTable
......
src/views/DataStatis/project/GCZL.vue
View file @ b632451c
......@@ -2,7 +2,7 @@
<div class="dialog-body-container">
<el-form inline :model="searchForm" class="search-form">
<el-form-item label="所在地区：">
<el-select v-model="searchForm.city_id">
<el-select v-model="searchForm.city_id" size="small">
<el-option
v-for="city in cities"
:label="city.name"
......@@ -13,10 +13,12 @@
</el-form-item>
<el-form-item label="工程名称：">
<el-input v-model="searchForm.project_name"></el-input>
<el-input v-model="searchForm.project_name" size="small"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button type="primary" @click="handleSearch" size="small"
>查询</el-button
>
</el-form-item>
</el-form>
<DialogApiDataTable
......
src/views/DataStatis/project/ProjectDetail.vue
View file @ b632451c
......@@ -2,7 +2,7 @@
<div class="dialog-body-container">
<el-form inline :model="searchForm" class="search-form">
<el-form-item label="所在地区：">
<el-select v-model="searchForm.city_id">
<el-select v-model="searchForm.city_id" size="small">
<el-option
v-for="city in cities"
:label="city.name"
......@@ -13,10 +13,12 @@
</el-form-item>
<el-form-item label="工程名称：">
<el-input v-model="searchForm.project_name"></el-input>
<el-input v-model="searchForm.project_name" size="small"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button type="primary" @click="handleSearch" size="small"
>查询</el-button
>
</el-form-item>
</el-form>
<DialogApiDataTable
......
src/views/DataStatis/project/ZFJG.vue
View file @ b632451c
......@@ -2,7 +2,7 @@
<div class="dialog-body-container">
<el-form inline :model="searchForm" class="search-form">
<el-form-item label="所在地区：">
<el-select v-model="searchForm.city_id">
<el-select v-model="searchForm.city_id" size="small">
<el-option
v-for="city in cities"
:label="city.name"
......@@ -13,10 +13,12 @@
</el-form-item>
<el-form-item label="工程名称：">
<el-input v-model="searchForm.project_name"></el-input>
<el-input v-model="searchForm.project_name" size="small"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
<el-button type="primary" @click="handleSearch" size="small"
>查询</el-button
>
</el-form-item>
</el-form>
<DialogApiDataTable
......
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