diff --git a/package.json b/package.json index 6f5b156..9545790 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "cookie": "^0.5.0", "copy-webpack-plugin": "4.6.0", "core-js": "^3.6.5", + "echarts": "^5.4.2", + "echarts-gl": "^2.0.9", "element-ui": "^2.15.13", "js-cookie": "^3.0.1", "less": "3.9.0", diff --git a/src/api/safetyIndex/index.js b/src/api/safetyIndex/index.js index 2e29afd..b8f5372 100644 --- a/src/api/safetyIndex/index.js +++ b/src/api/safetyIndex/index.js @@ -7,3 +7,35 @@ export function staffStatistics(params) { params }) } +//企业员工详情 +export function staffDetail(params) { + return request({ + url: '/safety/index/staff/detail', + method: 'post', + params + }) +} +//企业访客统计 +export function visitStatistics(params) { + return request({ + url: '/safety/index/visit/statistics', + method: 'post', + params + }) +} +//企业访客详情 +export function visitDetail(params) { + return request({ + url: '/safety/index/visit/detail', + method: 'post', + params + }) +} +//企业访客详情 +export function flowDetail(params) { + return request({ + url: '/safety/index/flow/detail', + method: 'post', + params + }) +} diff --git a/src/assets/safetyIndex/7691备份.png b/src/assets/safetyIndex/7691备份.png new file mode 100644 index 0000000..e0cbaf0 Binary files /dev/null and b/src/assets/safetyIndex/7691备份.png differ diff --git a/src/assets/safetyIndex/Target 03_00000.png b/src/assets/safetyIndex/Target 03_00000.png new file mode 100644 index 0000000..9df42ba Binary files /dev/null and b/src/assets/safetyIndex/Target 03_00000.png differ diff --git a/src/assets/safetyIndex/主屏板块1.png b/src/assets/safetyIndex/主屏板块1.png index a43f7f4..05c90e7 100644 Binary files a/src/assets/safetyIndex/主屏板块1.png and b/src/assets/safetyIndex/主屏板块1.png differ diff --git a/src/assets/safetyIndex/形状结合1.png b/src/assets/safetyIndex/形状结合1.png new file mode 100644 index 0000000..4d2edcf Binary files /dev/null and b/src/assets/safetyIndex/形状结合1.png differ diff --git a/src/assets/safetyIndex/流动人员icon.png b/src/assets/safetyIndex/流动人员icon.png new file mode 100644 index 0000000..de9923d Binary files /dev/null and b/src/assets/safetyIndex/流动人员icon.png differ diff --git a/src/assets/safetyIndex/编组 72.png b/src/assets/safetyIndex/编组 72.png new file mode 100644 index 0000000..eca65f1 Binary files /dev/null and b/src/assets/safetyIndex/编组 72.png differ diff --git a/src/assets/safetyIndex/装饰009991.png b/src/assets/safetyIndex/装饰009991.png index a08a99b..04ba601 100644 Binary files a/src/assets/safetyIndex/装饰009991.png and b/src/assets/safetyIndex/装饰009991.png differ diff --git a/src/assets/safetyIndex/访客icon.png b/src/assets/safetyIndex/访客icon.png new file mode 100644 index 0000000..a7636ea Binary files /dev/null and b/src/assets/safetyIndex/访客icon.png differ diff --git a/src/views/archives/index.vue b/src/views/archives/index.vue index ec0819e..3f6c44c 100644 --- a/src/views/archives/index.vue +++ b/src/views/archives/index.vue @@ -184,8 +184,8 @@ - + + @@ -205,8 +205,8 @@ import car from './car.vue' import wupin from './wupin.vue' import anjian from './anjian.vue' import qiyeyuangong from './qiyeyuangong.vue' -// import liudongrenyuan from './liudongrenyuan.vue' -// import fangke from './fangke.vue' +import liudongrenyuan from './liudongrenyuan.vue' +import fangke from './fangke.vue' export default { components: { monitor, @@ -216,8 +216,8 @@ export default { wupin, anjian, qiyeyuangong, - // liudongrenyuan, - // fangke + liudongrenyuan, + fangke }, data() { return { diff --git a/src/views/archives/kakou.vue b/src/views/archives/kakou.vue index 8aa150d..319058d 100644 --- a/src/views/archives/kakou.vue +++ b/src/views/archives/kakou.vue @@ -12,7 +12,7 @@ - + diff --git a/src/views/safetyIndex/index.vue b/src/views/safetyIndex/index.vue index a2c74cf..5cee25d 100644 --- a/src/views/safetyIndex/index.vue +++ b/src/views/safetyIndex/index.vue @@ -1,16 +1,7 @@ @@ -56,74 +41,6 @@ export default { height: 100%; - .qyyg { - height: 32.14%; - width: 100%; - margin-bottom: 20px; - background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; - background-size: 100% 100%; - - .title { - width: 100%; - height: 33px; - background: url('~@/assets/safetyIndex/标题样式.png') no-repeat; - background-size: 100% 100%; - font-size: 16px; - color: #D9E7FF; - letter-spacing: 1px; - text-align: center; - font-weight: 500; - display: flex; - align-items: center; - - img { - width: 16px; - height: 16px; - margin: 0 12px; - } - } - - .zongshu { - width: 400px; - height: 33px; - margin: 12px 20px; - background: url('~@/assets/safetyIndex/7691.png') no-repeat; - background-size: 100% 100%; - display: flex; - justify-content: space-around; - align-items: center; - - .text4 { - font-size: 16px; - color: #D0DEEE; - letter-spacing: 0; - text-align: center; - line-height: 16px; - font-weight: 400; - } - - .numberTotal { - font-size: 12px; - color: #EBF9FF; - letter-spacing: 1.5px; - font-weight: 400; - - span { - font-size: 20px; - color: #EBFFF8; - letter-spacing: 2.5px; - line-height: 37px; - text-shadow: 0 0 9px rgba(21, 255, 198, 0.64); - font-weight: 700; - } - } - } - - .ygtb { - height: calc(100% - 90px); - width: 100%; - } - } .qycl { height: 22.9%; @@ -134,7 +51,7 @@ export default { } .qywp { - height: 40.56%; + height: 37.56%; width: 100%; margin-bottom: 20px; background: url('~@/assets/safetyIndex/主屏板块1.png') no-repeat; diff --git a/src/views/safetyIndex/yuangong.vue b/src/views/safetyIndex/yuangong.vue new file mode 100644 index 0000000..1ecf5f5 --- /dev/null +++ b/src/views/safetyIndex/yuangong.vue @@ -0,0 +1,540 @@ + + + + + \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index da2a574..38afc98 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2575,6 +2575,11 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" +claygl@^1.2.1: + version "1.3.0" + resolved "https://registry.npmmirror.com/claygl/-/claygl-1.3.0.tgz#7a6e2903210519ac358848f5d78070ed211685f3" + integrity sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ== + clean-css@4.2.x: version "4.2.4" resolved "https://registry.npmmirror.com/clean-css/-/clean-css-4.2.4.tgz" @@ -3488,6 +3493,22 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" +echarts-gl@^2.0.9: + version "2.0.9" + resolved "https://registry.npmmirror.com/echarts-gl/-/echarts-gl-2.0.9.tgz#ee228a6c7520a6fb7bbb71ea94394f3637ade033" + integrity sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA== + dependencies: + claygl "^1.2.1" + zrender "^5.1.1" + +echarts@^5.4.2: + version "5.4.2" + resolved "https://registry.npmmirror.com/echarts/-/echarts-5.4.2.tgz#9f38781c9c6ae323e896956178f6956952c77a48" + integrity sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA== + dependencies: + tslib "2.3.0" + zrender "5.4.3" + ee-first@1.1.1: version "1.1.1" resolved "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz" @@ -8332,6 +8353,11 @@ ts-pnp@^1.1.6: resolved "https://registry.npmmirror.com/ts-pnp/-/ts-pnp-1.2.0.tgz" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== +tslib@2.3.0: + version "2.3.0" + resolved "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + tslib@^1.9.0: version "1.14.1" resolved "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz" @@ -9083,3 +9109,10 @@ yorkie@^2.0.0: is-ci "^1.0.10" normalize-path "^1.0.0" strip-indent "^2.0.0" + +zrender@5.4.3, zrender@^5.1.1: + version "5.4.3" + resolved "https://registry.npmmirror.com/zrender/-/zrender-5.4.3.tgz#41ffaf835f3a3210224abd9d6964b48ff01e79f5" + integrity sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ== + dependencies: + tslib "2.3.0"