diff --git a/src/assets/safetyIndex/back003.png b/src/assets/safetyIndex/back003.png new file mode 100644 index 0000000..13a0c03 Binary files /dev/null and b/src/assets/safetyIndex/back003.png differ diff --git a/src/assets/safetyIndex/back004.png b/src/assets/safetyIndex/back004.png new file mode 100644 index 0000000..b29ca1c Binary files /dev/null and b/src/assets/safetyIndex/back004.png differ diff --git a/src/assets/safetyIndex/employee02.png b/src/assets/safetyIndex/employee02.png new file mode 100644 index 0000000..b3e686c Binary files /dev/null and b/src/assets/safetyIndex/employee02.png differ diff --git a/src/assets/safetyIndex/incaricon.png b/src/assets/safetyIndex/incaricon.png new file mode 100644 index 0000000..ba8f378 Binary files /dev/null and b/src/assets/safetyIndex/incaricon.png differ diff --git a/src/assets/safetyIndex/service001.png b/src/assets/safetyIndex/service001.png new file mode 100644 index 0000000..6dad9d1 Binary files /dev/null and b/src/assets/safetyIndex/service001.png differ diff --git a/src/assets/safetyIndex/service002.png b/src/assets/safetyIndex/service002.png new file mode 100644 index 0000000..3f93e30 Binary files /dev/null and b/src/assets/safetyIndex/service002.png differ diff --git a/src/assets/safetyIndex/service003.png b/src/assets/safetyIndex/service003.png new file mode 100644 index 0000000..c988900 Binary files /dev/null and b/src/assets/safetyIndex/service003.png differ diff --git a/src/utils/request.js b/src/utils/request.js index 56dd381..bbddc92 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,8 +7,8 @@ const request = axios.create({ //baseURL: 'http://172.18.113.50:8080/zhapi', //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://192.168.0.188:8888/zhapi', - baseURL: 'http://121.41.91.94:12002/zhapi', - //baseURL: `http://${window.location.host}/zhapi`, + //baseURL: 'http://121.41.91.94:12002/zhapi', + baseURL: `http://${window.location.host}/zhapi`, timeout: 50000, headers: { 'content-type': 'application/json' }, }) diff --git a/src/views/compositeIndex/components/companyCar.vue b/src/views/compositeIndex/components/companyCar.vue new file mode 100644 index 0000000..ade0f5b --- /dev/null +++ b/src/views/compositeIndex/components/companyCar.vue @@ -0,0 +1,243 @@ + + + + \ No newline at end of file diff --git a/src/views/compositeIndex/components/companyNum.vue b/src/views/compositeIndex/components/companyNum.vue index d547a29..b2e5200 100644 --- a/src/views/compositeIndex/components/companyNum.vue +++ b/src/views/compositeIndex/components/companyNum.vue @@ -184,7 +184,6 @@ export default { \ No newline at end of file diff --git a/src/views/compositeIndex/components/employee.vue b/src/views/compositeIndex/components/employee.vue index bbbd99b..f612954 100644 --- a/src/views/compositeIndex/components/employee.vue +++ b/src/views/compositeIndex/components/employee.vue @@ -44,32 +44,70 @@
- {{ this.person_list[0].number }} + {{ this.person_one }}
- {{ this.person_list[1].number }} + {{ this.person_two }}
- {{ this.person_list[2].number }} + {{ this.person_three }}
- {{ this.person_list[3].number }} + {{ this.person_four }}
+ +
+
+ {{ this.proportion_list[0] }} +
+
+ {{ this.proportion_list[1] }} +
+
+ {{ this.proportion_list[2] }} +
+
+ {{ this.proportion_list[3] }} +
+
+ + + +
+
+
访客
+
{{ this.visitor_num }}
+
+
+
流动人员
+
{{ this.flow_person_num }}
\ No newline at end of file diff --git a/src/views/compositeIndex/index.vue b/src/views/compositeIndex/index.vue index 126232f..7f9466a 100644 --- a/src/views/compositeIndex/index.vue +++ b/src/views/compositeIndex/index.vue @@ -3,21 +3,37 @@
- - - - +
+ + + + + + +
+
+ + + + +
\ No newline at end of file