diff --git a/src/api/enterpriseRank/index.js b/src/api/enterpriseRank/index.js new file mode 100644 index 0000000..458e5cb --- /dev/null +++ b/src/api/enterpriseRank/index.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' +//首页数据统计 +export function getSafeCompanyStatisticsScore(params) { + return request({ + url: '/safety/system/tbSafeCompanyStatisticsScore/getSafeCompanyStatisticsScore', + method: 'post', + params + }) +} \ No newline at end of file diff --git a/src/assets/archives/touxiang.png b/src/assets/archives/touxiang.png new file mode 100644 index 0000000..c8bc471 Binary files /dev/null and b/src/assets/archives/touxiang.png differ diff --git a/src/router/index.js b/src/router/index.js index f5eec05..2b476ec 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -33,7 +33,12 @@ const routes = [ name: 'safetyIndex', component: () => import('@/views/safetyIndex'), }, + { + path: 'enterpriseRank', + name: 'enterpriseRank', + component: () => import('@/views/enterpriseRank'), + }, // 系统管理 { path: 'systemManagement', diff --git a/src/views/archives/kakou.vue b/src/views/archives/kakou.vue index 54b78c1..b3deb08 100644 --- a/src/views/archives/kakou.vue +++ b/src/views/archives/kakou.vue @@ -22,7 +22,7 @@ 搜索 - +
人脸
{ this.tableData = res.data this.imgDetailList = res.data[0] || {} this.total = res.total - if (!res.data.length) { - this.$message.warning('没有匹配数据') - } + // if (!res.data.length) { + // this.$message.warning('没有匹配数据') + // } }) } else { this.formInline.idcard = null @@ -226,9 +230,9 @@ export default { this.vechileList = res.data this.total = res.total this.vechileDetailList = res.data[0] || {} - if (!res.data.length) { - this.$message.warning('没有匹配数据') - } + // if (!res.data.length) { + // this.$message.warning('没有匹配数据') + // } }) } @@ -517,7 +521,6 @@ export default { } } - /deep/.el-tabs { width: 100%; @@ -529,23 +532,20 @@ export default { .imgList { box-sizing: border-box; - width: 100%; - - + width: calc(100% - 314px); height: 622px; - display: flex; - align-content: space-between; flex-wrap: wrap; .imgListItem { - height: 280px; - width: calc(23% - 10px); + height: 300px; + width: calc(25% - 20px); background: url("~@/assets/archives/背景9001.png") no-repeat; background-size: 100% 100%; padding: 10px; - margin: 0 7px; + margin: 0 10px; + box-sizing: border-box; .ListItem { background: url("~@/assets/archives/矩形备份 2921.png") no-repeat; @@ -588,11 +588,8 @@ export default { filter: brightness(150%); } - - .imgListItemFocus { filter: brightness(150%); - } } diff --git a/src/views/archives/liudongrenyuan.vue b/src/views/archives/liudongrenyuan.vue index 887156e..4728dc0 100644 --- a/src/views/archives/liudongrenyuan.vue +++ b/src/views/archives/liudongrenyuan.vue @@ -24,7 +24,9 @@ diff --git a/src/views/archives/qiyeyuangong.vue b/src/views/archives/qiyeyuangong.vue index a6888ef..41b9953 100644 --- a/src/views/archives/qiyeyuangong.vue +++ b/src/views/archives/qiyeyuangong.vue @@ -8,11 +8,11 @@ - 搜索 + 搜索
- - + +
{{ item.type }}({{ item.number }})
丨 @@ -24,7 +24,8 @@ @@ -71,6 +72,7 @@ export default { tableData: [], wpCount: {}, goodsType: null, + activeName: '全部', } }, created() { @@ -92,8 +94,10 @@ export default { }, getList(val) { if (val) { + this.activeName = val if (val == '全部') { this.goodsType = null + } else if (val == '普通员工') { this.goodsType = 1 } else if (val == '重点岗位') { @@ -104,6 +108,7 @@ export default { this.goodsType = 4 } } + console.log(this.activeName, 'this.activeName'); tbSafeCompanyStaff({ pageSize: this.pageSize, pageNum: this.pageNum, ...this.formInline, companyId: this.companyID, staffType: this.goodsType }).then(res => { this.tableData = res.data this.total = res.total diff --git a/src/views/archives/wupin.vue b/src/views/archives/wupin.vue index 9f4df90..b39b26a 100644 --- a/src/views/archives/wupin.vue +++ b/src/views/archives/wupin.vue @@ -271,7 +271,7 @@ export default { align-items: center; .paneInner { - width: 110px; + width: 100px; height: 100%; display: flex; diff --git a/src/views/archives/yujing.vue b/src/views/archives/yujing.vue index a8a9a55..dfdbb0f 100644 --- a/src/views/archives/yujing.vue +++ b/src/views/archives/yujing.vue @@ -20,10 +20,8 @@
- - + - diff --git a/src/views/enterpriseRank/index.vue b/src/views/enterpriseRank/index.vue new file mode 100644 index 0000000..a2eb4af --- /dev/null +++ b/src/views/enterpriseRank/index.vue @@ -0,0 +1,823 @@ + + + \ No newline at end of file diff --git a/src/views/safetyIndex/anjian.vue b/src/views/safetyIndex/anjian.vue index 7cf1067..e909fc3 100644 --- a/src/views/safetyIndex/anjian.vue +++ b/src/views/safetyIndex/anjian.vue @@ -167,7 +167,7 @@ export default {