diff --git a/src/assets/img/DataCenter/backhome.png b/src/assets/img/DataCenter/backhome.png
new file mode 100644
index 0000000000000000000000000000000000000000..842f8e109b4d1771a1f04646be181192bb191899
Binary files /dev/null and b/src/assets/img/DataCenter/backhome.png differ
diff --git a/src/assets/img/DataCenter/qrcode.png b/src/assets/img/DataCenter/qrcode.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d11af51f048773b99065c55b50e4a2cdf2a1005
Binary files /dev/null and b/src/assets/img/DataCenter/qrcode.png differ
diff --git a/src/assets/img/Home/chart.png b/src/assets/img/Home/chart.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d2a79c117bc22f048ebd10bdde495104e4f413a
Binary files /dev/null and b/src/assets/img/Home/chart.png differ
diff --git a/src/components/FormComponents/CustomForm/FormContent.vue b/src/components/FormComponents/CustomForm/FormContent.vue
index 56d4f18cfe743eab0a90ce4349326d731ce1f533..f1d7f8e74d8eb2e538631da18081fd7b88cbff2b 100644
--- a/src/components/FormComponents/CustomForm/FormContent.vue
+++ b/src/components/FormComponents/CustomForm/FormContent.vue
@@ -186,7 +186,6 @@ export default {
// 切换不符合筛查条件的显示
formChange() {
// 入选,排除标准,一个填写是就不符合筛查条件
- console.log(this.form)
let arr = [
"is_one_year",
"is_subtotal_history",
@@ -202,6 +201,9 @@ export default {
flag++
}
}
+ if (this.form.is_know && this.form.is_know == 0) {
+ flag = 1
+ }
if (flag == 0) {
this.$emit("showError", false)
} else {
diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue
index 0be29a5da00827bb797fea4c827ab20718bc3a12..457c648ca236987695dc134f851a218a06141ca4 100644
--- a/src/components/FormComponents/CustomForm/index.vue
+++ b/src/components/FormComponents/CustomForm/index.vue
@@ -78,6 +78,7 @@
>上一步
+
{{ g.label }}
- {{errorText}}
+ {{
+ errorText
+ }}
@@ -160,7 +159,7 @@ export default {
},
},
watch: {
- formEdit:{
+ formEdit: {
handler() {
this.initfields(this.formEdit)
},
@@ -313,19 +312,19 @@ export default {
this.$nextTick(() => {
// 子组件数据初始化完成后
// setTimeout(() => {
- this.initfields(this.formEdit)
+ this.initfields(this.formEdit)
// }, 0)
if (this.$refs.form && this.$refs.form.clearValidate) {
this.$refs.form.clearValidate()
}
- this.$forceUpdate();
+ this.$forceUpdate()
})
},
// 绑定部分值(此时表单已渲染)
initfields(obj) {
for (let k in obj) {
// if (this.form.hasOwnProperty(k)) {
- this.form[k] = obj[k]
+ this.form[k] = obj[k]
// }
}
},
@@ -420,10 +419,10 @@ export default {
// }
}
.simple-form {
- ::v-deep {
- .el-form-item__label {
- margin-left: 20px;
- }
- }
+ ::v-deep {
+ .el-form-item__label {
+ margin-left: 20px;
+ }
+ }
}
diff --git a/src/components/layout/index.vue b/src/components/layout/index.vue
index 62e5764a0a86db5c5ceed4e1146d14bd547bd9dc..697ada448a74c1ed162f048546388c741c45b377 100644
--- a/src/components/layout/index.vue
+++ b/src/components/layout/index.vue
@@ -44,9 +44,16 @@
-
-
欢迎,{{ userInfo.name }}
-
退出
+
+
欢迎,{{ userInfo.name }}
+
退出
+
+
+
+

+
+
数据中心
+
@@ -260,26 +267,56 @@ export default {
display: flex;
flex-direction: column;
align-items: flex-end;
- .white {
- width: 32px;
- height: 4px;
- background: #ffffff;
- }
- .text {
- font-size: 20px;
- font-family: AlibabaPuHuiTiM;
- color: #ffffff;
- margin: 10px 0;
+ .top {
+ display: flex;
+ align-items: center;
+ .text {
+ font-size: 20px;
+ font-family: AlibabaPuHuiTiM;
+ color: #ffffff;
+ margin: 10px 24px;
+ }
+ .exit {
+ font-size: 16px;
+ cursor: pointer;
+ font-family: AlibabaPuHuiTiR;
+ text-decoration: underline;
+ color: rgba(255, 255, 255, 0.8);
+ line-height: 16px;
+ &:active {
+ color: #4e68ff;
+ }
+ }
}
- .exit {
- font-size: 16px;
+ .bot {
+ width: 183px;
+ height: 60px;
+ background: rgba(255, 255, 255, 0.9);
+ box-shadow: 0px 12px 36px 0px rgba(23, 44, 105, 0.3);
+ border-radius: 8px;
+ display: flex;
+ margin-top: 32px;
cursor: pointer;
- font-family: AlibabaPuHuiTiR;
- text-decoration: underline;
- color: rgba(255, 255, 255, 0.8);
- line-height: 16px;
- &:active {
- color: #4e68ff;
+ .left_chart {
+ width: 60px;
+ height: 60px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ img {
+ width: 36px;
+ height: 36px;
+ }
+ }
+ .right_text {
+ flex: 1;
+ background: #4e68ff;
+ border-radius: 0px 8px 8px 0px;
+ line-height: 60px;
+ font-size: 22px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ color: #f1f5fd;
+ text-align: center;
}
}
}
diff --git a/src/layouts/components/NavBar/index.vue b/src/layouts/components/NavBar/index.vue
index 4b30ca6fb9bea0fb5ea0203ff50f3442c4316920..13f8f014b54d1ca9ed1a3ae87a26835d0cc2ae5b 100644
--- a/src/layouts/components/NavBar/index.vue
+++ b/src/layouts/components/NavBar/index.vue
@@ -7,7 +7,7 @@
-
+
diff --git a/src/layouts/components/index.js b/src/layouts/components/index.js
index 89d175119ad6e67314ff62b366c8283bb18d4784..5021c5cb82136a3aa1b2b90b6252e8d6f4149751 100644
--- a/src/layouts/components/index.js
+++ b/src/layouts/components/index.js
@@ -1,5 +1,5 @@
export { default as TagsBar } from "zx-layouts/zx-tags-bar"
-export { default as SideBar } from "zx-layouts/zx-side-bar"
+export { default as SideBar } from "@/layouts/components/zx-side-bar"
export { default as Breadcrumb } from "zx-layouts/zx-breadcrumb"
export { default as FullScreenBar } from "zx-layouts/zx-full-screen-bar"
export { default as ErrorLog } from "zx-layouts/zx-error-log"
diff --git a/src/layouts/components/zx-side-bar/components/SideBarItem.vue b/src/layouts/components/zx-side-bar/components/SideBarItem.vue
new file mode 100644
index 0000000000000000000000000000000000000000..427fe9f981a25053be78067dc041d387309221b5
--- /dev/null
+++ b/src/layouts/components/zx-side-bar/components/SideBarItem.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
+ {{ onlyOneChildren.meta.title }}
+ {{ onlyOneChildren.meta.badge }}
+
+
+
+
+
+
+
+ {{ item.meta.title }}
+
+
+
+
+
+
+
+
+
diff --git a/src/layouts/components/zx-side-bar/index.vue b/src/layouts/components/zx-side-bar/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..19b685b0311366c3034dbb38f0c4bf5dbe12e0af
--- /dev/null
+++ b/src/layouts/components/zx-side-bar/index.vue
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/screening/DraftBox/index.vue b/src/views/screening/DraftBox/index.vue
deleted file mode 100644
index 389550439ea573f351667d458bc074101d0071ef..0000000000000000000000000000000000000000
--- a/src/views/screening/DraftBox/index.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-
- 草稿箱
-
-
-
diff --git a/src/views/screening/ScreeningAdd.vue b/src/views/screening/ScreeningAdd.vue
index 4102b9e000b98c11ed416733f285bad830871ba8..4635a40df098f44aadcd30b9fc7118525862f70d 100644
--- a/src/views/screening/ScreeningAdd.vue
+++ b/src/views/screening/ScreeningAdd.vue
@@ -1,5 +1,5 @@
-
+