Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev
This commit is contained in:
kun
commit
0367457730
@ -4,7 +4,7 @@ NODE_ENV = 'development'
|
||||
# 本地环境接口地址(/api/index.ts文件中使用)
|
||||
# 后端本地
|
||||
# VITE_API_URL = 'http://192.168.34.221:19111'
|
||||
VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
|
||||
# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
|
||||
# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程
|
||||
# VITE_API_URL = 'http://192.168.34.221:28889'
|
||||
# VITE_API_URL = 'http://121.196.214.246/api'
|
||||
@ -24,7 +24,7 @@ VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
|
||||
# VITE_API_URL = 'http://182.90.224.237:15551'
|
||||
# agjt
|
||||
# VITE_API_URL = 'http://42.180.188.17:9809' #生产环境
|
||||
# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
|
||||
VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
|
||||
# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
|
||||
# VITE_API_URL = 'http://jxj.zhgdyun.com:19812'
|
||||
# 苏立信
|
||||
|
||||
4834
package-lock.json
generated
4834
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
BIN
src/assets/images/green_flag_bg.png
Normal file
BIN
src/assets/images/green_flag_bg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
@ -50,12 +50,26 @@
|
||||
<span :style="statScore.radio > 0 ? 'color:#0db027' : 'color:#f77c7d'">{{ statScore.radio > 0 ? "↑" : "↓" }} </span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="score-div" @click="openDialogData({ index: 9, title: '月度安全综合评分' })">
|
||||
<div :class="['score-div', statScore.total >= 80 ? 'scoreBg1':statScore.total >= 60 ? 'scoreBg2':'scoreBg3']" @click="openDialogData({ index: 9, title: '月度安全综合评分' })">
|
||||
<div class="score-part">
|
||||
<span>{{ statScore.total }}</span>
|
||||
<span>分</span>
|
||||
</div>
|
||||
<span>安全评分</span>
|
||||
<div class="scoreInner scoreTextBg1" v-if="statScore.total >= 80">
|
||||
<span style="font-size:18px">安全评分</span>
|
||||
<div class="scoreReview" >优秀</div>
|
||||
<div class="scoreStar"></div>
|
||||
</div>
|
||||
<div class="scoreInner scoreTextBg2" v-if="statScore.total >= 60 && statScore.total < 80">
|
||||
<span style="font-size:18px">安全评分</span>
|
||||
<div class="scoreReview">一般</div>
|
||||
<div class="scoreStar"></div>
|
||||
</div>
|
||||
<div class="scoreInner scoreTextBg3" v-if="statScore.total < 60">
|
||||
<span style="font-size:18px">安全评分</span>
|
||||
<div class="scoreReview">差</div>
|
||||
<div class="scoreStar"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="classify-div">
|
||||
<div class="classify-div-item" @click="openDialogData({ index: 1, title: '危大工程' })">
|
||||
@ -282,13 +296,20 @@ onMounted(async () => {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.scoreBg1{background-image: radial-gradient(circle, rgb(46, 200, 49) 0px, rgba(255, 255, 255, 0) 115px);}
|
||||
.scoreBg2{background-image: radial-gradient(circle, rgb(255,175,0) 0px, rgba(255, 255, 255, 0) 115px);}
|
||||
.scoreBg3{background-image: radial-gradient(circle, rgb(200, 46, 56) 0px, rgba(255, 255, 255, 0) 115px);}
|
||||
.scoreTextBg1{background-image: radial-gradient(circle, rgb(46, 200, 49) 0px, rgba(255, 255, 255, 0) 40px);}
|
||||
.scoreTextBg2{background-image: radial-gradient(circle, rgb(255,175,0) 0px, rgba(255, 255, 255, 0) 40px);}
|
||||
.scoreTextBg3{background-image: radial-gradient(circle, rgb(200, 46, 56) 0px, rgba(255, 255, 255, 0) 40px);}
|
||||
.centerTop {
|
||||
// background-color: darkred;
|
||||
.top-content {
|
||||
height: 100%;
|
||||
position: relative;
|
||||
background-image: url("@/assets/images/commandScreen/top-bg.png");
|
||||
background-position: center;
|
||||
// background-position: center;
|
||||
background-position: -28px;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
.content-div {
|
||||
@ -382,19 +403,20 @@ onMounted(async () => {
|
||||
}
|
||||
|
||||
.score-div {
|
||||
|
||||
color: white;
|
||||
position: absolute;
|
||||
// bottom: 210px;
|
||||
// left: 383px;
|
||||
width: 30%;
|
||||
height: 30%;
|
||||
bottom: 33%;
|
||||
height: 45%;
|
||||
bottom: 30%;
|
||||
left: 35.5%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
|
||||
.score-part {
|
||||
margin-top: 60px;
|
||||
span:nth-child(1) {
|
||||
font-size: 72px;
|
||||
}
|
||||
@ -408,6 +430,36 @@ onMounted(async () => {
|
||||
color: white;
|
||||
font-size: 18px;
|
||||
}
|
||||
.scoreInner{
|
||||
text-align: center;
|
||||
margin-top: -10px;
|
||||
width: 90%;
|
||||
// height: 100px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
// background-color: red;
|
||||
.scoreReview{
|
||||
opacity: 0.7;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
height: 50px;
|
||||
// background-color: blue;
|
||||
}
|
||||
.scoreStar{
|
||||
// background-color: purple;
|
||||
// margin-top: 20px;
|
||||
width: 28%;
|
||||
height: 40px;
|
||||
background: url("@/assets/images/green_flag_bg.png") no-repeat;
|
||||
background-size: 100% 100%;
|
||||
|
||||
transform: translateY(-20px);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.classify-div {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<template>
|
||||
s<template>
|
||||
<div class="leftBottom">
|
||||
<div class="header">
|
||||
<div class="hLeft">项目人员考勤</div>
|
||||
@ -139,7 +139,7 @@
|
||||
<script setup lang="ts">
|
||||
import { onMounted, ref } from "vue";
|
||||
import * as echarts from "echarts";
|
||||
import ECharts from "vue-echarts";
|
||||
// import ECharts from "vue-echarts";
|
||||
import { selectQualityStatisticsApi } from "@/api/modules/projectOverview";
|
||||
import {
|
||||
getPersonTypeAndEduStatisticsApi,
|
||||
@ -305,7 +305,10 @@ function drawBar() {
|
||||
if (!attendanceRhbRate) {
|
||||
attendanceRhbRate = "--";
|
||||
} else {
|
||||
attendanceRhbRate = attendanceRhbRate + "%";
|
||||
if(attendanceRhbRate > 0) attendanceRhbRate = "<span style='color:blue;margin-right:5px'>↑</span>"+Math.abs(attendanceRhbRate)+"%"
|
||||
if(attendanceRhbRate < 0) attendanceRhbRate = "<span style='color:darkred;margin-right:5px'>↓</span>"+Math.abs(attendanceRhbRate)+"%"
|
||||
if(attendanceRhbRate == 0) attendanceRhbRate = "0%"
|
||||
// attendanceRhbRate = attendanceRhbRate + "%";
|
||||
}
|
||||
console.log(params);
|
||||
console.log(123123, projectCompanyWorkTotalList.value[params.dataIndex].attendancePersonRate);
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="ctContent" style="position: relative">
|
||||
<div id="echartsSafe" style="width: 100%; height: 100%"></div>
|
||||
<div id="echartsSafe" style="width: 100%; height: 100%;transform:translateY(-13px)"></div>
|
||||
<div class="safetext1" v-if="dataList.length != 0">状态统计（较昨日）</div>
|
||||
<div class="safetext2" v-if="dataList.length != 0">风险统计（较昨日）</div>
|
||||
<div class="notoDta" v-if="dataCode != 200">
|
||||
@ -341,7 +341,7 @@ function drawEchart() {
|
||||
type: "plain",
|
||||
orient: "vertical",
|
||||
right: "0%",
|
||||
top: "20%",
|
||||
top: "25%",
|
||||
align: "left",
|
||||
itemGap: 14,
|
||||
itemWidth: 8, // 设置宽度
|
||||
@ -409,7 +409,7 @@ function drawEchart() {
|
||||
type: "plain",
|
||||
orient: "vertical",
|
||||
left: "35%",
|
||||
top: "20%",
|
||||
top: "25%",
|
||||
align: "left",
|
||||
itemGap: 14,
|
||||
itemWidth: 8, // 设置宽度
|
||||
|
||||
@ -53,12 +53,14 @@
|
||||
<p>暂无数据</p>
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="tabList">
|
||||
|
||||
|
||||
<!-- <div class="tabList">
|
||||
<div>排名</div>
|
||||
<div v-if="activeIndex === '1' || activeIndex === '2'">姓名</div>
|
||||
<div v-if="activeIndex === '0'">分包单位</div>
|
||||
<div v-if="activeIndex === '0' || activeIndex === '2'">整改数量</div>
|
||||
<div v-if="activeIndex === '1'">发起隐患数</div>
|
||||
<div v-if="activeIndex === '0' || activeIndex === '1'">整改数量</div>
|
||||
<div v-if="activeIndex === '2'">发起隐患数</div>
|
||||
<div>整改率</div>
|
||||
<div>及时整改率</div>
|
||||
</div>
|
||||
@ -78,6 +80,81 @@
|
||||
<img src="@/assets/images/noData.png" alt="" />
|
||||
<p>暂无数据</p>
|
||||
</div>
|
||||
</div> -->
|
||||
<div v-if="activeIndex === '0'">
|
||||
<div class="tabList">
|
||||
<div>排名</div>
|
||||
<div>分包单位</div>
|
||||
<div>整改数量</div>
|
||||
<div>整改率</div>
|
||||
<div>及时整改率</div>
|
||||
</div>
|
||||
<div class="listBox">
|
||||
|
||||
<el-scrollbar>
|
||||
<div v-for="(item, index) in tabList" :key="index" class="listStyle">
|
||||
<div>{{ index + 1 }}</div>
|
||||
<div :title="item.enterpriseName">{{ item.enterpriseName }}</div>
|
||||
<div>{{ item.createDangerNum || item.rectifiedNum}}</div>
|
||||
<div>{{ item.rectifiedNumRatio }}</div>
|
||||
<div>{{ item.rectifiedNumRatioTimely }}</div>
|
||||
</div>
|
||||
</el-scrollbar>
|
||||
<div class="notoDta" v-if="tabList.length == 0">
|
||||
<img src="@/assets/images/noData.png" alt="" />
|
||||
<p>暂无数据</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="activeIndex === '1'">
|
||||
<div class="tabList">
|
||||
<div>排名</div>
|
||||
<div>姓名</div>
|
||||
<div>整改数量</div>
|
||||
<div>整改率</div>
|
||||
<div>及时整改率</div>
|
||||
</div>
|
||||
<div class="listBox">
|
||||
|
||||
<el-scrollbar>
|
||||
<div v-for="(item, index) in tabList" :key="index" class="listStyle">
|
||||
<div>{{ index + 1 }}</div>
|
||||
<div>{{ item.workerName }}</div>
|
||||
<div>{{ item.createDangerNum || item.rectifiedNum}}</div>
|
||||
<div>{{ item.rectifiedNumRatio }}</div>
|
||||
<div>{{ item.rectifiedNumRatioTimely }}</div>
|
||||
</div>
|
||||
</el-scrollbar>
|
||||
<div class="notoDta" v-if="tabList.length == 0">
|
||||
<img src="@/assets/images/noData.png" alt="" />
|
||||
<p>暂无数据</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="activeIndex === '2'">
|
||||
<div class="tabList">
|
||||
<div>排名</div>
|
||||
<div>姓名</div>
|
||||
<div>发起隐患数</div>
|
||||
<div>整改率</div>
|
||||
<div>及时整改率</div>
|
||||
</div>
|
||||
<div class="listBox">
|
||||
|
||||
<el-scrollbar>
|
||||
<div v-for="(item, index) in tabList" :key="index" class="listStyle">
|
||||
<div>{{ index + 1 }}</div>
|
||||
<div>{{ item.workerName }}</div>
|
||||
<div>{{ item.createDangerNum }}</div>
|
||||
<div>{{ item.rectifiedNumRatio }}</div>
|
||||
<div>{{ item.rectifiedNumRatioTimely }}</div>
|
||||
</div>
|
||||
</el-scrollbar>
|
||||
<div class="notoDta" v-if="tabList.length == 0">
|
||||
<img src="@/assets/images/noData.png" alt="" />
|
||||
<p>暂无数据</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user