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

Merge branch 'dev-yjl' into 'shenzhen-dev'

Browse Source 
修改中建四局（大屏页面、后台管理）

See merge request !108
This commit is contained in:
袁晶琳 2023-02-28 10:26:18 +08:00
commit 50fe2b1845
14 changed files with 229 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/js/http.js
View File

@ -46,7 +46,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
// axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
// axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
@ -79,7 +79,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789
// axios.defaults.baseURL = 'http://139.9.66.234:7072/' //三江集团测试环境
// axios.defaults.baseURL = 'http://116.169.63.183:7070' //三江集团正式环境
axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地
} else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'https://www.ceshi.com'

10
src/store/index.js
View File

@ -48,9 +48,9 @@ export default new Vuex.Store({
BASEURL: baseUrl
? baseUrl
: window.location.protocol + "//" + window.location.host + "/", //
// UPLOADURL:
// window.location.protocol + "//" + window.location.host + "/upload/image", //
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //测试
UPLOADURL:
window.location.protocol + "//" + window.location.host + "/upload/image", //
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //测试
// tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/',
/* 2022-05-16 */
// tag: 部署河南项目时，需要打开这两行代码
@ -63,8 +63,8 @@ export default new Vuex.Store({
// BASEURL:'http://192.168.34.116:6023/',
// UPLOADURL: 'http://192.168.34.116:6023/upload/image',
// FILEURL: 'http://192.168.34.116:6023/image/',
UPLOADURL: 'http://124.71.67.160:8088/upload/image',
FILEURL: 'http://124.71.67.160:8088/image/',
// UPLOADURL: 'http://124.71.67.160:8088/upload/image',
// FILEURL: 'http://124.71.67.160:8088/image/',
//---
// UPLOADURL: 'http://192.168.34.125:6023/upload/image',
// FILEURL: 'http://192.168.34.125:6023/image/',

2
src/views/projectAdmin/fourEngin/command/index.vue
View File

@ -78,7 +78,7 @@ export default {
.leftBox {
width: 24.5%;
.leftOne {
height: 31%;
height: 32%;
}
.leftTwo {
height: 25%;

18
src/views/projectAdmin/fourEngin/command/leftOne.vue
View File

@ -9,7 +9,9 @@
<div>建设单位:{{ list.constructionUnit }}</div>
<div>监理单位:{{ list.supervisorUnit }}</div>
<div>设计单位:德国gmp建筑师事务所 (方案设计)</div>
<p style="margin-left:70px;margin-top:5px">中国建筑第四工程局有限公司 (施工图设计)</p>
<p style="margin-left: 70px; margin-top: 9px">
中国建筑第四工程局有限公司 (施工图设计)
</p>
<div style="margin-top: 5px">总包单位:{{ list.bidWinner }}</div>
</div>
</div>
@ -21,11 +23,10 @@
import Card from '../components/Card'
import { listProjectInfo } from '@/assets/js/api/zhongjianFourth'
export default {
components: { Card },
data: () => ({
list:{},
list: {}
}),
created() {
this.projectSn = this.$store.state.projectSn
@ -36,13 +37,12 @@ export default {
methods: {
/** 查询列表 */
getList() {
listProjectInfo({ projectSn: this.projectSn }).then(res => {
this.list = res.result;
console.log('项目信息11111: ', this.list);
listProjectInfo({ projectSn: this.projectSn }).then((res) => {
this.list = res.result
console.log('项目信息11111: ', this.list)
})
},
},
}
}
}
</script>

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

@ -4,10 +4,12 @@
<div class="left">
<div class="top">
<div class="image">
<img src="../assets/images/common/quality.gif" alt="">
<img src="../assets/images/common/quality.gif" alt="" />
<div class="value">
<span class="number">{{ pollingData.constructionRatio || 0 }}</span>
<!-- <span class="unit">%</span> -->
<span class="number">{{
pollingData.constructionRatio || 0
}}</span>
<span class="unit">%</span>
</div>
</div>
</div>
@ -17,7 +19,6 @@
<span class="number">{{ pollingData.constructionDay || 0 }}</span>/<span class="number">{{ pollingData.totalDuration || 0 }}</span>
</div>
</div> -->
</div>
<div class="right">
<div class="content">
@ -34,16 +35,21 @@
<div class="bottom">
<span class="label">起始日期：</span>
<div class="value">
<span>{{ startDate.year}}</span>年<span>{{ startDate.month}}</span>月<span>{{ startDate.day}}</span>日
<span>{{ startDate.year }}</span
>年<span>{{ startDate.month }}</span
>月<span>{{ startDate.day }}</span
>日
</div>
</div>
</div>
</div>
<div class="count1">
施工天数<span>{{ pollingData.constructionDay || 0 }}</span>天
施工天数<span>{{ pollingData.constructionDay || 0 }}</span
>天
</div>
<div class="count2">
总工期<span>{{ pollingData.totalDuration || 0 }}</span>天
总工期<span>{{ pollingData.totalDuration || 0 }}</span
>天
</div>
</div>
</Card>
@ -67,21 +73,21 @@ export default {
constructionRatio: undefined, // 占比
constructionDay: undefined, // 安全生产天数
startWorkDate: undefined, // 起始日期
totalDuration:undefined,
totalDuration: undefined
},
// 天数
days: {
units: undefined,
decade: undefined,
hundreds: undefined,
kilobit: undefined,
kilobit: undefined
},
// 起始日期
startDate: {
year: undefined,
month: undefined,
day: undefined,
},
day: undefined
}
}
},
created() {
@ -91,33 +97,33 @@ export default {
methods: {
/** 查询列表 */
getList() {
resourceManagement({ projectSn: this.projectSn }).then(res => {
console.log('安全管理:======= ', res);
const pollingData = this.pollingData;
Object.keys(pollingData).forEach(key => {
resourceManagement({ projectSn: this.projectSn }).then((res) => {
console.log('安全管理:======= ', res)
const pollingData = this.pollingData
Object.keys(pollingData).forEach((key) => {
pollingData[key] = res.result[key]
})
pollingData.days = pollingData.constructionDay.toString()
console.log('pollingData.days',pollingData.days);
console.log('pollingData.days', pollingData.days)
if (pollingData.days.length < 4) {
pollingData.days = pollingData.days.padStart(4, 0)
const days = this.days;
const days = this.days
days.units = pollingData.days[3];
days.decade = pollingData.days[2];
days.hundreds = pollingData.days[1];
days.kilobit = pollingData.days[0];
days.units = pollingData.days[3]
days.decade = pollingData.days[2]
days.hundreds = pollingData.days[1]
days.kilobit = pollingData.days[0]
}
const startDate = pollingData.startWorkDate.split('-');
console.log('startDate: ', startDate);
const startDate = pollingData.startWorkDate.split('-')
console.log('startDate: ', startDate)
this.startDate.year = startDate[0]
this.startDate.month = startDate[1]
this.startDate.day = startDate[2]
})
},
},
}
}
}
</script>
@ -184,7 +190,7 @@ export default {
.label {
font-size: 8px;
color: #FFFFFF;
color: #ffffff;
}
.value {
@ -215,7 +221,7 @@ export default {
.top-title {
margin-bottom: 15px;
font-size: 20px;
color: #66D4D9;
color: #66d4d9;
text-align: center;
}

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

@ -34,30 +34,30 @@
</template>
<script>
import Card from "../components/Card.vue";
import { listProjectInfo } from "@/assets/js/api/zhongjianFourth";
import Card from '../components/Card.vue'
import { listProjectInfo } from '@/assets/js/api/zhongjianFourth'
export default {
components: { Card },
data() {
return {
list: {},
};
list: {}
}
},
created() {
this.projectSn = this.$store.state.projectSn;
this.getList();
this.projectSn = this.$store.state.projectSn
this.getList()
},
methods: {
/** 查询列表 */
getList() {
listProjectInfo({ projectSn: this.projectSn }).then((res) => {
this.list = res.result;
console.log("项目信息11111: ", this.list);
});
},
},
};
this.list = res.result
console.log('项目信息11111: ', this.list)
})
}
}
}
</script>
<style lang="less" scoped>
@ -83,10 +83,11 @@ export default {
}
.row {
font-size: 14px;
font-size: 16px;
display: flex;
align-items: center;
float: left;
margin-left: -20px;
&:not(:last-child) {
margin-bottom: 12px;
display: flow-root;
@ -123,7 +124,7 @@ export default {
.row1 {
float: right;
// margin: -203px 83px 0px 0px;
font-size: 14px;
font-size: 16px;
&:not(:last-child) {
margin-bottom: 12px;
display: flow-root;
@ -143,13 +144,13 @@ export default {
}
&:not(:last-child) {
width: 275px;
width: 320px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
margin: 20px 0 0 0;
margin: 20px 0 0 -40px;
}
img {

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

@ -8,17 +8,19 @@
text: '质量巡检',
subTitle: `${safetyPatrolInspection.allTotal || 0}条`,
fontSize: 16,
x: '48%',
y: '100'
}"
:color="['#6EE4F0', '#E7622A']"
:data="[
{
value: safetyPatrolInspection.allClose,
name: '已巡检',
name: '已巡检'
},
{
value: safetyPatrolInspection.allNoClose,
name: '未巡检',
},
name: '未巡检'
}
]"
:radius="['43%', '60%']"
:legend="false"
@ -56,8 +58,7 @@
</div>
</div>
<div class="count1">
总次数<span>83</span
>次
总次数<span>83</span>次
<!-- 总次数<span>{{ allTotal2||0 }}</span
>次 -->
</div>
@ -70,13 +71,12 @@
</template>
<script>
import Card from "../components/Card";
import JRingChart from "../../common/jChart/pie/JRingChart.vue";
import { getAllAndWeekDataApi } from "@/assets/js/api/zhongjianFourth";
import { mapState } from "vuex";
import Card from '../components/Card'
import JRingChart from '../../common/jChart/pie/JRingChart.vue'
import { getAllAndWeekDataApi } from '@/assets/js/api/zhongjianFourth'
import { mapState } from 'vuex'
import { resourceManagement } from '@/assets/js/api/zhongjianFourth'
export default {
components: { Card, JRingChart },
data() {
@ -87,34 +87,35 @@ export default {
allNoClose: 0, //所有未闭合
allNoCloseRatio: 0, //所有未闭合占比
allTotal: 0, //检查总数
weekTotal: 0, //本周巡检总数
weekTotal: 0 //本周巡检总数
},
allTotal2: 0, //检查总数
};
allTotal2: 0 //检查总数
}
},
created() {
this.getList()
this.getAllTodayDataHdir();
this.getAllTodayDataHdir()
},
computed: {
...mapState(["projectSn"]),
...mapState(['projectSn'])
},
methods: {
getAllTodayDataHdir() {
getAllAndWeekDataApi({ projectSn: this.projectSn }).then((res) => {
this.safetyPatrolInspection = res.result;
console.log(this.safetyPatrolInspection, "getAllTodayDataHdir质量");
});
},
getList() {
resourceManagement({ projectSn: this.projectSn }).then(res => {
console.log( "安全管理getAllTodayDataHdir------------111",res);
this.allTotal2 = Number(res.result.constructionDay) + Number(this.safetyPatrolInspection.allTotal)
this.safetyPatrolInspection = res.result
console.log(this.safetyPatrolInspection, 'getAllTodayDataHdir质量')
})
},
},
};
getList() {
resourceManagement({ projectSn: this.projectSn }).then((res) => {
console.log('安全管理getAllTodayDataHdir------------111', res)
this.allTotal2 =
Number(res.result.constructionDay) +
Number(this.safetyPatrolInspection.allTotal)
})
}
}
}
</script>
<style lang="less" scoped>
@ -136,7 +137,7 @@ export default {
.right {
width: 300px;
height: 130px;
background: url("~@/assets/images/zjsj/spliting.png");
background: url('~@/assets/images/zjsj/spliting.png');
background-size: 100% 100%;
margin-right: 23px;
margin-top: 15px;
@ -145,7 +146,7 @@ export default {
width: 160px;
margin: 37px 0 -20px 25px;
&::before {
content: "";
content: '';
position: absolute;
top: 1px;
left: -10px;

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

@ -35,7 +35,9 @@
:title="{
text: '安全巡检',
subTitle: `${safetyPatrolInspection.allTotalNum}条`,
fontSize: 16
fontSize: 16,
x: '49%',
y: '55'
}"
:color="['#6EE4F0', '#E7622A']"
:data="[
@ -48,7 +50,7 @@
name: '未巡检'
}
]"
:radius="['70%', '100%']"
:radius="['71%', '101%']"
:legend="false"
/>
</div>
@ -130,13 +132,13 @@ export default {
.woria {
width: 100%;
height: calc(115% - 92px);
background: url('~@/assets/images/zjsj/blueH.png');
background-size: 100% 100%;
background: url(/img/blueH.da444a96.png) no-repeat;
background-size: 99% 101%;
// margin-top: 10px;
.woriaTwo {
width: 100%;
height: 100%;
margin: 7px 0 0 4px;
height: 104%;
margin: 3px 0 0 1px;
}
}
.left {

2
src/views/projectAdmin/fourEngin/govComp/index.vue
View File

@ -35,7 +35,7 @@ export default {
width: 24%;
height: 100%;
.top {
height: 55%;
height: 50%;
}
.middle {
height: 50%;

69
src/views/projectAdmin/fourEngin/govComp/leftMiddle.vue
View File

@ -32,87 +32,87 @@
</template>
<script>
import Card from "../components/Card.vue";
import echarts from "echarts4";
import Card from '../components/Card.vue'
import echarts from 'echarts4'
export default {
components: { Card },
data() {
return {};
return {}
},
mounted() {
this.createChart();
this.createChart()
},
methods: {
createChart() {
const checkChart = echarts.init(this.$refs.checkChart);
const checkChart = echarts.init(this.$refs.checkChart)
const option = {
grid: {
x: "6%",//x 偏移量
y: "10%", // y 偏移量
width: "88%", // 宽度
height: "70%"// 高度
x: '6%', //x 偏移量
y: '10%', // y 偏移量
width: '88%', // 宽度
height: '70%' // 高度
},
xAxis: {
type: "category",
type: 'category',
boundaryGap: false,
data: ["2022-1", "2022-3", "2022-6", "2022-8"],
data: ['2022-1', '2022-3', '2022-6', '2022-8'],
axisLabel: {
show: true,
textStyle: {
color: "#fff"
color: '#fff'
}
}
},
yAxis: {
type: "value",
type: 'value',
splitNumber: 3,
splitLine: {
show: true,
lineStyle: {
type: "dashed",
color: "#777f8a"
type: 'dashed',
color: '#777f8a'
}
},
axisLabel: {
show: true,
textStyle: {
color: "#fff"
color: '#fff'
}
}
},
series: [
{
data: [3.5, 4.5, 3.5, 4],
type: "line",
type: 'line',
smooth: true,
showSymbol: false,
color: "#f56c35",
color: '#f56c35',
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
{ offset: 0, color: "rgba(213, 97, 52,0.3)" },
{ offset: 1, color: "rgba(213, 97, 52,0.1)" }
{ offset: 0, color: 'rgba(213, 97, 52,0.3)' },
{ offset: 1, color: 'rgba(213, 97, 52,0.1)' }
])
}
},
{
data: [0.5, 2.0, 1.4, 1.2],
type: "line",
type: 'line',
smooth: true,
showSymbol: false,
color: "#51a4ac",
color: '#51a4ac',
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
{ offset: 0, color: "rgba(53, 98, 111,0.5)" },
{ offset: 1, color: "rgba(53, 98, 111,0.3)" }
{ offset: 0, color: 'rgba(53, 98, 111,0.5)' },
{ offset: 1, color: 'rgba(53, 98, 111,0.3)' }
])
}
}
]
};
checkChart.setOption(option);
}
checkChart.setOption(option)
}
}
}
};
</script>
<style lang="less" scoped>
@ -206,7 +206,7 @@ export default {
width: 30px;
height: 2px;
border-radius: 10%;
background-color: #5CE2F6;
background-color: #5ce2f6;
top: 88%;
left: 13%;
}
@ -251,33 +251,32 @@ export default {
.photovoltaicOne {
width: 150px;
height: 100px;
background-image: url("../assets/images/carbon/kwh1.png");
background-image: url('../assets/images/carbon/kwh1.png');
background-repeat: no-repeat;
background-size: 100% 100%;
}
.photovoltaicTwo {
width: 150px;
height: 100px;
background-image: url("../assets/images/carbon/kwh2.png");
background-image: url('../assets/images/carbon/kwh2.png');
background-repeat: no-repeat;
background-size: 100% 100%;
margin-left: 100px;
}
.photovoltaicThree {
margin-top: 40px;
margin-top: 60px;
width: 150px;
height: 100px;
background-image: url("../assets/images/carbon/kwh4.png");
background-image: url('../assets/images/carbon/kwh4.png');
background-repeat: no-repeat;
background-size: 100% 100%;
}
.photovoltaicFour {
margin-top: 40px;
margin-top: 60px;
width: 150px;
height: 100px;
background-image: url("../assets/images/carbon/kwh3.png");
background-image: url('../assets/images/carbon/kwh3.png');
background-repeat: no-repeat;
background-size: 100% 100%;

19
src/views/projectAdmin/fourEngin/govComp/leftTop.vue
View File

@ -1,7 +1,7 @@
<template>
<Card title="基本信息">
<div class="container">
<vue-scroll style="height: 95%;">
<vue-scroll style="height: 95%">
<div class="list">
<!-- <div class="list-item" v-for="(item, key) in list" :key="key">
<span class="label">{{ item.label +' ： '}} </span>
@ -15,7 +15,9 @@
<div>建设单位：中建四局发展(广州天河)有限公司</div>
<div>监理单位：广州宏元建设工程咨询有限公司</div>
<div>设计单位：德国gmp建筑师事务所（方案设计）</div>
<div style="margin:2px 0 0 80px">中国建筑第四工程局有限公司（施工图设计）</div>
<div style="margin: 15px 0 0 80px">
中国建筑第四工程局有限公司（施工图设计）
</div>
<div>总包单位：中国建筑第四工程局有限公司</div>
<!-- <div>业主单位：中国建筑第四工程局有限公司</div> -->
<!-- <div>合同工期：2022-04-18/2024-10-08</div> -->
@ -30,7 +32,6 @@
import Card from '../components/Card'
import { listProjectInfo } from '@/assets/js/api/zhongjianFourth'
export default {
components: { Card },
data: () => ({
@ -42,7 +43,7 @@ export default {
// name: { label: '总包单位', value: '中国建筑第四工程局有限公司' },
// supervisorUnit: { label: '监理单位', value: '' },
// },
list:{},
list: {}
}),
created() {
this.projectSn = this.$store.state.projectSn
@ -61,12 +62,12 @@ export default {
// list[key].value = res.result[key];
// })
// })
listProjectInfo({ projectSn: this.projectSn }).then(res => {
this.list = res.result;
console.log('项目信息11111: ', this.list);
listProjectInfo({ projectSn: this.projectSn }).then((res) => {
this.list = res.result
console.log('项目信息11111: ', this.list)
})
},
},
}
}
}
</script>

12
src/views/projectAdmin/fourEngin/security/leftTop.vue
View File

@ -69,7 +69,7 @@
name: '已闭合'
},
{
value: safetyPatrolInspection.todayNoRectificationRatio,
value: safetyPatrolInspection.todayNoRectificationNum,
name: '未闭合'
}
]"
@ -95,8 +95,14 @@
<span>占比</span>
</div>
<div class="row">
<span>{{ 0 }}</span>
<span>{{ 0 }}%</span>
<span>{{
safetyPatrolInspection.todayNoRectificationNum || 0
}}</span>
<span
>{{
safetyPatrolInspection.todayNoRectificationRatio || 0
}}%</span
>
</div>
</div>
</div>

1
src/views/projectFront/electricityManage/relaTimeData.vue
View File

@ -190,6 +190,7 @@ export default {
return {
deviceIdArr: [],
formInline: {
ammeterNo: '',
yearTime: '',
waterMeterNo: '',
projectSn: this.$store.state.projectSn

6
src/views/projectFront/projectSummary/floorManagement.vue
View File

@ -370,7 +370,10 @@ export default {
//查询施工阶段
getConstructionData() {
let param = {
floorId: this.floorId
floorId: this.floorId,
constructionPhase: this.constructionPhase
? this.constructionPhase
: null
}
getConstructionPhaseApi(param).then((res) => {
console.log('查询施工阶段', res)
@ -525,6 +528,7 @@ export default {
},
//查询
loadDataTwo() {
console.log('this.constructionPhase :', this.constructionPhase)
this.getConstructionData()
}
// //切换数量