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

冲突

Browse Source
This commit is contained in:
X_Rian 2024-06-11 19:14:29 +08:00
commit b9014cbafe
6 changed files with 158 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/js/config.js
View File

@ -18,7 +18,8 @@ var COMPANY = '' //通用
// COMPANY = 'jlw'//金林湾 // COMPANY = 'jlw'//金林湾
// COMPANY = 'shzj'//上海张江 // COMPANY = 'shzj'//上海张江
// COMPANY = 'shjg'//上海优益（上海建工） // COMPANY = 'shjg'//上海优益（上海建工）
COMPANY = 'agjt'//鞍钢集团 // COMPANY = 'agjt'//鞍钢集团
COMPANY = 'zkax'//中科安信
var PROJECT = { var PROJECT = {
local_test: 'common', // 普通版 local_test: 'common', // 普通版

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

@ -117,6 +117,78 @@ function getLang() {
} }
// 环境的切换 // 环境的切换
if (process.env.NODE_ENV == "development") { if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://8.142.139.165:7080' // 湖里区
// axios.defaults.baseURL = 'http://124.71.87.250/'
// axios.defaults.baseURL = 'http://139.9.66.234:30/'
// axios.defaults.baseURL = 'http://14.29.220.211:6023/'
// axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光
// axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/'
// axios.defaults.baseURL = 'http://36.137.53.203:9090/' // 南昌地铁 17512009894 123456789 gdjt 87654321
// axios.defaults.baseURL = 'http://192.168.34.125:6023/'
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
// tag: 本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上（旧）地址
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';
// axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
// axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
// axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲
// axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //
// axios.defaults.baseURL = 'http://120.236.247.200:9000/'; //横琴线上
// axios.defaults.baseURL = 'http://223.82.100.80:9000/'; //南昌地铁
// axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌地铁二期
// axios.defaults.baseURL = 'http://124.71.178.44:30/';
// axios.defaults.baseURL = 'http://192.168.34.125:9090/';
// axios.defaults.baseURL = 'http://192.168.88.220:6023/';
// axios.defaults.baseURL = 'http://124.71.178.44:9000/'; //中建 cscec101 123456
// axios.defaults.baseURL = 'https://jk.cscec1b1.com:5138/';//沃尔
// axios.defaults.baseURL = 'http://61.190.32.219:9050/'
// axios.defaults.baseURL = 'http://183.95.84.54:5800/'//合展-宿迁 zxsd 123456
// axios.defaults.baseURL = 'http://183.95.84.54:9500/'//贵州-敏尚 17512075572 123456
// axios.defaults.baseURL = 'http://183.95.84.34:7185/' //测试服
// axios.defaults.baseURL = 'http://183.60.227.61:30246/'
// axios.defaults.baseURL = 'http://183.60.227.61:30249/' //测试服2
// axios.defaults.baseURL = 'http://183.60.227.61:20561/' //龙光地产 龙光地产 123456
// axios.defaults.baseURL = 'http://218.92.215.138:9090/' //盐城 新佳城小区 123456
// axios.defaults.baseURL = 'http://36.137.53.203:9090/' //盐城 gdjt 123456789
// axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789
// axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上
// axios.defaults.baseURL = 'http://58.250.210.9:9090/' //深汕线上
// axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
// axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
// axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
// axios.defaults.baseURL = 'http://101.43.164.214:12350/'//中建五局线上
// axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
// axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式
// axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/·
// axios.defaults.baseURL ='http://192.168.34.221:8188/' //郭圣雄本地
// 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:28889/' //郭圣雄本地
// axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
axios.defaults.baseURL = 'http://8.136.222.164:8808/'//中科安信正式地址
// axios.defaults.baseURL = 'http://8.142.139.165:7080' // 湖里区 // axios.defaults.baseURL = 'http://8.142.139.165:7080' // 湖里区
// axios.defaults.baseURL = 'http://124.71.87.250/' // axios.defaults.baseURL = 'http://124.71.87.250/'
// axios.defaults.baseURL = 'http://139.9.66.234:30/' // axios.defaults.baseURL = 'http://139.9.66.234:30/'

6
src/components/header.vue
View File

@ -141,17 +141,17 @@
<img src="@/assets/images/icon-bigData.png" alt srcset /> <img src="@/assets/images/icon-bigData.png" alt srcset />
指挥部大屏 指挥部大屏
</p> --> </p> -->
<!-- <p <p
v-show=" v-show="
$route.path.indexOf('projectIndex') != -1 && $route.path.indexOf('projectIndex') != -1 &&
$store.state.userInfo.projectKanban == 0 $store.state.userInfo.projectKanban == 0 && COMPANY != 'agjt'
" "
class="header-btn" class="header-btn"
@click="toOverview2()" @click="toOverview2()"
> >
<img src="@/assets/images/icon-bigData.png" alt srcset /> <img src="@/assets/images/icon-bigData.png" alt srcset />
数据看板 数据看板
</p> --> </p>
<p <p
v-for="(item, index) in $store.state.menuList" v-for="(item, index) in $store.state.menuList"
:key="index" :key="index"

26
src/store/index.js
View File

@ -50,22 +50,22 @@ export default new Vuex.Store({
// FILEURL:' http://101.43.164.214:11111/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/image/',// 百色
// UPLOADURL:'http://182.90.224.237:51234/upload/image/', // UPLOADURL:'http://182.90.224.237:51234/upload/image/',
// FILEURL:'http://182.90.224.237:51234/image/', // FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地 // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://192.168.34.155:19111/image/", //洁本地 // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
// UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
// FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
// WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
FILEURL:'http://42.180.188.17:11211/image/',//测试 // FILEURL:'http://42.180.188.17:11211/image/',//测试
// BASEURL: baseUrl BASEURL: baseUrl
// ? baseUrl ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境 : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL: UPLOADURL:
// window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址

50
src/views/projectAdmin/dataBoard/shzjSafety.vue
View File

@ -2,7 +2,8 @@
<!-- 安全帽管理 --> <!-- 安全帽管理 -->
<div class="material"> <div class="material">
<vue-scroll> <vue-scroll>
<img src="@/assets/images/dataBoard/shzjSafetyImg.png" style="height:auto;width:100%"/> <!-- <img src="@/assets/images/dataBoard/shzjSafetyImg.png" style="height:auto;width:100%"/> -->
<iframe style="width:100%;height:100%" :src="url" allow="microphone;camera;midi;encrypted-media;"></iframe>
</vue-scroll> </vue-scroll>
</div> </div>
</template> </template>
@ -13,3 +14,50 @@
text-align: center; text-align: center;
} }
</style> </style>
<script>
import {
getSafeyHatSessionApi
} from '@/assets/js/api/demo'
// import iframe from '../vrCenter/iframe.vue'
export default {
// components: { iframe },
data() {
return {
projectSn:"",
url: 'https://caps.runde.pro/login'
}
},
created(){
this.projectSn = this.$store.state.projectSn;
this.getSafeyHatSession()
},
methods: {
getSafeyHatSession(){
let data = {};
data.projectSn = this.projectSn;
getSafeyHatSessionApi(data).then(res=>{
console.log(res)
// {
// "success":true,
// "message":"操作成功！",
// "code":200,
// "result":{
// "msg_code":"GetSucc",
// "session_id":"d3a3c4d17c46e29dab9c9178d5b380c5",
// "userName":"rdys_test",
// "status":true,
// "token":"d3a3c4d17c46e29dab9c9178d5b380c5"
// },
// "timestamp":1634904162951
// }
if(res.code == 200){
// this.url = this.url + '#'+ res.result.token + '=' + res.result.session_id + '&user_name=' + res.result.userName + '&target=home'
this.url = this.url + '#token='+ res.result.token + '&user_name=' + res.result.userName + '&target=home'
// window.open(this.url)
}
})
}
}
}
</script>

19
src/views/projectFront/quality/businessModule/checkPoint.vue
View File

@ -188,7 +188,24 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<!-- AI设备 --> <!-- AI设备 -->
<el-form-item label="AI设备" prop="aiDeviceId"> <el-form-item label="AI设备" prop="aiDeviceId" v-if="COMPANY == 'agjt'">
<el-select
v-model="form.aiDeviceId"
multiple
:placeholder="$t('message.quality.pleaseSelect')"
style="width: 100%"
clearable
>
<el-option
v-for="item in aiDeviceList"
:key="item.id"
:label="item.hardwareName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="AI设备" v-else>
<el-select <el-select
v-model="form.aiDeviceId" v-model="form.aiDeviceId"
multiple multiple