admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-30 09:13:50 +08:00
parent 942cb3dc5b
commit 5718ecd0e1
3 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main.js
View File

@ -38,10 +38,10 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用）
// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址
// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
// Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
@ -87,13 +87,13 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址
// Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址（弃用）
// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址
Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址
Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址
// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段
// Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
// Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址
// Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台
// Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南

6
pages.json
View File

@ -1665,8 +1665,6 @@
"navigationBarTitleText": "下发验收任务",
"enablePullDownRefresh": false
}
<<<<<<< HEAD
},{
"path" : "pages/projectEnd/dangerBigProject/finallyAcceptance",
"style" :
@ -1723,9 +1721,6 @@
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
=======
},
{
"path": "pages/projectEnd/dangerBigProject/finallyAcceptance",
@ -2626,7 +2621,6 @@
"style": {
"navigationBarTitleText": ""
}
>>>>>>> 1a9c140129d83910f5b0fdcab99276c226192366
}
],
// "subPackages":[{

15
pages/standardScheduleNews/auditDetail.vue
View File

@ -10,17 +10,10 @@
进度详情
</view>
<view class="type">
<<<<<<< .mine
<view class="textColor flex-space_between">所属承包商：<span class="textStyle">{{itemFrom.enterpriseName || ""}}</span></view>
=======
<view class="textColor">
<text>所属承包商：</text>
<text class="textStyle">{{itemFrom.enterpriseName || ""}}</text>
</view>
>>>>>>> .theirs
</view>
<view class="type">
<view class="textColor">
@ -229,17 +222,9 @@
display: flex;
align-items: baseline;
height: 200rpx;
<<<<<<< .mine
line-height: 40rpx;
padding-top: 30rpx;
margin: 20rpx;
=======
// line-height: 80rpx;
padding-top: 40rpx;
>>>>>>> .theirs
margin: 0 20rpx;
.inputFrom {
width: 80%;
margin-left: 40rpx;