admin/zhgdlarge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cjw-dev' into shenzhen-dev

Browse Source
This commit is contained in:
Vce 2024-06-04 22:06:57 +08:00
commit 99c597d136
7 changed files with 162 additions and 4815 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -4,7 +4,7 @@ NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
# 后端本地 # 后端本地
# VITE_API_URL = 'http://192.168.34.221:19111' # 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://182.90.224.237:51234' #雄哥远程
# VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://192.168.34.221:28889'
# VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://121.196.214.246/api'
@ -23,7 +23,7 @@ VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
# 七参数标准版(测试平台) # 七参数标准版(测试平台)
# VITE_API_URL = 'http://182.90.224.237:15551' # VITE_API_URL = 'http://182.90.224.237:15551'
# agjt # agjt
# VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 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://42.180.188.17:11211' #测试环境
# VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # VITE_API_URL = 'http://jxj.zhgdyun.com:19812'

4834
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

BIN
src/assets/images/green_flag_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

48
src/views/commandScreen/commandCenter/centerTop.vue
View File

@ -55,7 +55,13 @@
<span>{{ statScore.total }}</span> <span>{{ statScore.total }}</span>
<span>分</span> <span>分</span>
</div> </div>
<span>安全评分</span> <div class="scoreInner">
<span style="font-size:18px">安全评分</span>
<div class="scoreReview">
优秀
</div>
<div class="scoreStar"></div>
</div>
</div> </div>
<div class="classify-div"> <div class="classify-div">
<div class="classify-div-item" @click="openDialogData({ index: 1, title: '危大工程' })"> <div class="classify-div-item" @click="openDialogData({ index: 1, title: '危大工程' })">
@ -288,7 +294,8 @@ onMounted(async () => {
height: 100%; height: 100%;
position: relative; position: relative;
background-image: url("@/assets/images/commandScreen/top-bg.png"); background-image: url("@/assets/images/commandScreen/top-bg.png");
background-position: center; // background-position: center;
background-position: -28px;
background-repeat: no-repeat; background-repeat: no-repeat;
.content-div { .content-div {
@ -382,19 +389,20 @@ onMounted(async () => {
} }
.score-div { .score-div {
background-image: radial-gradient(circle, rgb(46, 200, 49) 0px, rgba(255, 255, 255, 0) 115px);
color: white; color: white;
position: absolute; position: absolute;
// bottom: 210px; // bottom: 210px;
// left: 383px; // left: 383px;
width: 30%; width: 30%;
height: 30%; height: 45%;
bottom: 33%; bottom: 30%;
left: 35.5%; left: 35.5%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.score-part { .score-part {
margin-top: 60px;
span:nth-child(1) { span:nth-child(1) {
font-size: 72px; font-size: 72px;
} }
@ -408,6 +416,36 @@ onMounted(async () => {
color: white; color: white;
font-size: 18px; font-size: 18px;
} }
.scoreInner{
text-align: center;
margin-top: -10px;
width: 100%;
// height: 100px;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
background-image: radial-gradient(circle, rgb(46, 200, 49) 0px, rgba(255, 255, 255, 0) 40px);
// 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 { .classify-div {

2
src/views/commandScreen/commandCenter/leftBottom.vue
View File

@ -139,7 +139,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, ref } from "vue"; import { onMounted, ref } from "vue";
import * as echarts from "echarts"; import * as echarts from "echarts";
import ECharts from "vue-echarts"; // import ECharts from "vue-echarts";
import { selectQualityStatisticsApi } from "@/api/modules/projectOverview"; import { selectQualityStatisticsApi } from "@/api/modules/projectOverview";
import { import {
getPersonTypeAndEduStatisticsApi, getPersonTypeAndEduStatisticsApi,

6
src/views/commandScreen/commandCenter/rightAll.vue
View File

@ -30,7 +30,7 @@
</div> </div>
</div> </div>
<div class="ctContent" style="position: relative"> <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="safetext1" v-if="dataList.length != 0">状态统计（较昨日）</div>
<div class="safetext2" v-if="dataList.length != 0">风险统计（较昨日）</div> <div class="safetext2" v-if="dataList.length != 0">风险统计（较昨日）</div>
<div class="notoDta" v-if="dataCode != 200"> <div class="notoDta" v-if="dataCode != 200">
@ -341,7 +341,7 @@ function drawEchart() {
type: "plain", type: "plain",
orient: "vertical", orient: "vertical",
right: "0%", right: "0%",
top: "20%", top: "25%",
align: "left", align: "left",
itemGap: 14, itemGap: 14,
itemWidth: 8, // 设置宽度 itemWidth: 8, // 设置宽度
@ -409,7 +409,7 @@ function drawEchart() {
type: "plain", type: "plain",
orient: "vertical", orient: "vertical",
left: "35%", left: "35%",
top: "20%", top: "25%",
align: "left", align: "left",
itemGap: 14, itemGap: 14,
itemWidth: 8, // 设置宽度 itemWidth: 8, // 设置宽度

83
src/views/commandScreen/components/leftBottom.vue
View File

@ -53,12 +53,14 @@
<p>暂无数据</p> <p>暂无数据</p>
</div> </div>
</div> --> </div> -->
<div class="tabList">
<!-- <div class="tabList">
<div>排名</div> <div>排名</div>
<div v-if="activeIndex === '1' || activeIndex === '2'">姓名</div> <div v-if="activeIndex === '1' || activeIndex === '2'">姓名</div>
<div v-if="activeIndex === '0'">分包单位</div> <div v-if="activeIndex === '0'">分包单位</div>
<div v-if="activeIndex === '0' || activeIndex === '2'">整改数量</div> <div v-if="activeIndex === '0' || activeIndex === '1'">整改数量</div>
<div v-if="activeIndex === '1'">发起隐患数</div> <div v-if="activeIndex === '2'">发起隐患数</div>
<div>整改率</div> <div>整改率</div>
<div>及时整改率</div> <div>及时整改率</div>
</div> </div>
@ -78,6 +80,81 @@
<img src="@/assets/images/noData.png" alt="" /> <img src="@/assets/images/noData.png" alt="" />
<p>暂无数据</p> <p>暂无数据</p>
</div> </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> </div>
</div> </div>