From 098ce319738b1119e7307e12ef32e174eba1630e Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期一, 15 三月 2021 18:21:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
public/index.html | 3
src/assets/css/map/map-panel-style.less | 172 ++++++++-----------
src/components/table/components/IndexStatistics.vue | 189 +++++++-------------
src/components/table/components/Warn.vue | 152 +++++-----------
4 files changed, 191 insertions(+), 325 deletions(-)
diff --git a/public/index.html b/public/index.html
index 396d79c..d50d35b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -16,13 +16,10 @@
<div id="app"></div>
<!-- built files will be auto injected -->
<script type="text/javascript">
- /* 杩欓噷鎴戜滑鍒╃敤浜嗕竴涓嚜鎵ц鍑芥暟 */
(function(){
change();
function change(){
- console.log( document.documentElement.clientWidth*12/640 +'px')
//html鐨� font-size 鐨勫ぇ灏忓昂瀵�
- //杩欓噷鐨刪tml瀛椾綋澶у皬鍒╃敤浜嗕竴涓畝鍗曠殑鏁板鍏紡锛屽綋鎴戜滑榛樿璁剧疆浠ュ睆骞�320px浣嶅熀鍑嗘鏃剁殑瀛椾綋澶у皬涓�20px(320 20px),閭ｄ箞娴忚鍣ㄧ獥鍙ｅぇ灏忔敼鍙樼殑鏃跺�欐柊鐨刪tml鐨刦ontSize锛坈lientWidth 鏂扮殑鍊硷級灏辨槸clientWidth*20/320
document.documentElement.style.fontSize = document.documentElement.clientWidth/12 +'px';
}
/* 鐩戝惉绐楀彛澶у皬鍙戠敓鏀瑰彉鏃�*/
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 19301da..e038a0a 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -1,90 +1,82 @@
@import "_map-variable";
-
-.el-button--primary {
- color: @color;
- background-color: @background-color;
- border-color: @color;
+.el-button--primary{
+ color: @color;
+ background-color: @background-color;
+ border-color: @color;
}
-.el-tabs {
- .el-tabs__item {
- padding: 0 10px;
- text-align: center;
- height: 20px;
- line-height: 20px;
+.el-tabs{
+ .el-tabs__item{
+ padding: 0 10px;
+ text-align: center;
+ height: 20px;
+ line-height: 20px;
- color: @color;
- cursor: pointer;
- -ms-flex-negative: 0;
- flex-shrink: 0;
+ color: @color;
+ cursor: pointer;
+ -ms-flex-negative: 0;
+ flex-shrink: 0;
}
}
-
-.el-tabs__header {
+.el-tabs__header{
font-size: .08333rem;
line-height: .10938rem;
- background: rgba(0, 255, 246, .14);
+ // background: rgba(0,255,246,.14);
}
-
-.el-dialog {
+.el-dialog{
border: 0.00521rem solid @color;
box-shadow: 0 0 0.03rem @color;
background: rgba(0, 16, 30, 0.8);
border-radius: 0.05208rem;
- .el-dialog__title {
+ .el-dialog__title{
padding: .03125rem .08333rem;
color: @color;
cursor: pointer;
flex-shrink: 0;
}
}
-
.select-down {
- border: none !important;
- background-color: @background-color;
+ border: none !important;
+ background-color: @background-color ;
- //.el-scrollbar{
- //
- // background-color: @background-color !important;
- // }
- // .el-scrollbar__view .el-select-dropdown__list{
- // background-color: @background-color !important;
- // }
- .el-select-dropdown__item.hover {
- background-color: @background-color-light;
- }
-
- .el-select-dropdown__item {
- color: @color;
- //background-color: @background-color;
- }
-
- // .el-select-dropdown{
- // border: none !important;
- // background-color: @background-color !important;
- // }
- // .el-select-dropdown__empty{
- // color: @color;
- // background-color: @background-color;
- // }
- .popper__arrow::after {
- border-bottom-color: @color;
- }
+ //.el-scrollbar{
+ //
+ // background-color: @background-color !important;
+ // }
+ // .el-scrollbar__view .el-select-dropdown__list{
+ // background-color: @background-color !important;
+ // }
+ .el-select-dropdown__item.hover{
+ background-color: @background-color-light;
+ }
+ .el-select-dropdown__item {
+ color: @color;
+ //background-color: @background-color;
+ }
+ // .el-select-dropdown{
+ // border: none !important;
+ // background-color: @background-color !important;
+ // }
+ // .el-select-dropdown__empty{
+ // color: @color;
+ // background-color: @background-color;
+ // }
+ .popper__arrow::after{
+ border-bottom-color: @color ;
+ }
}
-.el-tabs {
+.el-tabs{
.el-tabs__item {
height: 40px;
line-height: 40px;
}
}
-
-.el-table th, .el-table tr {
+.el-table th, .el-table tr{
background-color: transparent;
}
-
-.el-table {
+.el-table{
color: @color;
background: transparent;
@@ -92,52 +84,45 @@
color: #ffffff;
font-weight: 500;
}
-
- thead.is-group th {
+ thead.is-group th{
background: transparent;
}
-
.el-table__expanded-cell {
- background: transparent;
- }
+ background: transparent;
+ }
}
-
-.map-input {
- input {
+.map-input{
+ input{
border-radius: 0;
- background-color: @background-color-light;
- border: solid 1px @color;
+ background-color: @background-color-light ;
+ border: solid 1px @color ;
}
}
-.map-tooltip.is-dark {
- font-size: .08333rem;
- color: @color-highlight;
- background: @background-color;
+.map-tooltip.is-dark{
+ font-size: .08333rem ;
+ color: @color-highlight ;
+ background: @background-color ;
border-radius: .03rem;
- padding: .05rem;
+ padding: .05rem ;
}
-
-.map-btn-unactive {
- color: @color;
- border: .00521rem solid @color;
- box-shadow: 0 0 .03rem @color;
+.map-btn-unactive{
+ color: @color ;
+ border: .00521rem solid @color ;
+ box-shadow: 0 0 .03rem @color ;
}
-
-.map-btn-active {
- color: @color-highlight;
- border: .00521rem solid @color-highlight;
- box-shadow: 0 0 .03rem @color-highlight;
+.map-btn-active{
+ color: @color-highlight ;
+ border: .00521rem solid @color-highlight ;
+ box-shadow: 0 0 .03rem @color-highlight ;
}
-
-.map-btn-background {
+.map-btn-background{
background: @background-color;
//border: .00521rem solid @color;
//box-shadow: 0 0 .03rem @color;
//border-radius: .05208rem;
}
-
-.map-background {
+.map-background{
//color: @color;
border: .00521rem solid @color;
box-shadow: 0 0 .03rem @color;
@@ -145,37 +130,26 @@
//padding: .05rem !important;
border-radius: .05208rem;
}
-
.map-under-line {
height: 1px;
background: @background-color-split;
margin-block-start: 0;
margin-block-end: 0;
}
-
.tools-panel-content {
border: 1px solid @background-color-tools;
background: @background-color-tools;
padding: 0;
- width: 90px;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-evenly;
-
.el-button {
padding: 0;
- margin: 5px;
- width: 30px;
- height: 30px;
+ margin: 10px;
+ width: 45px;
+ height: 45px;
background: @background-color-tools;
vertical-align: middle !important;
-
img {
width: 16px;
height: 16px;
}
}
-}
-.el-popper[x-placement^=bottom] .popper__arrow::after {
- border-bottom-color: @background-color-tools;
}
diff --git a/src/components/table/components/IndexStatistics.vue b/src/components/table/components/IndexStatistics.vue
index f38b288..c82e142 100644
--- a/src/components/table/components/IndexStatistics.vue
+++ b/src/components/table/components/IndexStatistics.vue
@@ -1,103 +1,85 @@
<template>
<el-tabs v-model="activeName">
<el-tab-pane label="鎸囨爣缁熻" name="first"><el-table
- :data="tableData"
- style="width: 100%">
+ :data="tableData">
<el-table-column
- prop="date"
- label="搴忓彿"
- width="150">
+ type="index"
+ label="搴忓彿">
</el-table-column>
<el-table-column
prop="date"
- label="鍗曚綅鍚嶇О"
- width="150">
+ label="鍗曚綅鍚嶇О">
</el-table-column>
<el-table-column
- prop="date"
- label="宸ヤ笟鍙栨按閲�(m3)"
- width="150">
+ prop="province"
+ label="宸ヤ笟鍙栨按閲�(m3)">
</el-table-column>
<el-table-column
- prop="date"
- label="澶栨帓搴熸按閲�(m3)"
- width="150">
+ prop="province"
+ label="澶栨帓搴熸按閲�(m3)">
</el-table-column>
<el-table-column
- prop="date"
- label="宸ヤ笟搴熸皵鎺掓斁閲�(m3)"
- width="150">
+ prop="province"
+ label="宸ヤ笟搴熸皵鎺掓斁閲�(m3)">
</el-table-column>
<el-table-column label="COD(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="姘ㄦ爱(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="浜屾哀鍖栫～(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="姘哀鍖栫墿(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="VOCs(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
<el-table-column label="鍥哄簾(t)">
<el-table-column
prop="province"
- label="绱浜х敓閲�"
- width="120">
+ label="绱浜х敓閲�">
</el-table-column>
<el-table-column
prop="city"
- label="褰撴湀浜х敓閲�"
- width="120">
+ label="褰撴湀浜х敓閲�">
</el-table-column>
</el-table-column>
</el-table></el-tab-pane>
@@ -106,96 +88,83 @@
style="width: 100%"
max-height="250">
<el-table-column
- fixed
+ type="index"
+ label="搴忓彿">
+ </el-table-column>
+ <el-table-column
prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
+ label="浼佷笟鍚嶇О">
</el-table-column>
<el-table-column
prop="name"
- label="搴熸按杈炬爣鐜�"
- width="120">
+ label="搴熸按杈炬爣鐜�">
</el-table-column>
<el-table-column
prop="province"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="city"
- label="搴熸皵杈炬爣鐜�"
- width="120">
+ label="搴熸皵杈炬爣鐜�">
</el-table-column>
<el-table-column
prop="address"
- label="鍚嶆"
- width="300">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="zip"
- label="浼犺緭鐜�"
- width="120">
+ label="浼犺緭鐜�">
</el-table-column>
<el-table-column
prop="zip"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="zip"
- label="璁惧瀹屽ソ鐜�"
- width="120">
+ label="璁惧瀹屽ソ鐜�">
</el-table-column>
<el-table-column
prop="zip"
- label="鎺掑悕"
- width="120">
+ label="鎺掑悕">
</el-table-column>
</el-table></el-tab-pane>
<el-tab-pane label="鎺掓斁鐐规帓鍚�" name="third"><el-table
- :data="tableData"
- style="width: 100%"
- max-height="250">
+ :data="tableData">
<el-table-column
- fixed
+ type="index"
+ label="搴忓彿">
+ </el-table-column>
+ <el-table-column
prop="date"
- label="鎺掓斁鐐瑰悕绉�"
- width="150">
+ label="鎺掓斁鐐瑰悕绉�">
</el-table-column>
<el-table-column
prop="name"
- label="鎺掓斁绫诲瀷"
- width="120">
+ label="鎺掓斁绫诲瀷">
</el-table-column>
<el-table-column
prop="province"
- label="杈炬爣鐜�"
- width="120">
+ label="杈炬爣鐜�">
</el-table-column>
<el-table-column
prop="city"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="address"
- label="浼犺緭鐜�"
- width="300">
+ label="浼犺緭鐜�">
</el-table-column>
<el-table-column
prop="zip"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
<el-table-column
prop="zip"
- label="璁惧瀹屽ソ鐜�"
- width="120">
+ label="璁惧瀹屽ソ鐜�">
</el-table-column>
<el-table-column
prop="zip"
- label="鍚嶆"
- width="120">
+ label="鍚嶆">
</el-table-column>
</el-table></el-tab-pane>
</el-tabs>
@@ -208,53 +177,25 @@
return {
activeName: 'first',
tableData: [{
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
+ date: '闆嗗洟鍏徃',
+ name: '35',
+ province: '23',
+ city: '11',
+ address: 235,
+ zip: 23
+ }, {
+ date: '澶╂触鐭冲寲',
+ name: 32,
+ province: 33,
+ city: 44,
+ address: 53,
zip: 200333
}, {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-08',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-06',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-07',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
+ date: '娴庡崡鐐煎寲',
+ name: 35,
+ province: 13,
+ city: 33,
+ address: 44,
zip: 200333
}]
}
diff --git a/src/components/table/components/Warn.vue b/src/components/table/components/Warn.vue
index efc2577..fee998e 100644
--- a/src/components/table/components/Warn.vue
+++ b/src/components/table/components/Warn.vue
@@ -1,169 +1,144 @@
<template>
<el-tabs v-model="activeName">
<el-tab-pane label="瀹炴椂缁熻" name="first">
+ <el-scrollbar style="width:100%">
<el-table
- :data="tableData"
- style="width: 100%">
+ :data="tableData">
<el-table-column
prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
+ label="浼佷笟鍚嶇О">
</el-table-column>
<el-table-column label="搴熸按(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="搴熸皵(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="鍥哄簾(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="纭寲姘�(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="鍙噧姘斾綋(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
</el-table>
+ </el-scrollbar>
</el-tab-pane>
<el-tab-pane label="褰撴湀缁熻" name="second">
<el-table
- :data="tableData"
- style="width: 100%">
+ :data="tableData">
<el-table-column
prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
+ label="浼佷笟鍚嶇О">
</el-table-column>
<el-table-column label="搴熸按(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="搴熸皵(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="鍥哄簾(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="纭寲姘�(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="鍙噧姘斾綋(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="涓婃湀缁熻" name="third">
<el-table
- :data="tableData"
- style="width: 100%">
+ :data="tableData">
<el-table-column
prop="date"
- label="浼佷笟鍚嶇О"
- width="150">
+ label="浼佷笟鍚嶇О">
</el-table-column>
<el-table-column label="搴熸按(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="搴熸皵(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
<el-table-column
prop="name"
- label="鎶ヨ"
- width="120">
+ label="鎶ヨ">
</el-table-column>
</el-table-column>
<el-table-column label="鍥哄簾(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="纭寲姘�(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
<el-table-column label="鍙噧姘斾綋(涓�)">
<el-table-column
prop="name"
- label="棰勮"
- width="120">
+ label="棰勮">
</el-table-column>
</el-table-column>
</el-table>
@@ -177,54 +152,33 @@
return {
activeName: 'first',
tableData: [{
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
+ date: '闆嗗洟鍏徃',
+ name: 1,
+ province: 1,
+ city: 0,
+ address: 1,
+ zip: 0
}, {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
+ date: '澶╂触鐭冲寲',
+ name: 1,
+ province: 0,
+ city: 1,
+ address: 1,
+ zip: 2
}, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
+ date: 'XXX鐐煎寲',
+ name: 1,
+ province: 2,
+ city: 0,
+ address: 0,
+ zip: 1
}, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-08',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-06',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
- }, {
- date: '2016-05-07',
- name: '鐜嬪皬铏�',
- province: '涓婃捣',
- city: '鏅檧鍖�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- zip: 200333
+ date: 'XXX鐐煎寲2',
+ name: 1,
+ province: 2,
+ city: 0,
+ address: 0,
+ zip: 1
}]
}
}
--
Gitblit v1.8.0