Skip to content

肖康 / cloudSystem

Go to a project
Commit dc8e1028 by liangjianmin
Options

Merge branch 'master' of http://119.23.72.7/xiaokang/cloudSystem 

# Conflicts:
#	src/assets/css/public/common.min.css
css
parents f7a03b93 62424e24
Inline Side-by-side
Showing with 46 additions and 249 deletions
package-lock.json
...@@ -4742,6 +4742,22 @@ ...@@ -4742,6 +4742,22 @@
"safer-buffer": "^2.1.0" "safer-buffer": "^2.1.0"
} }
}, },
"echarts": {
"version": "5.1.1",
"resolved": "https://registry.nlark.com/echarts/download/echarts-5.1.1.tgz",
"integrity": "sha1-sYbxYvAXxVXP1nsS7eZ2K9w939o=",
"requires": {
"tslib": "2.0.3",
"zrender": "5.1.0"
},
"dependencies": {
"tslib": {
"version": "2.0.3",
"resolved": "https://registry.nlark.com/tslib/download/tslib-2.0.3.tgz?cache=0&sync_timestamp=1618846758811&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.0.3.tgz",
"integrity": "sha1-jgdBrEX8DCJuWKF7/D5kubxsphw="
}
}
},
"ee-first": { "ee-first": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz", "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz",
...@@ -12355,6 +12371,21 @@ ...@@ -12355,6 +12371,21 @@
"dev": true "dev": true
} }
} }
},
"zrender": {
"version": "5.1.0",
"resolved": "https://registry.npm.taobao.org/zrender/download/zrender-5.1.0.tgz?cache=0&sync_timestamp=1618215776804&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzrender%2Fdownload%2Fzrender-5.1.0.tgz",
"integrity": "sha1-tqhMOqfMxmQu4FGZAcpMCDXE2F4=",
"requires": {
"tslib": "2.0.3"
},
"dependencies": {
"tslib": {
"version": "2.0.3",
"resolved": "https://registry.nlark.com/tslib/download/tslib-2.0.3.tgz?cache=0&sync_timestamp=1618846758811&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.0.3.tgz",
"integrity": "sha1-jgdBrEX8DCJuWKF7/D5kubxsphw="
}
}
} }
} }
} }
src/assets/css/public/common.less
...@@ -228,7 +228,18 @@ body { ...@@ -228,7 +228,18 @@ body {
background-color: #F1F4FA background-color: #F1F4FA
} }
} }
box-shadow: 1px 2px 10px 3px rgba(119, 135, 145, 0.5);
} }
.el-table td,.el-table th.is-leaf{
border-bottom: 1px solid #D2D9E7;
}
.el-table--border td, .el-table--border th, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
border-right: 1px solid #D2D9E7;
}
.el-table--border, .el-table--group{
border: 1px solid #D2D9E7;
}
.el-table--scrollable-x .el-table__body-wrapper{}
} }
......
src/assets/css/public/common.min.css
html { html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html *{outline:0;-webkit-text-size-adjust:none !important;-webkit-tap-highlight-color:rgba(0,0,0,0) !important}html,body{font-family:PingFangSC-Regular,PingFang SC,'Microsoft Yahei',sans-serif;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-size:14px;color:#646B78}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,hr,button,article,aside,details,figcaption,figure,footer,header,menu,nav,section{margin:0;padding:0}button,input,select,textarea{font-size:100%;border:none;-webkit-appearance:none}input[type=button],input[type=file],input[type=submit]{cursor:pointer}table{border-collapse:collapse;border-spacing:0}ol,ul,dl{list-style:none}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:500}em,b,i{font-style:normal}a{text-decoration:none}img{border:none}.clr{*zoom:1;clear:both}.clr:after{content:".";clear:both;height:0;visibility:hidden;display:block}.fl{float:left;_display:inline}.fr{float:right;_display:inline}.va-t{vertical-align:top}.va-m{vertical-align:middle}.va-b{vertical-align:bottom}.lineBlock{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal}.lbBox{font-size:0 !important;*word-spacing:-1px !important}.emptys{margin-left:-1px;width:1px;height:100%;font-size:0;vertical-align:middle}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}.column{display:flex;flex-direction:column}.row{display:flex;flex-direction:row}.bothSide{justify-content:space-between}.avarage{justify-content:space-around}.rowCenter{justify-content:center}.verCenter{align-items:center}.boxFlex{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}html,body{width:100%;height:100%;-webkit-overflow-scrolling:touch}body{overflow-x:hidden;background:#F1F4FA}.pagex{padding:20px}.pagex .el-input__inner{height:38px;border-radius:2px;border:1px solid #BEC9DF;font-size:14px}.pagex .el-input__inner:focus{border:1px solid #387FFF}.pagex .el-form-item__label{color:#666}.pagex .el-range-editor.el-input__inner{width:257px}.pagex .el-select .el-input.is-focus .el-input__inner,.pagex .el-range-editor.is-active,.pagex .el-range-editor.is-active:hover{border-color:#387FFF}.pagex .el-select{width:100px}.pagex .el-form--inline .el-form-item{margin-right:30px}.pagex .el-message--info{min-width:auto !important;border:0px !important;background:rgba(0,0,0,0.4) !important}.pagex .el-message--info .el-icon-info{display:none}.pagex .el-message--info .el-message__content{color:#fff !important}.pagex .el-table{color:#646B78}.pagex .el-table__header th{font-weight:normal}.pagex .el-table__header .el-table__body tr.hover-row>td{background-color:#F1F8FF}.pagex .el-table__fixed{box-shadow:1px 2px 10px 3px rgba(119,135,145,0.5)}.pagex .el-table__fixed .el-table__header th{background-color:#F1F4FA}.pagex .el-table td,.pagex .el-table th.is-leaf{border-bottom:1px solid #D2D9E7}.pagex .el-table--border td,.pagex .el-table--border th,.pagex .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{border-right:1px solid #D2D9E7}.pagex .el-table--border,.pagex .el-table--group{border:1px solid #D2D9E7}
-webkit-text-size-adjust: 100%; \ No newline at end of file
-ms-text-size-adjust: 100%;
}
html * {
outline: 0;
-webkit-text-size-adjust: none !important;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
}
html,
body {
font-family: PingFangSC-Regular, PingFang SC, 'Microsoft Yahei', sans-serif;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 14px;
color: #646B78;
}
body,
div,
dl,
dt,
dd,
ul,
ol,
li,
h1,
h2,
h3,
h4,
h5,
h6,
pre,
code,
form,
fieldset,
legend,
input,
textarea,
p,
blockquote,
th,
td,
hr,
button,
article,
aside,
details,
figcaption,
figure,
footer,
header,
menu,
nav,
section {
margin: 0;
padding: 0;
}
button,
input,
select,
textarea {
font-size: 100%;
border: none;
-webkit-appearance: none;
}
input[type=button],
input[type=file],
input[type=submit] {
cursor: pointer;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
ol,
ul,
dl {
list-style: none;
}
h1,
h2,
h3,
h4,
h5,
h6 {
font-size: 100%;
font-weight: 500;
}
em,
b,
i {
font-style: normal;
}
a {
text-decoration: none;
}
img {
border: none;
}
.clr {
*zoom: 1;
clear: both;
}
.clr:after {
content: ".";
clear: both;
height: 0;
visibility: hidden;
display: block;
}
.fl {
float: left;
_display: inline;
}
.fr {
float: right;
_display: inline;
}
.va-t {
vertical-align: top;
}
.va-m {
vertical-align: middle;
}
.va-b {
vertical-align: bottom;
}
.lineBlock {
display: inline-block;
*display: inline;
zoom: 1;
letter-spacing: normal;
word-spacing: normal;
}
.lbBox {
font-size: 0 !important;
*word-spacing: -1px !important;
}
.emptys {
margin-left: -1px;
width: 1px;
height: 100%;
font-size: 0;
vertical-align: middle;
}
.boxsiz {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.column {
display: flex;
flex-direction: column;
}
.row {
display: flex;
flex-direction: row;
}
/* 两侧对齐 */
.bothSide {
justify-content: space-between;
}
/* 平均分布 */
.avarage {
justify-content: space-around;
}
/* 水平居中 */
.rowCenter {
justify-content: center;
}
/* 垂直居中 */
.verCenter {
align-items: center;
}
.boxFlex {
-webkit-box-flex: 1;
-moz-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
flex: 1;
}
html,
body {
width: 100%;
height: 100%;
-webkit-overflow-scrolling: touch;
}
body {
overflow-x: hidden;
background: #F1F4FA;
}
/**页面盒子**/
/**element-ui 样式重写**/
.pagex {
padding: 20px;
}
.pagex .el-input__inner {
height: 38px;
border-radius: 2px;
border: 1px solid #BEC9DF;
font-size: 14px;
}
.pagex .el-input__inner:focus {
border: 1px solid #387FFF;
}
.pagex .el-form-item__label {
color: #666;
}
.pagex .el-range-editor.el-input__inner {
width: 257px;
}
.pagex .el-select .el-input.is-focus .el-input__inner,
.pagex .el-range-editor.is-active,
.pagex .el-range-editor.is-active:hover {
border-color: #387FFF;
}
.pagex .el-select {
width: 100px;
}
.pagex .el-form--inline .el-form-item {
margin-right: 30px;
}
.pagex .el-message--info {
min-width: auto !important;
border: 0px !important;
background: rgba(0, 0, 0, 0.4) !important;
}
.pagex .el-message--info .el-icon-info {
display: none;
}
.pagex .el-message--info .el-message__content {
color: #fff !important;
}
.pagex .el-table {
color: #646B78;
}
.pagex .el-table__header th {
font-weight: normal;
}
.pagex .el-table__header .el-table__body tr.hover-row > td {
background-color: #F1F8FF;
}
.pagex .el-table__fixed .el-table__header th {
background-color: #F1F4FA;
}
/*# sourceMappingURL=common.min.css.map */
\ No newline at end of file
src/components/menu.vue
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
} }
</script> </script>
<style lang="less"> <style lang="less" >
#app { #app {
padding-left: 226px; padding-left: 226px;
padding-top: 56px; padding-top: 56px;
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
top: 0px; top: 0px;
right: 0px; right: 0px;
height: 56px; height: 56px;
z-index: 99;
.con-box { .con-box {
height: 56px; height: 56px;
background: #fff; background: #fff;
......
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 sign in to comment