diff --git a/package.json b/package.json
index 19039c5..86b35ab 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
"sass-loader": "^14.2.1",
"style-loader": "^4.0.0",
"vue": "^2.6.14",
+ "vue-i18n": "^7.3.2",
"vue-router": "^2.8.1",
"vuex": "^3.6.2"
},
diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index 4e90fa9..5b2c4b2 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -30,11 +30,11 @@
width: 100%;
display: flex;
position: relative;
- background: #EBEEF5;
+ background: unset;
.NCC-common-layout-left {
width: 220px;
- background-color: #fff;
+ // background-color: #fff;
flex-shrink: 0;
height: 100%;
display: flex;
@@ -85,7 +85,7 @@
.NCC-common-layout-main {
flex: 1;
padding: 0 0 10px;
- background-color: #fff;
+ // background-color: #fff;
height: 100%;
overflow: hidden;
@@ -96,10 +96,10 @@
}
.NCC-common-search-box {
- background: #fff;
+ // background: #fff;
flex-shrink: 0;
margin-bottom: 10px;
- padding: 15px 10px 0;
+ // padding: 15px 10px 0;
position: relative;
.el-form-item {
@@ -129,7 +129,8 @@
.NCC-common-search-box-right {
position: absolute;
right: 10px;
- top: 15px;
+ // top: 15px;
+ top: 0px;
}
}
@@ -211,6 +212,10 @@
.sort-caret.descending {
bottom: 1px !important;
}
+ .btn_dialog {
+ display: inline-block;
+ margin-right: 10px;
+ }
}
.NCC-table-delBtn {
diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
index f28f0fa..d7b1244 100644
--- a/src/assets/style/common.scss
+++ b/src/assets/style/common.scss
@@ -30,6 +30,9 @@ body,
-webkit-border-radius: 6px
}
+.common-info-box {
+ height: calc(100vh - 200px);
+}
.item-box {
width: 100%;
border-radius: 10px;
@@ -60,6 +63,4 @@ a {
text-decoration: none
}
-.common-info-box {
- height: calc(100vh - 200px);
-}
+
diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue
index 56675c5..783fd56 100644
--- a/src/components/InfoForm/index.vue
+++ b/src/components/InfoForm/index.vue
@@ -4,7 +4,7 @@
{{ v.FullName }}
@@ -344,7 +344,7 @@ export default {
this.companyInfo = data;
this.isShowCompanyInfo = true;
},
-
+
// 文件上传--------------------
httpRequest(file) {
uploader({
@@ -355,7 +355,7 @@ export default {
});
},
// 文件上传--------------------
-
+
reset() {
for (let key in this.infoForm) {
this.infoForm[key] = undefined;
@@ -389,6 +389,10 @@ export default {
await this.companyChange(data.companyId);
this.$forceUpdate();
},
+ handleSystemTypeChange(val) {
+ this.query.systemClass = "";
+ this.initSystemClassList(val);
+ },
async confirm() {
this.$refs["infoForm"].validate((valid) => {
if (valid) {
@@ -472,4 +476,4 @@ export default {
}
}
-@/api/baseData/area@/api/baseData/company
\ No newline at end of file
+@/api/baseData/area@/api/baseData/company
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 56f5a6b..1a9d453 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -105,8 +105,18 @@ export default {
-
\ No newline at end of file
+}
+
diff --git a/src/views/systemPage/InfoList.vue b/src/views/systemPage/InfoList.vue
index bc02f09..f84b22f 100644
--- a/src/views/systemPage/InfoList.vue
+++ b/src/views/systemPage/InfoList.vue
@@ -111,15 +111,6 @@ export default {
this.loading = false;
});
},
- getSystemUpdataList() {
- getInfoList({
- id: "580628220576007429",
- pageIndex: 1,
- pageSize: 10,
- }).then(({ data }) => {
- console.log(data);
- });
- },
},
};