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

解决冲突

Browse Source
This commit is contained in:
骆乐 2022-07-30 15:37:06 +08:00
parent 55079b40fd
commit f7bfeb81ff
1 changed files with 2 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/views/projectAdmin/dataBoard/index.vue
View File

@ -298,35 +298,9 @@
v-if="COMPANY != 'longguang' && enabledProjectV2 != 3"
class="blockContent"
>
<<<<<<< HEAD
<div class="safeChart" ref="safeChart"></div>
<div class="descBox fullHeight">
<div>
<div class="descItem descItem1">
<!-- 已整改安全问题 -->
<p class="text">
<i class="dot purple"></i
>{{ $t('message.companyDiagram.rectificationSafeQuestion') }}
</p>
<p class="num">{{ secureData.completeNum }}</p>
</div>
<div class="descItem">
<!-- 未整改安全问题 -->
<p class="text">
<i class="dot red"></i
>{{
$t('message.companyDiagram.noRectificationSafeQuestion')
}}
</p>
<p class="num">{{ secureData.rectificationNum }}</p>
</div>
</div>
</div>
=======
<safeManage></safeManage>
<!-- <div class="safeChart" ref="safeChart"></div> -->
>>>>>>> dev-xiaole
</div>
</div>
<!-- </div>-->
@ -353,33 +327,8 @@
v-if="COMPANY != 'longguang' && enabledProjectV2 != 3"
class="descBox fullHeight"
>
<<<<<<< HEAD
<div>
<div class="descItem descItem1">
<!-- 已整改质量问题 -->
<p class="text">
<i class="dot blue"></i
>{{
$t('message.companyDiagram.rectificationQualityQuestion')
}}
</p>
<p class="num">{{ qualityData.completeNum }}</p>
</div>
<div class="descItem">
<!-- 未整改质量问题 -->
<p class="text">
<i class="dot green"></i
>{{
$t('message.companyDiagram.noRectificationQualityQuestion')
}}
</p>
<p class="num">{{ qualityData.rectificationNum }}</p>
</div>
</div>
=======
<qualityManage></qualityManage>
<!-- 此处剪切了一部分 -->
>>>>>>> dev-xiaole
</div>
<!-- 设备报警内容 -->
<div class="attendance-cards2" v-else>
@ -484,21 +433,9 @@
v-if="COMPANY != 'longguang' && enabledProjectV2 != 3"
class="blockContent"
>
<<<<<<< HEAD
<!-- <airQulityChart></airQulityChart> -->
<img
style="width: 150px; height: 150px; margin-left: 100px"
src="../../../assets/images/enrivtop.png"
/>
<img
style="width: 250px; margin-left: 50px"
src="../../../assets/images/enriobottom.png"
/>
=======
<!-- 环境监测 -->
<airQulity :show='true' :size='small'></airQulity>
>>>>>>> dev-xiaole
</div>
<div v-else class="blockContent alarmBlockContent">
<vue-scroll>
@ -556,14 +493,6 @@
</div>
</template>
<script>
<<<<<<< HEAD
import echarts from 'echarts4'
const echarts5 = require('echarts')
import devNumChart from '@/components/chart/devNumChart'
import airQulityChart from '@/components/chart/airQulityChart'
import { getWorkerStatisticsCountApi } from '@/assets/js/api/company/project'
import { getProjectDetail, editProjectInfo } from '@/assets/js/api/baseInfo.js'
=======
import echarts from "echarts4";
const echarts5 = require("echarts");
import safeManage from "./homePage/safeManage"
@ -573,7 +502,6 @@ import devNumChart from "@/components/chart/devNumChart";
import airQulityChart from "@/components/chart/airQulityChart";
import { getWorkerStatisticsCountApi } from "@/assets/js/api/company/project";
import { getProjectDetail, editProjectInfo } from "@/assets/js/api/baseInfo.js";
>>>>>>> dev-xiaole
import {
selectSecurityManageStatisticsApi,
selectQualityStatisticsApi,
@ -598,11 +526,7 @@ import ProjectInfo from './homePage/projectInfo'
import PersonOverview from './homePage/personOverview'
export default {
<<<<<<< HEAD
components: { devNumChart, airQulityChart, ProjectInfo, PersonOverview },
=======
components: { devNumChart, airQulityChart , safeManage , qualityManage ,airQulity },
>>>>>>> dev-xiaole
components: { devNumChart, airQulityChart, ProjectInfo, PersonOverview ,safeManage , qualityManage ,airQulity},
data() {
return {
COMPANY: '',
@ -754,29 +678,16 @@ export default {
clearInterval(this.interval1)
},
mounted() {
<<<<<<< HEAD
this.getQueryBySnData()
this.enabledProjectV2 = enabledProjectV2
this.getWorkerStatisticsCount(1)
this.getSecureData()
// this.getSecureData()
this.getQualityData()
this.loadWeather()
this.getAlarmList()
this.getAlarmInfor()
this.getDevList()
=======
this.getQueryBySnData();
this.enabledProjectV2 = enabledProjectV2;
this.getWorkerStatisticsCount(1);
// this.getSecureData();
this.getQualityData();
this.loadWeather();
this.getAlarmList();
this.getAlarmInfor();
this.getDevList();
>>>>>>> dev-xiaole
},
methods: {
createdEchart2() {
@ -1023,28 +934,6 @@ export default {
},
//获取安全管理数据
<<<<<<< HEAD
getSecureData() {
let data = {
projectSn: this.$store.state.projectSn
}
selectSecurityManageStatisticsApi(data).then((res) => {
let total = res.result.total
this.secureData.rectificationNum = total.rectificationNum
this.secureData.completeNum = total.totalNum - total.rectificationNum
this.createPieChart(
[
{ value: total.totalNum - total.rectificationNum, name: '' },
{ value: total.rectificationNum, name: '' }
],
this.$refs.safeChart,
['rgba(120, 111, 240, 1)', 'rgba(254, 108, 127, 1)'],
this.$t('message.companyDiagram.safeQuestion')
// "安全问题数"
)
})
},
=======
// getSecureData() {
// let data = {
// projectSn: this.$store.state.projectSn,
@ -1065,7 +954,6 @@ export default {
// );
// });
// },
>>>>>>> dev-xiaole
//获取质量管理数据
getQualityData() {
let data = {