diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index 315e147..2c7becb 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -7,7 +7,7 @@
-
总人数/总入厂人数
+
总人数/总入厂人数/总离厂人数
@@ -19,13 +19,17 @@ + + +
核销比:{{toCaculateper(totaldata.common_visit.enter_visit,totaldata.common_visit.total)}}
-
今日人数/今日入厂人数
+
今日人数/今日入厂人数/今日离厂人数
@@ -36,6 +40,10 @@ + + +
核销比:{{toCaculateper(totaldata.common_visit.today_enter_visit,totaldata.common_visit.today_total)}}
@@ -50,7 +58,7 @@
-
总人数/总核销人数
+
总人数/总入厂人数/总离厂人数
@@ -62,12 +70,16 @@ + + +
核销比:{{toCaculateper(totaldata.work_visit.enter_visit,totaldata.work_visit.total)}}
-
今日人数/今日核销人数
+
今日人数/今日入厂人数/今日离厂人数
@@ -79,6 +91,10 @@ + + +
核销比:{{toCaculateper(totaldata.work_visit.today_enter_visit,totaldata.work_visit.today_total)}}
@@ -91,7 +107,7 @@
-
总预约数/总核销数
+
总预约数/总入厂人数/总离厂人数
@@ -103,12 +119,16 @@ + + +
核销比:{{toCaculateper(totaldata.car_visit.enter_visit,totaldata.car_visit.total)}}
-
今日预约数/今日核销数
+
今日预约数/今日入厂数/今日离厂人数
@@ -120,6 +140,10 @@ + + +
核销比:{{toCaculateper(totaldata.work_visit.today_enter_visit,totaldata.car_visit.today_total)}}
@@ -147,19 +171,25 @@ "enter_visit": 0, "today_enter_visit": 0, "today_total": 0, - "total":0 + "total":0, + "leave_total":0, + "today_leave_total":0 }, "work_visit": { "enter_visit": 0, "today_enter_visit": 0, "today_total": 0, - "total":0 + "total":0, + "leave_total":0, + "today_leave_total":0 }, "car_visit": { "enter_visit": 0, "today_enter_visit": 0, "today_total": 0, - "total":0 + "total":0, + "leave_total":0, + "today_leave_total":0 } } } diff --git a/src/views/resource/component/addStudy.vue b/src/views/resource/component/addStudy.vue index fc450b0..aeead9e 100644 --- a/src/views/resource/component/addStudy.vue +++ b/src/views/resource/component/addStudy.vue @@ -266,6 +266,9 @@ import xyTinymce from "@/components/XyTinymce/index.vue"; }, { id: 270, value: '九个月' + }, { + id: 365, + value: '一年' }] } diff --git a/src/views/system/components/UserCard.vue b/src/views/system/components/UserCard.vue index 3a38589..2e2dbde 100644 --- a/src/views/system/components/UserCard.vue +++ b/src/views/system/components/UserCard.vue @@ -8,12 +8,13 @@
Hello
- {{ user.role }} + + {{ user.name }}
{{ user.name }}
-
{{ user.role | uppercaseFirst }}
+
@@ -24,7 +25,7 @@
- {{user.department||"暂无"}} + {{user.department?user.department.name:"暂无"}}
@@ -115,4 +116,4 @@ } } } - + diff --git a/src/views/system/password.vue b/src/views/system/password.vue index 3b1e7b6..cf22e26 100644 --- a/src/views/system/password.vue +++ b/src/views/system/password.vue @@ -35,7 +35,7 @@ import { getInfo - } from '../../api/user.js' + } from '../../api/user.js' export default { name: 'Profile', @@ -61,18 +61,19 @@ this.getUser() }, methods: { - getUser() { - - getInfo().then(res => { - this.user = { - name:res.name, - username:res.username, - role: this.roles.join(' | '), - avatar: this.avatar - } + getUser() { + + getInfo().then(res => { + this.user = { + name:res.name, + username:res.username, + role: this.roles.join(' | '), + avatar: this.avatar, + department: res.department + } }) } } } - + diff --git a/src/views/visit/component/addCommon copy.vue b/src/views/visit/component/addCommon copy.vue index 31088ec..3c384b0 100644 --- a/src/views/visit/component/addCommon copy.vue +++ b/src/views/visit/component/addCommon copy.vue @@ -259,7 +259,7 @@ - + + -