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

Merge branch 'dev-cjw' into shenzhen-dev

Browse Source
This commit is contained in:
vce 2024-03-22 15:54:29 +08:00
commit 7c4d774736
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/config.js
View File

@ -11,7 +11,7 @@ var COMPANY = '' //通用
// COMPANY = 'hengtong'//瑞士恒通
// COMPANY = 'yunlian'//云联万物
// COMPANY = 'neimenggu'//内蒙古项目
// COMPANY = 'zjsj'//中建四局
COMPANY = 'zjsj'//中建四局
// COMPANY = 'zjwj'//中建五局
// COMPANY = 'sccr'//四川成润
// COMPANY = 'pssh'//坪山沙湖项目
@ -26,7 +26,7 @@ var PROJECT = {
online_gxlt: 'gxlt', // 广西联通
}
var PROJECT_TYPE = PROJECT.local_test
var PROJECT_TYPE = PROJECT.online_zjsj
var headerShow = true // 是否显示头部
var tabsShow = true // 是否显示tabs
if (COMPANY == 'xingxuan') {

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

@ -83,13 +83,13 @@ if (process.env.NODE_ENV == 'development') {
// 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:28889/' //郭圣雄本地
axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// 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://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:8088/'//中建四局线上（最新）地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址

22
src/store/index.js
View File

@ -46,19 +46,19 @@ export default new Vuex.Store({
PAGESIZRS: [10, 20, 30, 50],
// UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色
// FILEURL:' http://101.43.164.214:11111/image/',// 百色
UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
// UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
// FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
// UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
// FILEURL:'http://10.0.1.43:6023/image/',//测试
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL:
// window.location.protocol +
// "//" +
// window.location.host +
// "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
BASEURL: baseUrl
? baseUrl
: window.location.protocol + "//" + window.location.host + "/", //正式环境
UPLOADURL:
window.location.protocol +
"//" +
window.location.host +
"/upload/image", //正式环境
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl
// ? baseUrl

13
src/views/projectAdmin/fourEngin/command/leftTwo.vue
View File

@ -64,10 +64,10 @@
<!-- <div style="display: flex;"> -->
<div>
<table class="zjsj-target">
<tr><td class="target-1">质量目标</td><td>确保省优质奖，争创鲁班奖（国优）</td></tr>
<tr><td class="target-1">安全目标</td><td>确保双优工程、争创AAA工地</td></tr>
<tr><td class="target-1">设计目标</td><td>绿建三星、EarthCheck银奖认省部级勘察设计奖</td></tr>
<tr><td class="target-1">科技目标</td><td>省新技术示范、省绿色施工示范、局科技应用示范</td></tr>
<tr><td class="target-1">质量目标</td><td class="target-2">确保省优质奖，争创鲁班奖（国优）</td></tr>
<tr><td class="target-1">安全目标</td><td class="target-2">确保双优工程、争创AAA工地</td></tr>
<tr><td class="target-1">设计目标</td><td class="target-2">绿建三星、EarthCheck银奖认证、省部级勘察设计奖</td></tr>
<tr><td class="target-1">科技目标</td><td class="target-2">省科技、省绿色施工示范工程，局、集团科技示范项目</td></tr>
</table>
<!-- <div class="" v-if="COMPANY == 'zjsj'">
<div class="td">质量目标</div>
@ -154,12 +154,13 @@ export default {
padding: 10px 10px;
font-size: 16px;
.target-1{
width: 20%;
width: 18%;
height: 40px;
line-height: 40px;
}
.target-2{
width: 80%;
font-size: 14px;
width: 82%;
}
}
.contentBox {