fix: BUG修改
This commit is contained in:
kun
parent
1887b53e01
commit
2d1b3892ac
@ -69,7 +69,7 @@ const routes = [{
|
||||
},
|
||||
{
|
||||
path: 'towerCraneList', //塔吊管理 基本信息
|
||||
name: '塔吊管理_设备管理',
|
||||
name: '塔吊管理_设备管理1',
|
||||
component: resolve => require(['../views/projectFront/towerCrane/basicInfo.vue'], resolve)
|
||||
},
|
||||
// {
|
||||
@ -84,7 +84,7 @@ const routes = [{
|
||||
// },
|
||||
{
|
||||
path: 'lifterBasicInfo', //升降机管理 基本信息
|
||||
name: '升降机管理_设备管理',
|
||||
name: '升降机管理_设备管理1',
|
||||
component: resolve => require(['../views/projectFront/lifter/basicInfo.vue'], resolve)
|
||||
}, {
|
||||
path: 'waterDevManage', //
|
||||
|
||||
@ -83,11 +83,11 @@ 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://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://101.43.164.214:11111/' // 百色三标段项目
|
||||
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
|
||||
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
|
||||
|
||||
|
||||
@ -208,6 +208,8 @@ function handler(data, sn) {
|
||||
router.push('/projectIndex')
|
||||
} else if (data.styleType == 2) {
|
||||
router.push('/projectV2/taskList')
|
||||
} else if (data.styleType == 7) {
|
||||
router.push('/projectIndex')
|
||||
} else {
|
||||
router.push('/projectV3/taskList')
|
||||
}
|
||||
|
||||
@ -69,7 +69,7 @@ const routes = [{
|
||||
},
|
||||
{
|
||||
path: 'towerCraneList', //塔吊管理 基本信息
|
||||
name: '塔吊管理_设备管理',
|
||||
name: '塔吊管理_设备管理2',
|
||||
component: resolve => require(['../views/projectFront/towerCrane/basicInfo.vue'], resolve)
|
||||
},
|
||||
// {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@ export default {
|
||||
//中建四局项目
|
||||
{
|
||||
path: 'command',
|
||||
name: '指挥中心',
|
||||
name: '指挥中心2',
|
||||
component: () => import('@/views/projectAdmin/fourEngin/command')
|
||||
},
|
||||
{
|
||||
@ -15,42 +15,42 @@ export default {
|
||||
},
|
||||
{
|
||||
path: 'sourse',
|
||||
name: '资源管理',
|
||||
name: '资源管理1',
|
||||
component: () => import('@/views/projectAdmin/fourEngin/sourse')
|
||||
},
|
||||
{
|
||||
path: 'progress',
|
||||
name: '进度管理',
|
||||
name: '进度管理1',
|
||||
component: () => import('@/views/projectAdmin/fourEngin/progress')
|
||||
},
|
||||
{
|
||||
path: 'security',
|
||||
name: '安全管理',
|
||||
name: '安全管理1',
|
||||
component: () => import('@/views/projectAdmin/fourEngin/security')
|
||||
},
|
||||
{
|
||||
path: 'quality',
|
||||
name: '质量管理',
|
||||
name: '质量管理1',
|
||||
component: () => import('@/views/projectAdmin/fourEngin/quality')
|
||||
},
|
||||
{
|
||||
path: 'carbon',
|
||||
name: '双碳管理',
|
||||
name: '双碳管理1',
|
||||
component: () => import('@/views/projectAdmin/fourEngin/carbon')
|
||||
},
|
||||
{
|
||||
path: 'monitor',
|
||||
name: '监控大屏',
|
||||
name: '监控大屏1',
|
||||
component: () => import('@/views/projectAdmin/fourEngin/monitor')
|
||||
},
|
||||
{
|
||||
path: 'govComp',
|
||||
name: '政企联合',
|
||||
name: '政企联合1',
|
||||
component: () => import('@/views/projectAdmin/fourEngin/govComp')
|
||||
},
|
||||
{
|
||||
path: 'cloudBased',
|
||||
name: '云端建造',
|
||||
name: '云端建造1',
|
||||
component: () => import('@/views/projectAdmin/fourEngin/cloudBased')
|
||||
},
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ export default {
|
||||
children:[
|
||||
{
|
||||
path: 'command',
|
||||
name: '指挥中心',
|
||||
name: '指挥中心1',
|
||||
component: () => import('@/views/projectAdmin/zjsj/command')
|
||||
},
|
||||
{
|
||||
@ -14,12 +14,12 @@ export default {
|
||||
},
|
||||
{
|
||||
path: 'sourse',
|
||||
name: '资源管理',
|
||||
name: '资源管理2',
|
||||
component: () => import('@/views/projectAdmin/zjsj/sourse')
|
||||
},
|
||||
{
|
||||
path: 'progress',
|
||||
name: '进度管理',
|
||||
name: '进度管理2',
|
||||
component: () => import('@/views/projectAdmin/zjsj/progress')
|
||||
},
|
||||
{
|
||||
|
||||
@ -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/", //正式环境
|
||||
UPLOADURL:
|
||||
window.location.protocol +
|
||||
"//" +
|
||||
window.location.host +
|
||||
"/upload/image", //正式环境
|
||||
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
|
||||
//---------------------------------------------------------------------------------------------
|
||||
// BASEURL: baseUrl
|
||||
// ? baseUrl
|
||||
|
||||
@ -844,6 +844,8 @@ export default {
|
||||
this.$router.push('/projectIndex')
|
||||
} else if (data.styleType == 2) {
|
||||
this.$router.push('/projectV2/taskList')
|
||||
} else if (data.styleType == 7) {
|
||||
this.$router.push('/projectIndex')
|
||||
} else {
|
||||
this.$router.push('/projectV3/taskList')
|
||||
}
|
||||
|
||||
@ -44,6 +44,24 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
contentList: [
|
||||
{
|
||||
time: '2024-02-27',
|
||||
question: 1,
|
||||
utils: '广州市建设工程安全监督站',
|
||||
safe: '卢位昌、王章浩',
|
||||
type: '安全',
|
||||
position: '地上结构',
|
||||
change: '是'
|
||||
},
|
||||
{
|
||||
time: '2024-02-19',
|
||||
question: 1,
|
||||
utils: '广州市建设工程安全监督站',
|
||||
safe: '卢位昌、王章浩',
|
||||
type: '安全',
|
||||
position: '地上结构',
|
||||
change: '是'
|
||||
},
|
||||
{
|
||||
time: '2023-01-25',
|
||||
question: 1,
|
||||
|
||||
@ -106,15 +106,16 @@ export default {
|
||||
this.typeId = res.result[0].id;
|
||||
} else {
|
||||
res.result.forEach((element) => {
|
||||
if (element.name === "幕墙(㎡)") {
|
||||
if (element.name === "混凝土(m³)") {
|
||||
this.typeId = element.id;
|
||||
}
|
||||
});
|
||||
}
|
||||
const currentDate = new Date(); // 创建一个表示当前日期的对象
|
||||
// 设置为本年的第一天（1月1号）
|
||||
currentDate.setMonth(0);
|
||||
this.checkDate = moment(currentDate).format("YYYY-MM");
|
||||
// const currentDate = new Date(); // 创建一个表示当前日期的对象
|
||||
// // 设置为本年的第一天（1月1号）
|
||||
// currentDate.setMonth(0);
|
||||
// this.checkDate = moment(currentDate).format("YYYY-MM");
|
||||
this.checkDate = "2023-01"
|
||||
this.getData();
|
||||
}
|
||||
|
||||
|
||||
@ -379,13 +379,14 @@ export default {
|
||||
this.typeId = res.result[0].id
|
||||
} else {
|
||||
res.result.forEach(element => {
|
||||
if (element.name === '幕墙(㎡)') {
|
||||
if (element.name === '混凝土(m³)') {
|
||||
this.typeId = element.id
|
||||
}
|
||||
})
|
||||
}
|
||||
const currentDate = new Date(); // 创建一个表示当前日期的对象
|
||||
this.checkDate = moment(currentDate).format("YYYY");
|
||||
// const currentDate = new Date(); // 创建一个表示当前日期的对象
|
||||
// this.checkDate = moment(currentDate).format("YYYY");
|
||||
this.checkDate = "2023"
|
||||
this.getgetPassConsumeRatioList()
|
||||
this.isblock = true
|
||||
}
|
||||
|
||||
@ -328,7 +328,7 @@ export default {
|
||||
},
|
||||
//为了展示未解锁产品，所以需要查询所有模块
|
||||
getAllModule(half) {
|
||||
getAllModuleApi({ moduleType: 2 }).then((res) => {
|
||||
getAllModuleApi({ moduleType: 2, styleType: this.$store.state.userInfo.styleType }).then((res) => {
|
||||
if (res.success) {
|
||||
var all = res.result;
|
||||
console.log("all", all);
|
||||
@ -342,7 +342,6 @@ export default {
|
||||
});
|
||||
});
|
||||
this.list = all;
|
||||
console.log(this.list);
|
||||
this.$nextTick(() => {
|
||||
var projectIndex = document.getElementById("projectIndex");
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user