Skip to content

肖康 / cloudSystem

Go to a project
Commit 6f7e725c by liangjianmin
Options

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

# Conflicts:
#	src/assets/css/public/common.min.css
css
parents c64c6cbf 4b87ed81
Inline Side-by-side
Showing with 42 additions and 419 deletions
src/ajax/index.js
...@@ -15,7 +15,7 @@ let NODE_ENVS = "/"; ...@@ -15,7 +15,7 @@ let NODE_ENVS = "/";
switch (envs) { switch (envs) {
case 'development': case 'development':
//开发环境 //开发环境
NODE_ENVS = 'http://192.168.2.142:8080'; NODE_ENVS = 'http://192.168.2.164:8080';
break; break;
case 'test': case 'test':
//测试环境 //测试环境
......
src/assets/css/public/common.less
...@@ -324,34 +324,21 @@ body { ...@@ -324,34 +324,21 @@ body {
box-shadow: 1px 2px 10px 3px rgba(119, 135, 145, 0.5); box-shadow: 1px 2px 10px 3px rgba(119, 135, 145, 0.5);
} }
.el-table td, // .el-table td,
.el-table th.is-leaf { // .el-table th.is-leaf {
border-bottom: 1px solid #D2D9E7; // border-bottom: 1px solid #D2D9E7;
} // }
.el-table--border{
border-bottom:0px!important; // .el-table--border td,
position: relative; // .el-table--border th,
&::after{ // .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
content:""; // border-right: 1px solid #D2D9E7;
position: absolute; // }
width:100%;
height:1px; // .el-table--border,
background: red; // .el-table--group {
left:0px; // border: 1px solid #D2D9E7;
bottom:-1px; // }
z-index: 3;
}
}
.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__body-wrapper::-webkit-scrollbar { .el-table__body-wrapper::-webkit-scrollbar {
width: 18px; width: 18px;
......
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}.f-blue{color:#1969F9}.el-message--info{min-width:auto !important;border:0px !important;background:rgba(0,0,0,0.4) !important}.el-message--info .el-icon-info{display:none}.el-message--info .el-message__content{color:#fff !important}.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-checkbox__input.is-checked .el-checkbox__inner,.pagex .el-checkbox__input.is-indeterminate .el-checkbox__inner{background-color:#1969F9;border-color:#1969F9}.pagex .el-table__header th{font-weight:normal}.pagex .el-table__header .el-table__body tr.hover-row>td{background-color:#F1F8FF}.pagex .th-all .el-table__header th{background-color:#F1F4FA}.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__body-wrapper::-webkit-scrollbar{width:18px}.pagex .el-table__body-wrapper::-webkit-scrollbar-thumb{border-radius:8px;background:#fff;width:18px;-webkit-box-shadow:inset 0 0 8px rgba(0,0,0,0.2)}.pagex .el-table__body-wrapper::-webkit-scrollbar-track{border-radius:0;background:#D2D9E7}.el-dialog__body{padding:20px !important}.el-dialog__title{font-size:14px;color:#333;font-weight:bold;position:relative}.el-dialog__title::after{content:"";position:absolute;width:5px;height:22px;background:#1969F9;left:-20px;top:2px}.el-icon-close{font-size:24px}.el-icon-close:hover,.el-icon-close:focus{color:#1969F9 !important}.el-message-box__container{text-align:center;padding:15px 0px}.el-message-box__message{display:inline-block}.el-message-box__message p{color:#333;font-size:16px}.el-message-box__status.el-icon-error{color:#FC1F00 !important;font-size:25px !important}.el-message-box__close:before{content:"\E609"}.el-message-box__btns .el-button,.dialog-footer .el-button{width:76px;height:34px;text-align:center;line-height:34px;background:#E8ECF4;border:1px solid #E8ECF4;border-radius:2px;color:#8391AD;font-size:14px;padding:0px}.el-message-box__btns .el-button:hover,.dialog-footer .el-button:hover,.el-message-box__btns .el-button:focus,.dialog-footer .el-button:focus{color:#8391AD;background:#E8ECF4;border:1px solid #E8ECF4}.el-message-box__btns .el-button.el-button--primary,.dialog-footer .el-button.el-button--primary{border:1px solid #1969F9;color:#fff;background:#1969F9}.el-message-box__btns .el-button.el-button--primary:hover,.dialog-footer .el-button.el-button--primary:hover,.el-message-box__btns .el-button.el-button--primary:focus,.dialog-footer .el-button.el-button--primary:focus{color:#fff;background:#1969F9;border:1px solid #1969F9}
-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;
}
.f-blue {
color: #1969F9;
}
/**element-ui 样式重写**/
.el-message--info {
min-width: auto !important;
border: 0px !important;
background: rgba(0, 0, 0, 0.4) !important;
}
.el-message--info .el-icon-info {
display: none;
}
.el-message--info .el-message__content {
color: #fff !important;
}
.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-checkbox__input.is-checked .el-checkbox__inner,
.pagex .el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #1969F9;
border-color: #1969F9;
}
.pagex .el-table__header th {
font-weight: normal;
}
.pagex .el-table__header .el-table__body tr.hover-row > td {
background-color: #F1F8FF;
}
.pagex .th-all .el-table__header th {
background-color: #F1F4FA;
}
.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 {
border-bottom: 0px!important;
position: relative;
}
.pagex .el-table--border::after {
content: "";
position: absolute;
width: 100%;
height: 1px;
background: red;
left: 0px;
bottom: -1px;
z-index: 3;
}
.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;
}
.pagex .el-table__body-wrapper::-webkit-scrollbar {
width: 18px;
}
.pagex .el-table__body-wrapper::-webkit-scrollbar-thumb {
border-radius: 8px;
background: #fff;
width: 18px;
-webkit-box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.2);
}
.pagex .el-table__body-wrapper::-webkit-scrollbar-track {
border-radius: 0;
background: #D2D9E7;
}
.el-dialog__body {
padding: 20px !important;
}
.el-dialog__title {
font-size: 14px;
color: #333;
font-weight: bold;
position: relative;
}
.el-dialog__title::after {
content: "";
position: absolute;
width: 5px;
height: 22px;
background: #1969F9;
left: -20px;
top: 2px;
}
.el-icon-close {
font-size: 24px;
}
.el-icon-close:hover,
.el-icon-close:focus {
color: #1969F9 !important;
}
.el-message-box__container {
text-align: center;
padding: 15px 0px;
}
.el-message-box__message {
display: inline-block;
}
.el-message-box__message p {
color: #333;
font-size: 16px;
}
.el-message-box__status.el-icon-error {
color: #FC1F00 !important;
font-size: 25px !important;
}
.el-message-box__close:before {
content: "\E609";
}
.el-message-box__btns .el-button,
.dialog-footer .el-button {
width: 76px;
height: 34px;
text-align: center;
line-height: 34px;
background: #E8ECF4;
border: 1px solid #E8ECF4;
border-radius: 2px;
color: #8391AD;
font-size: 14px;
padding: 0px;
}
.el-message-box__btns .el-button:hover,
.dialog-footer .el-button:hover,
.el-message-box__btns .el-button:focus,
.dialog-footer .el-button:focus {
color: #8391AD;
background: #E8ECF4;
border: 1px solid #E8ECF4;
}
.el-message-box__btns .el-button.el-button--primary,
.dialog-footer .el-button.el-button--primary {
border: 1px solid #1969F9;
color: #fff;
background: #1969F9;
}
.el-message-box__btns .el-button.el-button--primary:hover,
.dialog-footer .el-button.el-button--primary:hover,
.el-message-box__btns .el-button.el-button--primary:focus,
.dialog-footer .el-button.el-button--primary:focus {
color: #fff;
background: #1969F9;
border: 1px solid #1969F9;
}
/*# sourceMappingURL=common.min.css.map */
\ No newline at end of file
src/assets/css/store/enter.min.css.map 0 → 100644
{"version":3,"sources":["enter.less"],"names":[],"mappings":"AAAA,MACI;EACI,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AALR,MAOI;EACI,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AACA,MAVJ,YAUK;EACG,mBAAA;;AAlBZ,MAqBI;EACI,gBAAA;EACA,mBAAA;;AAvBR,MAqBI,SAII;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,kBAAA;EACA,eAAA;EACA,oBAAA;;AACA,MAhBR,SAII,KAYK;EAAM,WAAA;;AACP,MAjBR,SAII,KAaK;EACG,mBAAA;EACA,eAAA;EACA,WAAA;;AAEJ,MAtBR,SAII,KAkBK;EACG,yBAAA;EACA,mBAAA;EACA,cAAA;;AACA,MA1BZ,SAII,KAkBK,OAII;EACG,mBAAA;EACA,WAAA","file":"enter.min.css"}
\ No newline at end of file
src/assets/css/store/list.min.css.map 0 → 100644
{"version":3,"sources":["list.less"],"names":[],"mappings":"AAAA;EACI,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,aAAA;;AAJJ,UAKI;EACI,eAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,mBAAA;EACA,kBAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AACA,UAVJ,YAUK;EACG,mBAAA;;AAhBZ,UAmBI;EACI,gBAAA;EACA,mBAAA;;AArBR,UAmBI,SAGI;EAEI,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,eAAA;EACA,WAAA;;AAjCZ,UAmBI,SAGI,QAYI;EAAE,gBAAA;;AACF,UAhBR,SAGI,QAaK;EAEG,mBAAA;EACA,WAAA;;AAtChB,UAmBI,SAuBI;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,kBAAA;EACA,iBAAA;EACA,yBAAA;EACA,mBAAA;EACA,cAAA;EACA,iBAAA;EACA,eAAA;EACA,oBAAA;;AACA,UAnCR,SAuBI,KAYK;EACG,mBAAA;EACA,eAAA;EACA,WAAA;;AAEJ,UAxCR,SAuBI,KAiBK;EACG,WAAA;EACA,gBAAA;;AACA,UA3CZ,SAuBI,KAiBK,KAGI;EACG,mBAAA;EACA,cAAA;;AAGR,UAhDR,SAuBI,KAyBK;EACG,kBAAA;EACA,WAAA;EACA,8BAAA;;AACA,UApDZ,SAuBI,KAyBK,IAII;EACG,8BAAA;;AAxEpB,UA6EI;EACI,kBAAA;;AA9ER,UA6EI,WAEI;EACI,YAAA;EACA,WAAA;EAEA,kBAAA;EACA,QAAA;EACA,UAAA;;AArFZ,UA6EI,WAEI,UAOI;EACI,WAAA;EACA,8BAAA;;AAxFhB,UA6EI,WAEI,UAOI,WAGI;EACI,WAAA;EACA,YAAA;EACA,YAAA;EACA,WAAA;EACA,eAAA;EACA,WAAA;EACA,kBAAA;;AAhGpB,UA6EI,WAEI,UAOI,WAaI;AAnGhB,UA6EI,WAEI,UAOI,WAauB;EAAkB,uBAAA","file":"list.min.css"}
\ No newline at end of file
src/views/Store/enter.vue
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
<el-option label="待处理" value="1"></el-option> <el-option label="待处理" value="1"></el-option>
<el-option label="处理中" value="2"></el-option> <el-option label="处理中" value="2"></el-option>
<el-option label="已处理" value="3"></el-option> <el-option label="已处理" value="3"></el-option>
<el-option label="其他失败" value="4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="更新日期"> <el-form-item label="更新日期">
...@@ -77,6 +79,8 @@ ...@@ -77,6 +79,8 @@
data() { data() {
return { return {
page:10,
formInline: { formInline: {
status: '', status: '',
date: '' date: ''
...@@ -92,10 +96,25 @@ ...@@ -92,10 +96,25 @@
}, },
watch: {}, watch: {},
created() { created() {
this.getData();
}, },
computed: {}, computed: {},
methods: { methods: {
getData(){
this.$http('GET', "/api/uploadSku/list", {
page:1,
status:1,
action_time:1,
end_time:1
}).then(res => {
if (res.err_code === 0) {
console.log(res)
} else {
Message(res.err_msg);
}
})
},
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
console.log(this.multipleSelection) console.log(this.multipleSelection)
......
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