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

Merge branch 'yanyan_dev' into shenzhen-dev

Browse Source
This commit is contained in:
yjl 2022-12-16 10:56:51 +08:00
commit 13cd984cbf
15 changed files with 130 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/images/zjsj/doing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
src/assets/images/zjsj/ed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
src/assets/images/zjsj/noBegin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

2
src/assets/js/api/zhongjianFourth.js
View File

@ -14,7 +14,7 @@ export const qualityManagement = params => get('xmgl/qualityInspectionRecord/get
// 质量管理-质量问题库 // 质量管理-质量问题库
export const listQualityManagement = params => get('xmgl/dangerTypeRecord/getBigList', params); export const listQualityManagement = params => get('xmgl/dangerTypeRecord/getBigList', params);
// 疫情播报 // 疫情播报
export const getEpidemicBroadcastApi = params => get('/xmgl/api/getEpidemicBroadcast', params); export const getEpidemicBroadcastApi = params => get('/xmgl/api/getEpidemic', params);
// 亮点展示 // 亮点展示
export const windowDisplayApi = params => get('/xmgl/windowDisplay/list', params); export const windowDisplayApi = params => get('/xmgl/windowDisplay/list', params);
// 环境监测 // 环境监测

BIN
src/views/projectAdmin/fourEngin/assets/images/common/quality.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 MiB

BIN
src/views/projectAdmin/fourEngin/assets/images/common/safe.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 MiB

45
src/views/projectAdmin/fourEngin/command/center.vue
View File

@ -21,33 +21,33 @@
</div> </div>
</div> </div>
</div> </div>
<LeftThree class="butProcess"/> <LeftThree class="butProcess" />
</div> </div>
</template> </template>
<script> <script>
import { listProjectInfo } from '@/assets/js/api/zhongjianFourth' import { listProjectInfo } from '@/assets/js/api/zhongjianFourth'
import { getProjectExtendInfoApi }from "@/assets/js/api/baseInfo.js"; import { getProjectExtendInfoApi } from '@/assets/js/api/baseInfo.js'
import LeftThree from './leftThree/index.vue' import LeftThree from './leftThree/index.vue'
export default { export default {
components: { LeftThree }, components: { LeftThree },
data() { data() {
return { return {
projectSn:"", projectSn: '',
// 信息窗体开关 // 信息窗体开关
open: true, open: true,
contractPrice:"", contractPrice: '',
// 信息窗体表单 // 信息窗体表单
informationForm: { informationForm: {
projectName: { label: '项目名称:', value: '' }, projectName: { label: '项目名称:', value: '' },
bulidStatus: { label: '项目状态:', value: '' }, bulidStatus: { label: '项目状态:', value: '' },
constructionStage: { label: '形象进度:', value: '' }, constructionStage: { label: '形象进度:', value: '' },
households:{label: '项目造价:', value: ''}, households: { label: '项目造价:', value: '' },
// val2:{label: '已完成投资:', value: ''}, // val2:{label: '已完成投资:', value: ''},
projectAcreage: { label: '项目面积:', value: '', unit: '' }, projectAcreage: { label: '项目面积:', value: '', unit: '' },
constructionUnit: { label: '建设单位:', value: ''}, constructionUnit: { label: '建设单位:', value: '' },
projectAddress: { label: '项目地址:', value: '' }, projectAddress: { label: '项目地址:', value: '' }
}, },
// 项目状态枚举 // 项目状态枚举
projectStatusEnum: { projectStatusEnum: {
@ -81,17 +81,19 @@ export default {
this.projectSn = this.$store.state.projectSn this.projectSn = this.$store.state.projectSn
this.getVal() this.getVal()
}, },
mounted(){ mounted() {
this.$nextTick(()=>{ this.$nextTick(() => {
this.getList() this.getList()
}) })
}, },
methods: { methods: {
/** 查询数据 */ /** 查询数据 */
getVal(){ getVal() {
getProjectExtendInfoApi({ projectSn: this.projectSn,}).then((res)=>{ getProjectExtendInfoApi({ projectSn: this.projectSn }).then(res => {
console.log('查看的结果',res) console.log('查看的结果', res)
this.contractPrice = res.result.contractPrice if (res.result) {
this.contractPrice = res.result.contractPrice
}
}) })
}, },
getList() { getList() {
@ -101,17 +103,17 @@ export default {
Object.keys(informationForm).forEach(key => { Object.keys(informationForm).forEach(key => {
if (key === 'constructionStage') { if (key === 'constructionStage') {
informationForm[key].value = this.constructionStageEnum[res.result[key]] informationForm[key].value = this.constructionStageEnum[res.result[key]]
} else if( key === 'households'){ } else if (key === 'households') {
informationForm[key].value = `${this.contractPrice }万元` informationForm[key].value = `${this.contractPrice}万元`
} else if (key === 'bulidStatus') { } else if (key === 'bulidStatus') {
informationForm[key].value = this.projectStatusEnum[res.result[key]] informationForm[key].value = this.projectStatusEnum[res.result[key]]
}else { } else {
informationForm[key].value = res.result[key] informationForm[key].value = res.result[key]
} }
}) })
}) })
}, },
// 标记点 鼠标移入事件 // 标记点 鼠标移入事件
// handleMouseenter() { // handleMouseenter() {
// this.open = true // this.open = true
@ -120,7 +122,7 @@ export default {
// handleMouseleave() { // handleMouseleave() {
// this.open = false // this.open = false
// }, // },
clickBtn(){ clickBtn() {
this.open = !this.open this.open = !this.open
} }
} }
@ -229,7 +231,6 @@ export default {
} }
} }
@keyframes change { @keyframes change {
from { from {
width: 20px; width: 20px;
@ -243,8 +244,6 @@ export default {
} }
} }
// 信息窗体 // 信息窗体
.information-form { .information-form {
// display: none; // display: none;
@ -282,10 +281,10 @@ export default {
} }
} }
} }
.butProcess{ .butProcess {
margin: 0% 5% 5% 5%; margin: 0% 5% 5% 5%;
// margin-bottom: 5%; // margin-bottom: 5%;
// margin-right: 5%; // margin-right: 5%;
} }
} }
</style> </style>

4
src/views/projectAdmin/fourEngin/command/leftThree.vue
View File

@ -68,7 +68,7 @@ export default {
windDirection: { windDirection: {
label: '风向', label: '风向',
value: '东南', value: '东南',
unit: '风', unit: '',
image: require('../assets/images/command-center/icon-windDirection.png') image: require('../assets/images/command-center/icon-windDirection.png')
} }
} }
@ -94,7 +94,7 @@ export default {
this.rightList.temperature.value = res.result.temperature this.rightList.temperature.value = res.result.temperature
this.rightList.humidity.value = res.result.humidity this.rightList.humidity.value = res.result.humidity
this.rightList.windSpeed.value = res.result.windspeed this.rightList.windSpeed.value = res.result.windspeed
this.rightList.windDirection.value = res.result.winddirectionName this.rightList.windDirection.value = res.result.winddirection
} }
} }
}) })

56
src/views/projectAdmin/fourEngin/command/leftThree/Process.vue
View File

@ -2,16 +2,32 @@
<template> <template>
<div class="list progress" id="scrollBox"> <div class="list progress" id="scrollBox">
<div :ops="ops" class="list-item progress-item" v-for="(item, index) in list" :key="index"> <div :ops="ops" class="list-item progress-item" v-for="(item, index) in list" :key="index">
<div :class="['progress-item-dot', { active: projectData.constructionStage-1 >= index }]"></div> <div style="display:flex;">
<div class="info"> <div style="text-align:center;width: 100px;">
<span class="label">{{ item.name }}</span> <img src="@/assets/images/zjsj/doing.png" alt="" v-if="item.id == state"/>
<img src="@/assets/images/zjsj/noBegin.png" alt="" v-if="item.id > state"/>
<img src="@/assets/images/zjsj/ed.png" alt="" v-if="item.id < state"/>
<div class="info">
<span class="label">{{ item.name }}</span>
</div>
</div>
<div style="margin-top:30px" v-if="item.id == 15"></div>
<div style="margin-top:40px" v-else-if="item.id == state">
............
</div>
<div style="margin-top:30px" v-else>
............
</div>
</div> </div>
<!-- <div :class="['progress-item-dot', { active: projectData.constructionStage-1 >= index }]"></div> -->
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { getProjectDetail } from '@/assets/js/api/baseInfo.js' import { getProjectDetail } from '@/assets/js/api/baseInfo.js'
import { listProjectInfo } from '@/assets/js/api/zhongjianFourth'
export default { export default {
props: { props: {
list: { list: {
@ -19,37 +35,42 @@ export default {
default: () => [] default: () => []
} }
}, },
data(){ data() {
return{ return {
projectSn:"", projectSn: '',
projectData: { projectData: {
constructionStage: 10, constructionStage: 10
}, },
ops: { ops: {
vuescroll: { vuescroll: {
wheelDirectionReverse: true wheelDirectionReverse: true
} }
}, },
state:''
} }
}, },
created(){ created() {
this.projectSn = this.$store.state.projectSn this.projectSn = this.$store.state.projectSn
console.log('this.list',this.list) console.log('this.list', this.list)
this.getDataDateils() this.getDataDateils()
}, },
mounted(){ mounted() {},
methods: {
},
methods:{
getDataDateils() { getDataDateils() {
let data = { projectSn: this.projectSn } let data = { projectSn: this.projectSn }
getProjectDetail(data).then((res) => { getProjectDetail(data).then(res => {
if (res.code == 200) { if (res.code == 200) {
console.log('查询进度',res) console.log('查询进度', res)
this.projectData = res.result this.projectData = res.result
} }
}) })
}, listProjectInfo({ projectSn: this.projectSn }).then(res => {
this.state = res.result.constructionStage
console.log('999999999999999',this.state,res);
})
}
} }
} }
</script> </script>
@ -61,7 +82,7 @@ export default {
width: 100%; width: 100%;
height: 95%; height: 95%;
margin-left: 35px;
.progress-item { .progress-item {
position: relative; position: relative;
display: flex; display: flex;
@ -114,6 +135,7 @@ export default {
height: 60px; height: 60px;
.label { .label {
margin-bottom: 20px; margin-bottom: 20px;
width: 130px;
} }
} }

34
src/views/projectAdmin/fourEngin/command/leftThree/index.vue
View File

@ -9,8 +9,8 @@
</template> </template>
<script> <script>
import Process from "./Process"; import Process from './Process'
import { listProgressOfTheTask } from "@/assets/js/api/zhongjianFourth"; import { listProgressOfTheTask } from '@/assets/js/api/zhongjianFourth'
export default { export default {
components: { Process }, components: { Process },
@ -23,21 +23,21 @@ export default {
} }
}, },
// projectData.constructionStage // projectData.constructionStage
stageList: this.$t("message.companyDiagram.CONSTRUCTIONSTAGE"), stageList: this.$t('message.companyDiagram.CONSTRUCTIONSTAGE'),
list: [ list: [
// { endTime: '2022-01-01', subitemProjectName: '基础工程', state: true ,}, {img:require('@/assets/images/zjsj/doing.png'),name: '基坑支护开始施工',time:'2022-01-01'},
// { endTime: '2022-02-14', subitemProjectName: '主题结构施工', state: true, }, {img:require('@/assets/images/zjsj/noBegin.png'),name: '桩基施工开始',time:'2022-09-08'},
// { endTime: '2022-03-25', subitemProjectName: '屋面工程', state: true, }, {img:require('@/assets/images/zjsj/noBegin.png'),name: '屋面工程',time:'2023-01-17'},
// { endTime: '2022-07-31', subitemProjectName: '机械设备安拆工程', state: true, }, {img:require('@/assets/images/zjsj/noBegin.png'),name: '幕墙工程施工完成',time:'2024-05-23'},
// { endTime: '2022-21-31', subitemProjectName: '室内装饰装修工程' } {img:require('@/assets/images/zjsj/noBegin.png'),name: '联合竣工验收完成',time:'2024-10-08'}
], ],
index: 0, index: 0
}; }
}, },
mounted() { mounted() {
const progress = this.$refs.Process; const progress = this.$refs.Process
progress.scrollLeft = 48; progress.scrollLeft = 48
this.getData(); this.getData()
}, },
methods: { methods: {
getData() { getData() {
@ -54,9 +54,9 @@ export default {
// console.log("进度条的返回值", res); // console.log("进度条的返回值", res);
// this.list = res.result; // this.list = res.result;
// }); // });
}, }
}, }
}; }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@ -72,7 +72,7 @@ export default {
height: 85%; height: 85%;
overflow: hidden; overflow: hidden;
} }
.process:hover{ .process:hover {
overflow-x: auto; overflow-x: auto;
} }
} }

4
src/views/projectAdmin/fourEngin/command/leftTwo.vue
View File

@ -7,7 +7,7 @@
</div> </div>
<div class="contentBtn"> <div class="contentBtn">
<p class="num1">{{statisticsCount.sumNumber}}</p> <p class="num1">{{statisticsCount.sumNumber}}</p>
<p class="text">在场总人数</p> <p class="text">在册总人数</p>
</div> </div>
<div class="img"> <div class="img">
<img style=" margin-left: 25px;" src="../assets/images/common/icon_hs.png" /> <img style=" margin-left: 25px;" src="../assets/images/common/icon_hs.png" />
@ -131,7 +131,7 @@ export default {
methods:{ methods:{
//统计企业下项目各人员统计----人员概况模块渲染接口 //统计企业下项目各人员统计----人员概况模块渲染接口
getWorkerStatisticsCount() { getWorkerStatisticsCount() {
getWorkerStatisticsCountApi({ sn: this.projectSn }).then((res) => { getWorkerStatisticsCountApi({ projectSn: this.projectSn }).then((res) => {
console.log('人员概况模块------1',res); console.log('人员概况模块------1',res);
this.statisticsCount = res.result; this.statisticsCount = res.result;

4
src/views/projectAdmin/fourEngin/command/rightOne.vue
View File

@ -4,7 +4,7 @@
<div class="left"> <div class="left">
<div class="top"> <div class="top">
<div class="image"> <div class="image">
<img src="../assets/images/common/echart_orange.gif" alt=""> <img src="../assets/images/common/safe.gif" alt="">
<div class="value"> <div class="value">
<span class="number">{{ pollingData.closeRatio || 0 }}</span> <span class="number">{{ pollingData.closeRatio || 0 }}</span>
<!-- <span class="unit">%</span> --> <!-- <span class="unit">%</span> -->
@ -145,7 +145,7 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
img { img {
height: 150px; height: 135px;
} }
.value { .value {
position: absolute; position: absolute;

28
src/views/projectAdmin/fourEngin/command/rightThree.vue
View File

@ -3,10 +3,10 @@
<div class="container" id="more" @click="toMore"> <div class="container" id="more" @click="toMore">
<div id="page"> <div id="page">
<div class="content" v-for="(item,index) in list" :key="index"> <div class="content" v-for="(item,index) in list" :key="index">
<p class="time">{{item.createdAt}}</p> <p class="time">{{item.content}}</p>
<p class="value"> <!-- <p class="value">
<a :href= item.url target="_blank">{{item.title}}</a> <a :href= item.url target="_blank">{{111}}</a>
</p> </p> -->
</div> </div>
</div> </div>
</div> </div>
@ -20,14 +20,7 @@ export default {
components: { Card }, components: { Card },
data() { data() {
return { return {
list:[ list:[{content:''}]
// {time:'10月14日 11:29',value:'2022年10月13日广州市新冠肺炎疫情情况-广州本地宝',
// url:'http://gz.bendibao.com/news/20221014/content326288.shtml'
// },
// {time:'10月14日 09:14',value:'10月13日广州新增本土确诊25例和无症状3例(含12例无症状确诊)',
// url:'http://gz.bendibao.com/news/20221014/content326265.shtml'
// },
]
} }
}, },
created() { created() {
@ -37,9 +30,9 @@ export default {
getData(){ getData(){
getEpidemicBroadcastApi().then((res)=>{ getEpidemicBroadcastApi().then((res)=>{
if(res.code == 200){ if(res.code == 200){
this.list = res.result.slice(0,10) this.list[0].content = res.result
} }
console.log('疫情',this.list) // console.log('疫情',res)
}) })
}, },
toMore(){ toMore(){
@ -79,8 +72,11 @@ export default {
width: 100%; width: 100%;
height: 65px; height: 65px;
.time{ .time{
padding:0px 0px 5px 5px; padding:10px 0px 10px 0px;
color:rgba(255, 255, 255, 0.65) // color:rgba(255, 255, 255, 0.65)
border-left: 4px solid #66d3d8;
background-image: linear-gradient(to right, #3b7589, #182337);
margin-top: 35px;
} }
a{ a{
text-decoration: none; text-decoration: none;

41
src/views/projectAdmin/fourEngin/command/rightTwo.vue
View File

@ -2,24 +2,27 @@
<Card title="质量管理"> <Card title="质量管理">
<div class="container"> <div class="container">
<div class="left"> <div class="left">
<JNestedRingChart <div class="image">
v-if="show" <img src="../assets/images/common/quality.gif" alt="">
:title="titObj" <div class="value">
:series="series" <span class="number">{{ qualityProblem.totalNum || 0 }}</span>
:legend="{ show: false }" </div>
/> </div>
<div class="unit">
<span>质量管理总数</span>
</div>
</div> </div>
<!-- <div class="left" ref="chart" style="transform: translateY(5px)"></div> --> <!-- <div class="left" ref="chart" style="transform: translateY(5px)"></div> -->
<div class="right"> <div class="right">
<div class="top"> <div class="top">
<div class="left" :class=" tab==2 ? 'click' : ''" > <div class="left" :class=" tab==2 ? 'click' : ''" >
<span class="label" @click="already(2)">已整改质量问题</span> <span class="label" @click="already(2)">已整改</span>
<span class="value" <span class="value"
>({{ qualityProblem.rectificationNum || 0 }})</span >({{ qualityProblem.rectificationNum || 0 }})</span
> >
</div> </div>
<div class="right" :class=" tab==5 ? 'click' : ''"> <div class="right" :class=" tab==5 ? 'click' : ''">
<span class="label" @click="already(5)">未整改质量问题</span> <span class="label" @click="already(5)">未整改</span>
<span class="value" <span class="value"
>({{ qualityProblem.noRectificationNum || 0 }})</span >({{ qualityProblem.noRectificationNum || 0 }})</span
> >
@ -168,7 +171,7 @@ export default {
recordStatus: this.recordStatus, recordStatus: this.recordStatus,
}).then((res) => { }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
// console.log("查看整改问题", res); console.log("查看整改问题", res);
this.list = res.result.page.records.map((item) => { this.list = res.result.page.records.map((item) => {
return { dangerName: item.dangerItemContent }; return { dangerName: item.dangerItemContent };
}); });
@ -205,6 +208,7 @@ export default {
font-size: 14px; font-size: 14px;
white-space: nowrap; white-space: nowrap;
line-height: 25px; line-height: 25px;
margin-left: 55px;
// .left { // .left {
// color: #af5320; // color: #af5320;
// transform: translateX(-10%); // transform: translateX(-10%);
@ -282,5 +286,24 @@ export default {
} }
} }
} }
.image {
display: grid;
place-items: center;
position: relative;
width: 100%;
height: 100%;
img {
height: 140px;
margin-bottom: 30px;
}
.value {
position: absolute;
font-size: 23px;
margin: 0px 0 30px 0;
}
}
.unit{
margin: -20px 0 0px 36px;
}
} }
</style> </style>

2
src/views/projectAdmin/fourEngin/sourse/rightBottom.vue
View File

@ -3,7 +3,7 @@
<div class="list-group"> <div class="list-group">
<div class="list"><MaterialTable title="材料订单" /></div> <div class="list"><MaterialTable title="材料订单" /></div>
<div class="list"><MaterialTable title="材料运单" /></div> <div class="list"><MaterialTable title="材料运单" /></div>
<div class="list"><MaterialTable title="采购合同" /></div> <!-- <div class="list"><MaterialTable title="采购合同" /></div> -->
</div> </div>
</Card> </Card>
</template> </template>