Skip to content

Z
ZiBoYingJI
Commit f9487c61 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

Merge branch 'master' into rev2

parents c40ebf27 5c21331d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3965 additions and 14 deletions
public/datav/css/common.css 0 → 100644
View file @ f9487c61
body, h1, h2, h3, h4, h5, h6, hr, p, blockquote, dl, dt, dd, ul, ol, li, pre, form, fieldset, legend, button, input, textarea, th, td{margin:0px;padding:0px}
li{list-style:none;}
body{overflow:hidden;}
.body1X, .body2X{display:none;}
.kmb-message-box{position:relative;display:inline-block;padding-bottom:10px;vertical-align:middle;background-color:#fff;border-radius:4px;border:1px solid #e6ebf5;font-size:18px;box-shadow:0 2px 12px 0 rgb(0 0 0 / 10%);text-align:left;overflow:hidden;backface-visibility:hidden;}
.cm-layout{height:100%;width:100%;}
.cm-layout.flex-col{display:flex;flex-direction:column;}
.cm-layout .colf{color:#fff;}
.cm-layout .font18{font-size:.18rem;}
.cm-layout .font20{font-size:.20rem;}
.cm-layout .font22{font-size:.22rem;}
.cm-layout .font24{font-size:.24rem;}
.cm-layout .font26{font-size:.26rem;}
.cm-layout .font28{font-size:.28rem;}
.cm-layout .ft16{font-size:16px;}
.cm-layout .ft18{font-size:18px;}
.cm-layout .ft20{font-size:20px;}
.cm-layout .ft24{font-size:24px;}
.cm-layout .between{display:flex;justify-content:space-between;}
.cm-layout .ctn-place, .cm-layout .ctn-fix{display:flex;}
.cm-layout .ctn-place>div, .cm-layout .ctn-fix>div{flex:1;position:relative;}
.cm-layout .fix-m1{display:flex;}
.cm-layout .flex1{flex:1;}
.cm-layout .fix-rc{justify-content:center;}
.cm-layout .fix-cc{align-items:center;}
.cm-layout .fix-rcc{align-items:center;justify-content:center;}
.cm-layout .grid2{display:grid;grid-template-columns:50% 50%;}
.cm-layout .grid3{display:grid;grid-template-columns:33.33% 33.33% 33.33%;}
.cm-layout .grid4{display:grid;grid-template-columns:25% 25% 25% 25%;}
.cm-layout .abs-flex{position:absolute;display:flex;}
.cm-layout .flex-rel{flex:1;position:relative;}
.cm-layout .flex-disf{flex:1;display:flex;}
.cm-layout .disf-col{display:flex;flex-direction:column;}
.cm-layout .flex-disf-col{flex:1;display:flex;flex-direction:column;}
.cm-layout .flex-disf-rel{flex:1;display:flex;position:relative;}
.cm-layout .ctn-rel{position:relative;}
.cm-layout .rel-flex{position:relative;display:flex;}
.cm-layout .ctn-abs{position:absolute;top:0;left:0;}
.cm-layout .abs-full, .cm-layout .ctn-absfull{position:absolute;top:0;left:0;height:100%;width:100%;}
.cm-layout .ctn-range .ctn-abs{height:100%;width:100%;}
.cm-layout .km-table{}
.cm-layout .km-table .table-box{text-align:center;}
.cm-layout .km-table dl{display:table;width:100%;}
.cm-layout .km-table dt>div, .cm-layout .km-table dd>div{display:table-cell;}
.cm-layout .km-table dt, .cm-layout .km-table dd{display:table-row;}
.cm-layout .km-table dt{font-weight:bold;}
.cm-layout .km-table dd{}
.cm-layout .km-table .border dl{border:1px solid #eef1f6;}
.cm-layout .km-table .border dt>div, .cm-layout .km-table .border dd>div{border-width:0 1px 1px 0;border-style:solid;border-color:#677290 #acb6d9;}
.cm-layout .km-table .bg44{background-color:#4476f9;}
.cm-layout .km-table .col00a{color:#00a4fe;}
.cm-layout .km-table .even-bg1 dd:nth-child(even){background-color:rgba(14,45,109,.8);}
.cm-layout .tinfo{color:#888;font-size:13px;border-width:0 0px 1px 1px;border-style:solid;border-color:#dfe6ec;}
.cm-layout .tinfo .tr{display:flex;}
.cm-layout .tinfo .td{padding:8px 5px;min-height:40px;border-width:1px 1px 0 0;border-style:solid;border-color:#dfe6ec;flex:1;display:flex;justify-content:center;align-items:center;}
.cm-layout .tinfo .td .cell{flex:1;display:flex;}
.cm-layout .tinfo .td font{white-space: nowrap;}
.cm-layout .tinfo .td span{color:#000;font-size:15px;}
.cm-layout .tinfo .td i{font-style:normal}
/* 文字定位 */
.cm-layout .text-abs{position:absolute;height:0;width:0;display:flex;justify-content:center;align-items:center;}
.cm-layout .text-abs a, .cm-layout .text-abs span{white-space:nowrap;text-align:center;}
/**/
.Screen .bg-o85{background-color:rgba(13,29,55, .85);}
.Screen .bg2-o80{background-color:rgba(4,23,63,.8);}
.Screen .bd-c1{border-color:#0394d0;}
.Screen .linef35{height:35px;line-height:35px;}
.Screen .linef40{height:40px;line-height:40px;}
.Screen .line50{height:.50rem;line-height:.50rem;}
.Screen .line42{height:.42rem;line-height:.42rem;}
.Screen .col02d{color:#02daff}
.Screen .col-green1{color:#03fd78}
.Screen .col-red1{color:#fb2b2b}
.Screen .col01f{color:#01f5ff}
.home_manage{}
.home_manage li{list-style:none;}
.page-bgc1{background-color:#f5f6fb;}
.common-page{flex:1;position:relative;display:flex;flex-direction:column;}
.common-page.page-t1{padding:.16rem;background-color:#f5f6fb;}
.common-page.dege{margin-right:1.041vw;}
.common-page h3{line-height:40px;margin:0;padding:0 0 0 10px;font-weight:normal;font-size:16px;color:#000;}
.common-page .page-row{margin-top:10px;}
.common-page .option{}
.common-page .panel-bottom{flex:1;display:flex;flex-direction:column;background-color:#fff;}
.common-page .cr-liner{height:100%;width:100%;}
.common-page .option .head-container{padding:9px;background-color:#fff;border-radius:5px;display:flex;align-items:center;border:1px solid #c9c9fe;}
.common-page .content-within{position:relative;flex:1;width:100%;}
.common-page .content-fix{width:100%;}
.common-page .content-between{display:flex;justify-content:space-between;}
.common-page .ctin-box{/* flex:1; */display:flex;padding:5px 10px 10px;border-radius:5px;}
.common-page .ctin-box .toolbar{padding:5px 0 10px;display:flex;}
.common-page .ctin-box .toolbar>div{flex:1;}
.common-page .ctin-box .toolbar>div:last-child{display:flex;justify-content:right;flex:none;}
.common-page .el-table{}
.common-page .el-table .thead{color:#666}
.common-page .el-table .red{color:#ff0000;}
.common-page .el-table .orange{color:orange;}
.common-page .el-table .yellow{color:yellow;}
.common-page .el-table .blue{color:blue;}
.common-page .el-table .green{color:#13ce66;}
.common-page .el-table .normal{color:#666;}
.common-page .el-table th, .common-page .el-table td{}
.common-page .el-table--small th{padding:10px 0;}
.common-page .el-table--small td{padding:7px 0;}
.common-page .el-table th>.cell, .common-page .el-table td>.cell{padding:0 6px;}
.common-page .el-date-editor .el-range-separator, .kmb-message-box .el-date-editor .el-range-separator{width:20px;}
/* 定义 button 默认样式 */
.kmb-message-box .el-button-group .cu-btn-null{color:#409eff;background:#ecf5ff;border-color:#b3d8ff;}
/* 自定义选择列表 */
.checkboxctn{max-height:70vh;overflow-y:auto;}
.checkboxctn li{line-height:25px;}
.checkboxctn::-webkit-scrollbar{width:5px;height:5px;cursor:pointer;}
.checkboxctn::-webkit-scrollbar-thumb{border-radius:10px;background:#bbb;margin-right:10px;cursor:pointer;}
.checkboxctn::-webkit-scrollbar-thumb:hover{background-color:#888;}
.checkboxctn::-webkit-scrollbar-track{border-radius:10px;background:rgba(255, 255, 255, 0.1);margin-right: 10px;}
/* 滚动条-火狐 */
.checkboxctn{scrollbar-width:thin;scrollbar-color:#1674ee rgba(255, 255, 255, 0.1);}
/* 表单微调 */
body .el-dialog__header{border-bottom:1px solid #ddd;padding:10px;}
body .el-dialog__header .el-dialog__headerbtn{top:13px;}
body .el-dialog__body{padding:10px 20px;}
/* 滚动条 */
.scrolling{}
.scrolling::-webkit-scrollbar{width:6px;height:5px;cursor:pointer;}
.scrolling4::-webkit-scrollbar{width:.06rem;height:.08rem;cursor:pointer;}
.scrolling, .scrolling4::-webkit-scrollbar-thumb{
border-radius:10px;margin-right: 10px;cursor:pointer;
/* background:#1674ee; */
background-color:rgba(23,121,230, .70);
background-image:-webkit-linear-gradient(45deg, rgba(31,181,219, .70) 25%, transparent 0, transparent 50%, rgba(31,181,219, .70) 0, rgba(31,181,219, .70) 75%, transparent 0, transparent);
}
.scrolling, .scrolling4::-webkit-scrollbar-thumb:hover{background-color:#1854e8;}
.scrolling, .scrolling4::-webkit-scrollbar-track{border-radius:10px;background:rgba(255, 255, 255, 0.1);margin-right:10px;}
/* 暂无数据提示 */
/* .home_user .el-table__empty-block, .common-page .el-table__empty-block{background-color:#00344D} */
.no-data{flex:1;display:flex;justify-content:center;align-items:center;height:100%;padding-bottom:10%;}
public/datav/index.html
View file @ f9487c61
......@@ -85,26 +85,24 @@
@keyframes floatShadow {
0% {
text-shadow: 0 0 5px #fff;
transform:translateX(1300px);
display:block;
}
100% {
text-shadow: 0 0 5px #fff;
transform:translateX(-1300px);
display:none;
}
}
.floating-text {
font-size: 30px;
color: #FDD756;
//animation: floatShadow;
font-size:18px;line-height:1;
color: #FDD756;text-shadow: 0 0 5px #fff;
animation: floatShadow;
animation-name:floatShadow;
animation-duration: 20s;
animation-iteration-count: infinite;
animation-timing-function:linear;
position:absolute;
position:absolute;top:3px;
}
.a0a_{
......@@ -159,9 +157,14 @@
<div class="floating-text">中和地信有限公司欢迎您</div>
<div class="a0a_">
<ul><li data-id="1" class="active">应急管理</li> <li data-id="2" class="">自然资源</li></ul>
<ul><li data-id="5" class="">水利系统</li> <li data-id="6" class="">电子档案</li></ul>
<div class="a0a_" id="h_tab">
<ul>
<li data-id="1" class="active">应急管理</li>
<li data-id="2" class="" >自然资源</li></ul>
<ul>
<li data-id="3" class="" >水利系统</li>
<li data-id="4" class="">电子档案</li>
</ul>
</div>
</div>
</div>
......@@ -796,9 +799,7 @@
const host = location.protocol + '//' + (location.hostname === '192.168.3.226' ? '192.168.3.37' : '192.168.13.200') + ':8013';
console.log('host ________________ ', host);
const selfHost = 'http://192.168.3.226:8057';
const selfHost = location.hostname === '192.168.3.226' ? 'http://192.168.3.226:8057' : 'http://192.168.13.200:8057';
const token = Cookies.get('ELADMIN-TOEKN');
......@@ -827,7 +828,7 @@
}
if (code === 401) {
alert('登录信息失效，请重新登录')
window.open(host + '/#/login', '_self')
window.open(selfHost + '/#/login', '_self')
return
}
if (code === 400 && message === '不允许访问') {
......@@ -946,7 +947,7 @@
},
mounted() {
if (!token) {
window.open(host + '/#/login', '_self')
window.open(selfHost + '/#/login', '_self')
return
}
this.heightScale = (this.clientHeight - 100) / 980
......@@ -986,6 +987,25 @@
}
this.noticeIndex = this.noticeIndex + 1;
}, 10 * 1000);
// tab event
var h_tab = this.$el.querySelector("#h_tab");
console.log('h_tab ________________ ', h_tab);
h_tab.onclick = function(e){
var tag = e.target || e.srcElement;
console.log('tag ________________ ', tag);
if(tag.nodeName === 'LI'){
var did = ~~tag.dataset.id;
if(did === 2){
window.open('/datav/natural.html')
}else if(did === 3){
window.open('/datav/watersource.html')
};
};
};
},
methods: {
querySearchAsync(queryString, cb) {
......
public/datav/js/highcharts.js 0 → 100644
View file @ f9487c61
This source diff could not be displayed because it is too large. You can view the blob instead.
public/datav/js/qf_web.min.js 0 → 100644
View file @ f9487c61
This diff is collapsed.
public/datav/js/qf_web_ui.min.js 0 → 100644
View file @ f9487c61
This diff is collapsed.
public/datav/natural.html 0 → 100644
View file @ f9487c61
This diff is collapsed.
public/datav/static/natural/bg.png 0 → 100644
View file @ f9487c61
This diff is collapsed.
public/datav/static/water/bg.png 0 → 100644
View file @ f9487c61
This diff is collapsed.
public/datav/watersource.html 0 → 100644
View file @ f9487c61
This diff is collapsed.
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