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

Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain

Browse Source
This commit is contained in:
X_Rian 2024-06-03 18:48:52 +08:00
commit 983f53a944
3 changed files with 22 additions and 10 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'
@ -24,7 +24,7 @@ VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程
# 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'
# 苏立信 # 苏立信

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

@ -13,12 +13,16 @@
<div style="display:flex" v-if="typeof totalPersonRhbRatio == 'undefined'"> <div style="display:flex" v-if="typeof totalPersonRhbRatio == 'undefined'">
<div class="dayRadio">0%</div> <div class="dayRadio">0%</div>
</div> </div>
<!-- <div style="display:flex" v-if="!totalPersonRhbRatio">
<div class="dayRadio">0%</div>
</div> -->
<div style="display:flex" v-if="totalPersonRhbRatio > 0"> <div style="display:flex" v-if="totalPersonRhbRatio > 0">
<div class="dayRadio">{{totalPersonRhbRatio}}%</div> <div class="dayRadio">{{totalPersonRhbRatio}}%</div>
<div class="iconCenter"><el-icon size="20" color="#1E90FF"><Top/></el-icon></div> <div class="iconCenter"><el-icon size="20" color="#1E90FF"><Top/></el-icon></div>
</div> </div>
<div style="display:flex" v-if="totalPersonRhbRatio == 0"> <div style="display:flex" v-if="totalPersonRhbRatio == 0">
<div class="dayRadio">{{totalPersonRhbRatio}}%</div> <!-- <div class="dayRadio">{{totalPersonRhbRatio}}%</div> -->
<div class="dayRadio">0%</div>
</div> </div>
<div style="display:flex" v-if="totalPersonRhbRatio < 0"> <div style="display:flex" v-if="totalPersonRhbRatio < 0">
<div class="dayRadio">{{Math.abs(totalPersonRhbRatio)}}%</div> <div class="dayRadio">{{Math.abs(totalPersonRhbRatio)}}%</div>
@ -29,9 +33,15 @@
<div :class="['line2Item',activeIndex === '0' ? 'activeTab' : '']" @click="handleTab('0')">总包出勤情况分析</div> <div :class="['line2Item',activeIndex === '0' ? 'activeTab' : '']" @click="handleTab('0')">总包出勤情况分析</div>
<div :class="['line2Item',activeIndex === '1' ? 'activeTab' : '']" @click="handleTab('1')">人员风险趋势分析</div> <div :class="['line2Item',activeIndex === '1' ? 'activeTab' : '']" @click="handleTab('1')">人员风险趋势分析</div>
</div> </div>
<div class="barContent"> <div class="barContent" v-if="projectCompanyWorkTotalList.length>0">
<div id="bar" style="width:98%;height:100%" ref="bar"></div> <div id="bar" style="width:98%;height:100%" ref="bar"></div>
</div> </div>
<div class="cbProcess" v-if="projectCompanyWorkTotalList.length == 0">
<div class="notoDta" v-if="projectCompanyWorkTotalList.length == 0">
<img src="@/assets/images/noData.png" style="margin-top:100px" alt="" />
<p>暂无数据</p>
</div>
</div>
</div> </div>
<div class="centerBottom"> <div class="centerBottom">
<div class="cbTop"> <div class="cbTop">
@ -76,12 +86,12 @@
</div> </div>
</vue3-seamless-scroll> </vue3-seamless-scroll>
</div> </div>
<!-- <div class="cbProcess" v-else-if="processList.length === 0"> <div class="cbProcess" v-else-if="processList.length == 0">
<div class="notoDta" v-if="dataList.length == 0"> <div class="notoDta" v-if="processList.length == 0">
<img src="@/assets/images/noData.png" alt="" /> <img src="@/assets/images/noData.png" alt="" />
<p>暂无数据</p> <p>暂无数据</p>
</div> </div>
</div> --> </div>
<div class="cbProcess" v-else> <div class="cbProcess" v-else>
<!-- v-if="listData.length>0" :list="listData" --> <!-- v-if="listData.length>0" :list="listData" -->
<!-- <vue3-seamless-scroll <!-- <vue3-seamless-scroll
@ -163,7 +173,8 @@ let yData = ref([] as any)
//获取总包出勤情况分析数据 //获取总包出勤情况分析数据
const queryAttendanceOfEachCompany = async () => { const queryAttendanceOfEachCompany = async () => {
const res: any = await queryAttendanceOfEachCompanyApi({ const res: any = await queryAttendanceOfEachCompanyApi({
projectSn: store.sn projectSn: store.sn,
isCountMainEnterprise: 1
}); });
if (res.result) { if (res.result) {
console.log("获取总包出勤情况分析数据", res); console.log("获取总包出勤情况分析数据", res);
@ -327,7 +338,7 @@ let processList = ref([] as any)
const queryCountEnterprise = async () => { const queryCountEnterprise = async () => {
const res: any = await queryCountEnterpriseApi({ const res: any = await queryCountEnterpriseApi({
projectSn: store.sn, projectSn: store.sn,
isCountMainEnterprise: "1" isCountMainEnterprise: 1
}); });
if (res.result) { if (res.result) {
console.log("总包进度列表", res); console.log("总包进度列表", res);
@ -418,7 +429,7 @@ onMounted(async () => {
height: 25px; height: 25px;
.line2Item{ .line2Item{
color: #fff; color: #fff;
width: 120px; width: 140px;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
// background-color: #fff; // background-color: #fff;

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

@ -1433,6 +1433,7 @@ onMounted(async () => {
> div { > div {
// padding: 2px 0; // padding: 2px 0;
font-size: 13px; font-size: 13px;
font-weight: normal;
line-height: 25px; line-height: 25px;
width: 170px; width: 170px;
width: 140px; width: 140px;