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

Merge branch 'shenzhen-dev' into cjw-dev

Browse Source
This commit is contained in:
Vce 2024-04-23 21:30:51 +08:00
commit da7cf2ed43
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env.development
View File

@ -3,7 +3,7 @@ NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
# 后端本地 # 后端本地
VITE_API_URL = 'http://192.168.34.221:9111' # VITE_API_URL = 'http://192.168.34.221:9111'
# VITE_API_URL = 'http://192.168.34.221:28888' # 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'
@ -15,7 +15,7 @@ VITE_API_URL = 'http://192.168.34.221:9111'
# 演示平台 # 演示平台
# VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
# 百色七参数线上地址 # 百色七参数线上地址
VITE_API_URL = 'http://101.43.164.214:11111' # VITE_API_URL = 'http://101.43.164.214:11111'
# 七参数标准版(测试平台) # 七参数标准版(测试平台)
# VITE_API_URL = 'http://jxj.zhgdyun.com:15551' # VITE_API_URL = 'http://jxj.zhgdyun.com:15551'
# 七参数标准版(测试平台) # 七参数标准版(测试平台)
@ -24,7 +24,7 @@ VITE_API_URL = 'http://101.43.164.214:11111'
# VITE_API_URL = 'http://47.93.215.234:9809' # VITE_API_URL = 'http://47.93.215.234:9809'
# VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # VITE_API_URL = 'http://jxj.zhgdyun.com:19812'
# 苏立信 # 苏立信
# VITE_API_URL = 'http://101.43.164.214:11111' VITE_API_URL = 'http://101.43.164.214:11111'
# 上传 # 上传
VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

2
src/config/config.ts
View File

@ -24,7 +24,7 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// 项目环境标识配置 部署时需更改对应的项目 // 项目环境标识配置 部署时需更改对应的项目
// export const COMPANY: string = ""; //标准版 // export const COMPANY: string = ""; //标准版
export const COMPANY: string = "zsbf"; //中水北方 export const COMPANY: string = "zsbf"; //鞍山项目
// export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "as"; //鞍山项目
// export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjt"; //鞍钢集团
// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏

15
src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue
View File

@ -9,8 +9,8 @@
<div class="totalDay"> <div class="totalDay">
<div style="line-height: 45px"> <div style="line-height: 45px">
项目总天数 项目总天数
<span v-if="!projectData.totalProjectDay" class="dayImg">0</span> <span v-if="!projectData?.totalProjectDay" class="dayImg">0</span>
<span v-else class="dayImg" v-for="item in projectData.totalProjectDay" :key="item">{{ item }}</span> <span v-else class="dayImg" v-for="item in projectData?.totalProjectDay" :key="item">{{ item }}</span>
<!-- <span class="dayImg">0</span> <!-- <span class="dayImg">0</span>
<span class="dayImg">4</span> <span class="dayImg">4</span>
<span class="dayImg">7</span> --> <span class="dayImg">7</span> -->
@ -20,8 +20,8 @@
<div class="residueDay"> <div class="residueDay">
<div style="line-height: 45px"> <div style="line-height: 45px">
项目剩余天数 项目剩余天数
<span v-if="!projectData.surplusDay" class="dayImg">0</span> <span v-if="!projectData?.surplusDay" class="dayImg">0</span>
<span v-else class="dayImg" v-for="item in projectData.surplusDay" :key="item">{{ item }}</span> <span v-else class="dayImg" v-for="item in projectData?.surplusDay" :key="item">{{ item }}</span>
<!-- <span class="dayImg">2</span> <!-- <span class="dayImg">2</span>
<span class="dayImg">8</span> <span class="dayImg">8</span>
<span class="dayImg">6</span> --> <span class="dayImg">6</span> -->
@ -118,8 +118,9 @@ watch(
if (newVal) { if (newVal) {
// props.xData = newVal; // props.xData = newVal;
projectData.value = newVal; projectData.value = newVal;
console.log("当前阶段", projectData.value.constructionStage); console.log("当前阶段", projectData.value);
if (progressList.value.length > 0) { console.log("当前阶段", progressList.value);
if (progressList.value.length > 0 && projectData.value.constructionStage) {
progressList.value[projectData.value.constructionStage - 1].status = 1; progressList.value[projectData.value.constructionStage - 1].status = 1;
} }
} }
@ -138,7 +139,7 @@ const getProgressOption = async () => {
}); });
progressList.value = newArray; progressList.value = newArray;
console.log(projectData.value, "里程碑option", res); 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;
} }
} }