fix: 标准版提交
This commit is contained in:
parent
6dcf01bb62
commit
9679950f06
@ -2,12 +2,14 @@
|
|||||||
NODE_ENV = 'development'
|
NODE_ENV = 'development'
|
||||||
|
|
||||||
# 本地环境接口地址(/api/index.ts文件中使用)
|
# 本地环境接口地址(/api/index.ts文件中使用)
|
||||||
|
VITE_API_URL = 'http://192.168.34.221:30002'
|
||||||
|
# VITE_API_URL = 'http://192.168.34.221:28888'
|
||||||
# VITE_API_URL = 'http://121.196.214.246/api'
|
# VITE_API_URL = 'http://121.196.214.246/api'
|
||||||
# VITE_API_URL = 'http://jxj.zhgdyun.com:100'
|
# VITE_API_URL = 'http://jxj.zhgdyun.com:100'
|
||||||
# VITE_API_URL = 'http://192.168.34.221:12360'
|
# VITE_API_URL = 'http://192.168.34.221:12360'
|
||||||
# 沈阳合盈线上
|
# 沈阳合盈线上
|
||||||
# VITE_API_URL = "http://101.43.164.214:45022"
|
# VITE_API_URL = "http://101.43.164.214:45022"
|
||||||
VITE_API_URL = 'http://192.168.34.221:30002'
|
# 演示平台
|
||||||
# VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
|
# VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
|
||||||
# 百色七参数线上地址
|
# 百色七参数线上地址
|
||||||
# VITE_API_URL = 'http://101.43.164.214:11113'
|
# VITE_API_URL = 'http://101.43.164.214:11113'
|
||||||
|
|||||||
@ -32,7 +32,7 @@
|
|||||||
<div style="width: 5px; height: 5px; background: rgba(130, 251, 234, 1); border-radius: 10px; margin: 1%"></div>
|
<div style="width: 5px; height: 5px; background: rgba(130, 251, 234, 1); border-radius: 10px; margin: 1%"></div>
|
||||||
<div><i>里程碑</i></div>
|
<div><i>里程碑</i></div>
|
||||||
</div>
|
</div>
|
||||||
<el-scrollbar style="width: 94%; margin: 3% 0% 0% 3%; height: 30%">
|
<el-scrollbar style="width: 94%; margin: 3% 0% 0% 3%; height: 30%" v-if="progressList.length > 0">
|
||||||
<div class="progressData">
|
<div class="progressData">
|
||||||
<div class="data" v-for="item in progressList" :key="item.id">
|
<div class="data" v-for="item in progressList" :key="item.id">
|
||||||
<div v-if="item.status == 0" class="text" :title="item.name">{{ item.name }}</div>
|
<div v-if="item.status == 0" class="text" :title="item.name">{{ item.name }}</div>
|
||||||
@ -55,6 +55,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-scrollbar>
|
</el-scrollbar>
|
||||||
|
<div class="notoDta" v-else>
|
||||||
|
<img src="@/assets/images/noData.png" alt="" />
|
||||||
|
<div>暂无数据</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
@ -66,34 +70,34 @@ import { ref, watch, onMounted } from "vue";
|
|||||||
import { getStageOption } from "@/api/modules/projectOverview";
|
import { getStageOption } from "@/api/modules/projectOverview";
|
||||||
|
|
||||||
const progressList = ref([
|
const progressList = ref([
|
||||||
{
|
// {
|
||||||
name: "施工证获取",
|
// name: "施工证获取",
|
||||||
status: 0
|
// status: 0
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
name: "土方开挖",
|
// name: "土方开挖",
|
||||||
status: 0
|
// status: 0
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
name: "桩基",
|
// name: "桩基",
|
||||||
status: 0
|
// status: 0
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
name: "支护开始",
|
// name: "支护开始",
|
||||||
status: 0
|
// status: 0
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
name: "垫层完成",
|
// name: "垫层完成",
|
||||||
status: 0
|
// status: 0
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
name: "正负零",
|
// name: "正负零",
|
||||||
status: 0
|
// status: 0
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
name: "工程达到预售条件",
|
// name: "工程达到预售条件",
|
||||||
status: 0
|
// status: 0
|
||||||
}
|
// }
|
||||||
] as any);
|
] as any);
|
||||||
// ts
|
// ts
|
||||||
type Props = {
|
type Props = {
|
||||||
@ -114,7 +118,9 @@ watch(
|
|||||||
// props.xData = newVal;
|
// props.xData = newVal;
|
||||||
projectData.value = newVal;
|
projectData.value = newVal;
|
||||||
console.log("当前阶段", projectData.value.constructionStage);
|
console.log("当前阶段", projectData.value.constructionStage);
|
||||||
progressList.value[projectData.value.constructionStage - 1].status = 1;
|
if (progressList.value.length > 0) {
|
||||||
|
progressList.value[projectData.value.constructionStage - 1].status = 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -122,7 +128,7 @@ watch(
|
|||||||
//获取里程碑option
|
//获取里程碑option
|
||||||
const getProgressOption = async () => {
|
const getProgressOption = async () => {
|
||||||
const res: any = await getStageOption({ dictionaryEncoding: "project_construction_stage" });
|
const res: any = await getStageOption({ dictionaryEncoding: "project_construction_stage" });
|
||||||
if (res.success) {
|
if (res.result.length > 0) {
|
||||||
let newArray = res.result.map((item: any) => {
|
let newArray = res.result.map((item: any) => {
|
||||||
return {
|
return {
|
||||||
name: item.name,
|
name: item.name,
|
||||||
@ -130,7 +136,7 @@ const getProgressOption = async () => {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
progressList.value = newArray;
|
progressList.value = newArray;
|
||||||
console.log(projectData.value, "里程碑option", newArray);
|
console.log(projectData.value, "里程碑option", res);
|
||||||
if (projectData.value.constructionStage) {
|
if (projectData.value.constructionStage) {
|
||||||
progressList.value[projectData.value.constructionStage - 1].status = 1;
|
progressList.value[projectData.value.constructionStage - 1].status = 1;
|
||||||
}
|
}
|
||||||
@ -250,4 +256,18 @@ onMounted(() => {
|
|||||||
height: 80%;
|
height: 80%;
|
||||||
margin-top: 1.8%;
|
margin-top: 1.8%;
|
||||||
}
|
}
|
||||||
|
.notoDta {
|
||||||
|
bottom: 10%;
|
||||||
|
width: 20%;
|
||||||
|
left: 35%;
|
||||||
|
text-align: center;
|
||||||
|
position: absolute;
|
||||||
|
img {
|
||||||
|
width: 40%;
|
||||||
|
}
|
||||||
|
div {
|
||||||
|
color: #fff;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -215,7 +215,9 @@ function getQueryBySnData() {
|
|||||||
showType: 3
|
showType: 3
|
||||||
}).then((res: any) => {
|
}).then((res: any) => {
|
||||||
console.log(res, "效果图");
|
console.log(res, "效果图");
|
||||||
picUrl.value = res.result.configValue;
|
if (res.result) {
|
||||||
|
picUrl.value = res.result.configValue;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
// //保存或删除宣传视频
|
// //保存或删除宣传视频
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="leftTop">
|
<div class="leftTop">
|
||||||
<Card title="项目信息">
|
<Card title="项目信息">
|
||||||
<!-- <div class="projectInfo">
|
<div class="projectInfo">
|
||||||
<div><span>项目名称:</span> {{ projectData.projectName || "" }}</div>
|
<div><span>项目名称:</span> {{ projectData.projectName || "" }}</div>
|
||||||
<div :title="projectLocal"><span>项目地址:</span> {{ projectLocal }}</div>
|
<div :title="projectLocal"><span>项目地址:</span> {{ projectLocal }}</div>
|
||||||
<div><span>项目经理:</span> {{ projectData.projectManage || "" }}</div>
|
<div><span>项目经理:</span> {{ projectData.projectManage || "" }}</div>
|
||||||
@ -10,8 +10,8 @@
|
|||||||
<div><span>开工日期:</span> {{ projectData.startWorkDate || "" }}</div>
|
<div><span>开工日期:</span> {{ projectData.startWorkDate || "" }}</div>
|
||||||
<div><span>项目编号:</span> {{ projectData.projectNumber || "" }}</div>
|
<div><span>项目编号:</span> {{ projectData.projectNumber || "" }}</div>
|
||||||
<div><span>工程类别:</span> {{ projectData.projectType ? projectTypeEnum[projectData.projectType - 1].name : "" }}</div>
|
<div><span>工程类别:</span> {{ projectData.projectType ? projectTypeEnum[projectData.projectType - 1].name : "" }}</div>
|
||||||
</div> -->
|
</div>
|
||||||
<div class="projectInfo">
|
<!-- <div class="projectInfo">
|
||||||
<div><span>建设地点:</span> 南平市建阳区</div>
|
<div><span>建设地点:</span> 南平市建阳区</div>
|
||||||
<div><span>变电容量:</span> 2x50兆伏安</div>
|
<div><span>变电容量:</span> 2x50兆伏安</div>
|
||||||
<div><span>间隔名称:</span> 110千伏江坑问隔</div>
|
<div><span>间隔名称:</span> 110千伏江坑问隔</div>
|
||||||
@ -19,7 +19,7 @@
|
|||||||
<div><span>电缆长度:</span> 0.31公里</div>
|
<div><span>电缆长度:</span> 0.31公里</div>
|
||||||
<div><span>通讯光缆:</span> 74.79公里</div>
|
<div><span>通讯光缆:</span> 74.79公里</div>
|
||||||
<div><span>总投资:</span> 11762万元</div>
|
<div><span>总投资:</span> 11762万元</div>
|
||||||
</div>
|
</div> -->
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@ -4,8 +4,8 @@
|
|||||||
<div class="header">
|
<div class="header">
|
||||||
<!-- <div class="hearderIcon"><img src="@/assets/images/jxjLogo.png" alt="" /></div> -->
|
<!-- <div class="hearderIcon"><img src="@/assets/images/jxjLogo.png" alt="" /></div> -->
|
||||||
<span class="projectTitle">
|
<span class="projectTitle">
|
||||||
<!-- <p>数字化项目监管平台</p> -->
|
<p>数字化项目监管平台</p>
|
||||||
<p>江坑110kv变电站智慧工地</p>
|
<!-- <p>江坑110kv变电站智慧工地</p> -->
|
||||||
</span>
|
</span>
|
||||||
<div class="rightIcon" @click.stop>
|
<div class="rightIcon" @click.stop>
|
||||||
<div class="time">{{ nowTime }}</div>
|
<div class="time">{{ nowTime }}</div>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user