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

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-01-02 18:52:03 +08:00
parent c5f5fd2754
commit 7b6a1d772e
5 changed files with 84 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/config.js
View File

@ -14,7 +14,7 @@ var COMPANY = '' //通用
// COMPANY = 'zjsj'//中建四局
// COMPANY = 'zjwj'//中建五局
// COMPANY = 'sccr'//四川成润
// COMPANY = 'pssh'//坪山沙湖项目
COMPANY = 'pssh'//坪山沙湖项目
// COMPANY = 'jlw'//金林湾
// COMPANY = 'shzj'//上海张江
// COMPANY = 'shjg'//上海优益（上海建工）

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

@ -79,11 +79,12 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
// axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖
axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖（最新）地址
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头

3
src/router/largeScreen/forth.js
View File

@ -57,7 +57,8 @@ export default {
//坪山沙湖项目
{
path: 'robot',
name: '机器人管理',
// name: '机器人管理',
name: '云端建造',
component: () => import('@/views/projectAdmin/fourEngin/robot')
},
]

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

@ -1,12 +1,30 @@
<!-- 步骤条 -->
<template>
<div class="list progress" id="scrollBox">
<div :ops="ops" class="list-item progress-item" v-for="(item, index) in list" :key="index" v-if="COMPANY=='zjsj'">
<div
:ops="ops"
class="list-item progress-item"
v-for="(item, index) in list"
:key="index"
v-if="COMPANY == 'zjsj'"
>
<div style="display:flex;">
<div style="text-align:center;width: 100px;">
<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"/>
<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>
<p>{{ item.Time }}</p>
@ -22,12 +40,30 @@
</div>
<!-- <div :class="['progress-item-dot', { active: projectData.constructionStage-1 >= index }]"></div> -->
</div>
<div :ops="ops" class="list-item progress-item" v-for="(item, index) in listPssh" :key="index" v-if="COMPANY=='pssh'">
<div
:ops="ops"
class="list-item progress-item"
v-for="(item, index) in listPssh"
:key="index"
v-if="COMPANY == 'pssh'"
>
<div style="display:flex;">
<div style="text-align:center;width: 100px;">
<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"/>
<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>
<p>{{ item.Time }}</p>
@ -47,62 +83,62 @@
</template>
<script>
import { getProjectDetail } from '@/assets/js/api/baseInfo.js'
import { listProjectInfo } from '@/assets/js/api/zhongjianFourth'
import { getProjectDetail } from "@/assets/js/api/baseInfo.js";
import { listProjectInfo } from "@/assets/js/api/zhongjianFourth";
export default {
props: {
list: {
type: Array,
default: () => []
default: () => [],
},
listPssh: {
type: Array,
default: () => []
default: () => [],
},
},
data() {
return {
projectSn: '',
projectSn: "",
projectData: {
constructionStage: 10
constructionStage: 10,
},
ops: {
vuescroll: {
wheelDirectionReverse: true
}
wheelDirectionReverse: true,
},
},
state:'',
state: "",
COMPANY: COMPANY,
}
};
},
created() {
this.projectSn = this.$store.state.projectSn
this.getDataDateils()
console.log('this.listPssh',this.listPssh);
this.projectSn = this.$store.state.projectSn;
this.getDataDateils();
console.log("this.listPssh", this.listPssh);
},
mounted() {},
methods: {
getDataDateils() {
let data = { projectSn: this.projectSn }
getProjectDetail(data).then(res => {
let data = { projectSn: this.projectSn };
getProjectDetail(data).then((res) => {
if (res.code == 200) {
console.log('查询进度', res)
this.projectData = res.result
console.log("查询进度", res);
this.projectData = res.result;
}
})
listProjectInfo({ projectSn: this.projectSn }).then(res => {
});
listProjectInfo({ projectSn: this.projectSn }).then((res) => {
// this.state = res.result.constructionStage
this.state = 3
this.state = 3;
if (this.COMPANY == "zjsj") {
this.state = 4;
}
console.log('999999999999999',this.state,res);
})
}
}
}
console.log("999999999999999", this.state, res);
});
},
},
};
</script>
<style lang="scss" scoped>
@ -129,7 +165,7 @@ export default {
border-radius: 50%;
&::after {
content: '';
content: "";
position: absolute;
top: 4px;
transform: translateX(-99%);
@ -146,7 +182,7 @@ export default {
}
&::before {
content: '';
content: "";
position: relative;
z-index: 9;
display: block;

9
src/views/projectAdmin/fourEngin/robot/index.vue
View File

@ -23,11 +23,12 @@ export default {
},
methods: {
getUrl() {
getrobotUrlApi({ projectSn: this.$store.state.projectSn }).then(res => {
this.url=res.result.url
console.log('机器人 ：this.url', this.url);
this.url = "http://zljsh.smart-build.cn/3d/"
// getrobotUrlApi({ projectSn: this.$store.state.projectSn }).then(res => {
// this.url=res.result.url
// console.log('机器人 ：this.url', this.url);
})
// })
}
}
}