diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss
index e728b228e..5c97ebc8f 100644
--- a/src/assets/scss/main-shuju.scss
+++ b/src/assets/scss/main-shuju.scss
@@ -110,4 +110,40 @@
}
}
}
+
+ .msg {
+ position: absolute;
+ display: flex;
+ align-items: center;
+ top: 40px;
+ right: 40px;
+ font-size: 16px;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #ffffff;
+ line-height: 22px;
+ .weather {
+ display: flex;
+ align-items: center;
+ img {
+ position: relative;
+ width: 16px;
+ }
+ div {
+ margin-left: 3px;
+ }
+ }
+ .date {
+ margin-left: 24px;
+ display: flex;
+ align-items: center;
+ .date-div {
+ margin: 0 10px;
+ height: 22px;
+ width: 1px;
+ background-color: #fff;
+ opacity: 0.8;
+ }
+ }
+ }
}
diff --git a/src/router/index.js b/src/router/index.js
index 76ad282f6..49c748be6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,42 +25,6 @@ export const pageRoutes = [
path: "/main/home",
},
},
- {
- path: "/caiji/:id",
- props: true,
- name: "caiji",
- component: () => import("@/views/pages/caiji"),
- meta: {
- title: "居民信息填报",
- },
- },
- {
- path: "/caijisuccess",
- props: true,
- name: "caijisuccess",
- component: () => import("@/views/pages/caijisuccess"),
- meta: {
- title: "居民信息填报",
- },
- },
- {
- path: "/staffRegister",
- props: true,
- name: "staffRegister",
- component: () => import("@/views/pages/staffRegister"),
- meta: {
- title: "员工登记",
- },
- },
- {
- path: "/staffRegisterSuccess",
- props: true,
- name: "staffRegisterSuccess",
- component: () => import("@/views/pages/staffRegisterSuccess"),
- meta: {
- title: "员工登记",
- },
- },
{
path: "/404",
component: () => import("@/views/pages/404"),
diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index 1e6248014..2a6eed342 100644
--- a/src/views/main-shuju/main-navbar.vue
+++ b/src/views/main-shuju/main-navbar.vue
@@ -3,22 +3,49 @@
{{ customerName }}综合服务平台数据看板
- 人房总览
+ 人房统计
- 人房总览
+ 人口分析
- 人房总览
+ 人口变化
- 人房总览
+ 人口预警
-
+
+
+
+

+

+

+

+
+
{{ weather.temperature }}℃
+
{{ weather.weather }}
+
+
+
+
{{ showTime }}
+
+
{{ showWeek }}
@@ -158,10 +185,11 @@
diff --git a/src/views/modules/home.vue b/src/views/modules/home.vue
deleted file mode 100644
index a12130bfd..000000000
--- a/src/views/modules/home.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue
deleted file mode 100644
index 496ab8392..000000000
--- a/src/views/pages/caiji.vue
+++ /dev/null
@@ -1,947 +0,0 @@
-
-
-
- 居民信息填报
-
-
-
-
-
-
-
- {{shequName}}
-
-
-
-
-
-
- {{selVillage.label}}
- 请选择
-
-
-
-
-
-
- {{selBuild.label}}
- 请选择
-
-
-
-
-
-
- {{selUnit.label}}
- 请选择
-
-
-
-
-
-
-
-
-
- {{selHome.label}}
- 请选择
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{selHomeType.label}}
- 请选择
-
-
-
-
-
-
-
-
-
- {{selTotalResi.label}}
- 请选择
-
-
-
-
-
-
-
-
-
-
{{'成员'+(index+1)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.selDetNum.label}}
- 请选择
-
-
-
-
-
-
- {{item.selDetCondition.label}}
- 请选择
-
-
-
-
-
-
-
-
-
-
- 提交
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/pages/caijisuccess.vue b/src/views/pages/caijisuccess.vue
deleted file mode 100644
index d747f9b8d..000000000
--- a/src/views/pages/caijisuccess.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
-
-

-
居民信息填报
-
-
-
-
提交成功
-
请截图保存,方便核验人员查看
-
-
-
-
所属社区:
-
{{formData.shequName}}
-
-
-
所属房屋:
-
{{formData.address}}
-
-
-
-
房主姓名:
-
{{formData.houseHolderName}}
-
-
-
-
成员{{index+1}}:
-
{{item.name}}
-
-
-
身份证号:
-
{{item.idNum}}
-
-
-
手机号:
-
{{item.mobile}}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue
deleted file mode 100644
index 70b7dec5d..000000000
--- a/src/views/pages/staffRegister.vue
+++ /dev/null
@@ -1,509 +0,0 @@
-
-
-
- 员工登记
-
-
-
-
-
-
-
-
-
- {{placeOrgName}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{formData.ymjzCountName}}
- 请选择
-
-
-
-
-
- {{formData.latestNatTime}}
- 请选择
-
-
-
-
-
-
-
-
-
- {{placeOrgName}}
-
-
-
-
-
- {{formData2.natTime}}
- 请选择
-
-
-
-
-
-
-
-
-
-
-
-
-
- 提交
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/pages/staffRegisterSuccess.vue b/src/views/pages/staffRegisterSuccess.vue
deleted file mode 100644
index 917c5b94f..000000000
--- a/src/views/pages/staffRegisterSuccess.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-

-
员工信息登记
-
-
-
-
提交成功
-
请截图保存,方便核验人员查看
-
-
-
-
企业名称:
-
{{placeOrgName}}
-
-
-
姓名:
-
{{formData.name}}
-
-
-
-
手机号:
-
{{formData.mobile}}
-
-
-
证件号:
-
{{formData.idCard}}
-
-
-
疫苗接种次数:
-
{{formData.ymjzCountName}}
-
-
-
核酸检测时间:
-
{{formData.latestNatTime}}
-
-
-
-
-
-
-
企业名称:
-
{{placeOrgName}}
-
-
-
核酸检测时间:
-
{{formData.natTime}}
-
-
-
-
受众人数:
-
{{formData.szTotal}}人
-
-
-
核酸检测人数:
-
{{formData.hsjcTotal}}人
-
-
-
-
-
-
-
-
-
-