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

fix: BUG修改

Browse Source
This commit is contained in:
cjp 2023-11-14 09:37:21 +08:00
parent 80b2de671f
commit 7d1dfd0bde
4 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.production
View File

@ -7,8 +7,10 @@ NODE_ENV = "production"
# VITE_API_URL = "http://jxj.zhgdyun.com:6688" # VITE_API_URL = "http://jxj.zhgdyun.com:6688"
# 沈阳合盈线上 # 沈阳合盈线上
# VITE_API_URL = "http://101.43.164.214:45022" # VITE_API_URL = "http://101.43.164.214:45022"
# 七参数标准版 # 七参数标准版(演示平台)
VITE_API_URL = 'http://jxj.zhgdyun.com:9809' VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
# 七参数标准版(测试平台)
# VITE_API_URL = 'http://jxj.zhgdyun.com:15551'
# 打包 # 打包
VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url=' VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url='

17
src/views/sevenLargeScreen/qualityControl/schedulePlan/leftBottom.vue
View File

@ -14,19 +14,19 @@
<div class="text">工作总数</div> <div class="text">工作总数</div>
<div class="num">{{ workTotal.workCount || 0 }}</div> <div class="num">{{ workTotal.workCount || 0 }}</div>
</div> </div>
<div class="realtime-box"> <div class="realtime-box" v-if="tabIndex === 1">
<div class="text">延迟工作</div> <div class="text">延迟工作</div>
<div class="num">{{ workTotal.delayCount || 0 }}</div> <div class="num">{{ workTotal.delayCount || 0 }}</div>
</div> </div>
<div class="realtime-box"> <div class="realtime-box" v-if="tabIndex === 1">
<div class="text">提前工作</div> <div class="text">提前工作</div>
<div class="num">{{ workTotal.aheadCount || 0 }}</div> <div class="num">{{ workTotal.aheadCount || 0 }}</div>
</div> </div>
</div> </div>
<div class="work-state"> <div class="work-state">
<div class="state-text" :class="checked == 1 ? 'active' : ''" @click="stateChange(1)">进行中</div> <div v-if="tabIndex === 1" class="state-text" :class="checked == 1 ? 'active' : ''" @click="stateChange(1)">进行中</div>
<div class="state-text" :class="checked == 0 ? 'active' : ''" @click="stateChange(0)">未开始</div> <div v-if="tabIndex === 1" class="state-text" :class="checked == 0 ? 'active' : ''" @click="stateChange(0)">未开始</div>
<div class="state-text" :class="checked == 2 ? 'active' : ''" @click="stateChange(2)">已完成</div> <div v-if="tabIndex === 1" class="state-text" :class="checked == 2 ? 'active' : ''" @click="stateChange(2)">已完成</div>
</div> </div>
<div class="monitor-list"> <div class="monitor-list">
@ -225,7 +225,7 @@ const list = reactive([
} }
]); ]);
let checked = ref(1); let checked = ref(1 as any);
const stateChange = async (e: any) => { const stateChange = async (e: any) => {
checked.value = e; checked.value = e;
// await getProjectInfo(); // await getProjectInfo();
@ -246,6 +246,11 @@ let dayList = ref([
]); ]);
let tabIndex = ref(1 as any); let tabIndex = ref(1 as any);
const selectChange = async (e: any) => { const selectChange = async (e: any) => {
if (e === 1) {
checked.value = 1;
} else {
checked.value = "";
}
tabIndex.value = e; tabIndex.value = e;
await getProjectInfo(); await getProjectInfo();
await getRaskList(); await getRaskList();

4
src/views/sevenLargeScreen/qualityControl/schedulePlan/rightBottomLeft.vue
View File

@ -214,8 +214,8 @@ let listData = ref([] as any);
const getChartTotal = async () => { const getChartTotal = async () => {
const res: any = await getCountMppStatus({ projectSn: store.sn }); const res: any = await getCountMppStatus({ projectSn: store.sn });
console.log("状态统计", res); console.log("状态统计", res);
listData.value = res.result; listData.value = res.result.data;
if (res.result.length > 0) { if (res.result.data.length > 0) {
xData.value = res.result.data.map((item: any) => item.name); xData.value = res.result.data.map((item: any) => item.name);
yData.value = res.result.data.map((item: any) => Number(item.count)); yData.value = res.result.data.map((item: any) => Number(item.count));
} }

40
src/views/sevenLargeScreen/towerCraneMonitoring/right.vue
View File

@ -6,7 +6,7 @@
<span style="margin-right: 6%">塔吊信息</span> <span style="margin-right: 6%">塔吊信息</span>
<span><img src="@/assets/images/towerCraneMonitoring/infoIcon.png" alt="" /></span> <span><img src="@/assets/images/towerCraneMonitoring/infoIcon.png" alt="" /></span>
</div> </div>
<div class="selectRight"> <div class="selectRight" v-if="towerDetailData">
<el-select v-model="towerValue" class="m-2" placeholder="Select" size="small"> <el-select v-model="towerValue" class="m-2" placeholder="Select" size="small">
<el-option <el-option
v-for="(item, index) in noiseList" v-for="(item, index) in noiseList"
@ -39,40 +39,40 @@
<div class="btn" @click="moveAnimation()"></div> <div class="btn" @click="moveAnimation()"></div>
</div> </div>
<div class="towerA"><img id="image" src="@/assets/images/towerCraneMonitoring/towerA.png" alt="" /></div> <div class="towerA"><img id="image" src="@/assets/images/towerCraneMonitoring/towerA.png" alt="" /></div>
<div class="lineB" v-show="dataShow"><img src="@/assets/images/towerCraneMonitoring/lineB.png" alt="" /></div> <div class="lineB" v-if="dataShow"><img src="@/assets/images/towerCraneMonitoring/lineB.png" alt="" /></div>
<div class="lineA" v-show="dataShow"><img src="@/assets/images/towerCraneMonitoring/lineA.png" alt="" /></div> <div class="lineA" v-if="dataShow"><img src="@/assets/images/towerCraneMonitoring/lineA.png" alt="" /></div>
<div class="lineC" v-show="dataShow"><img src="@/assets/images/towerCraneMonitoring/lineC.png" alt="" /></div> <div class="lineC" v-if="dataShow"><img src="@/assets/images/towerCraneMonitoring/lineC.png" alt="" /></div>
<div class="lineD" v-show="dataShow"><img src="@/assets/images/towerCraneMonitoring/lineD.png" alt="" /></div> <div class="lineD" v-if="dataShow"><img src="@/assets/images/towerCraneMonitoring/lineD.png" alt="" /></div>
<div class="lineAdata" v-show="dataShow"> <div class="lineAdata" v-if="dataShow">
<div>荷载比</div> <div>荷载比</div>
<!-- 后端没有该字段，待定 --> <!-- 后端没有该字段，待定 -->
<div style="color: #65d7f9">{{ towerDetail.loadRatio || 0 }}%</div> <div style="color: #65d7f9">{{ towerDetail.loadRatio || 0 }}%</div>
</div> </div>
<div class="lineAdata" v-show="dataShow" style="left: 15%"> <div class="lineAdata" v-if="dataShow" style="left: 15%">
<div>力矩比</div> <div>力矩比</div>
<div style="color: #65d7f9">{{ towerDetail.torqueRatio || 0 }}%</div> <div style="color: #65d7f9">{{ towerDetail.torqueRatio || 0 }}%</div>
</div> </div>
<div class="lineAdata" v-show="dataShow" style="left: 5%; top: 67%"> <div class="lineAdata" v-if="dataShow" style="left: 5%; top: 67%">
<div>吊重</div> <div>吊重</div>
<div style="color: #65d7f9">{{ towerDetail.loading || 0 }}kg</div> <div style="color: #65d7f9">{{ towerDetail.loading || 0 }}kg</div>
</div> </div>
<div class="lineAdata" v-show="dataShow" style="left: 11%; top: 67%"> <div class="lineAdata" v-if="dataShow" style="left: 11%; top: 67%">
<div>幅度</div> <div>幅度</div>
<div style="color: #65d7f9">{{ towerDetail.ranger || 0 }}m</div> <div style="color: #65d7f9">{{ towerDetail.ranger || 0 }}m</div>
</div> </div>
<div class="lineAdata" v-show="dataShow" style="left: 17%; top: 67%"> <div class="lineAdata" v-if="dataShow" style="left: 17%; top: 67%">
<div>高度</div> <div>高度</div>
<div style="color: #65d7f9">{{ towerDetail.height || 0 }}m</div> <div style="color: #65d7f9">{{ towerDetail.height || 0 }}m</div>
</div> </div>
<div class="lineAdata" v-show="dataShow" style="left: 57%; top: 27%"> <div class="lineAdata" v-if="dataShow" style="left: 57%; top: 27%">
<div>风速</div> <div>风速</div>
<div style="color: #65d7f9">{{ towerDetail.windspeed || 0 }}m/s</div> <div style="color: #65d7f9">{{ towerDetail.windspeed || 0 }}m/s</div>
</div> </div>
<div class="lineAdata" v-show="dataShow" style="left: 51%; top: 65%"> <div class="lineAdata" v-if="dataShow" style="left: 51%; top: 65%">
<div>转角</div> <div>转角</div>
<div style="color: #65d7f9">{{ towerDetail.angle || 0 }}°</div> <div style="color: #65d7f9">{{ towerDetail.angle || 0 }}°</div>
</div> </div>
<div class="lineBdata" v-show="dataShow" style="left: 57%; top: 65%"> <div class="lineBdata" v-if="dataShow" style="left: 57%; top: 65%">
<div>倾角</div> <div>倾角</div>
<div style="color: #ec6266">{{ towerDetail.obliguity || 0 }}°</div> <div style="color: #ec6266">{{ towerDetail.obliguity || 0 }}°</div>
</div> </div>
@ -308,9 +308,13 @@ const getTowerDetail = async () => {
if (res.result) { if (res.result) {
towerDetailData.value = res.result; towerDetailData.value = res.result;
// towerDevSn.value = res.result.devSn; // towerDevSn.value = res.result.devSn;
towerVideoId.value = res.result.videoList[0].serialNumber;
mitts.emit("serialNumberId", towerVideoId.value);
console.log("塔吊信息详情", res.result); console.log("塔吊信息详情", res.result);
if (res.result.videoList.length > 0) {
towerVideoId.value = res.result.videoList[0].serialNumber;
mitts.emit("serialNumberId", towerVideoId.value);
} else {
mitts.emit("serialNumberId", "");
}
} }
}; };
//获取塔吊实时数据 //获取塔吊实时数据
@ -689,9 +693,9 @@ onMounted(async () => {
} }
.notoDta { .notoDta {
width: 20%; width: 20%;
height: 20%; height: 20%;
margin-top: 20%; margin-top: 20%;
margin-left: 40%; margin-left: 40%;
img { img {
width: 30%; width: 30%;
margin: 6% 36%; margin: 6% 36%;