diff --git a/src/store/index.js b/src/store/index.js index 65133b8b..4ef6fcef 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -94,22 +94,18 @@ export default new Vuex.Store({ // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试 // FILEURL: 'http://42.180.188.17:11211/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/", //正式环境 // // WORKFLOWURL: 'http://47.93.215.234:19998/#/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:19098/#/workspace/forms", //鞍钢测试平台工作流地址 - // PREVIEWURL: "http://219.147.96.221:8012/onlinePreview", - PREVIEWURL: "http://jxj.zhgdyun.com:8012/onlinePreview", - // PREVIEWURL: "http://gszhdz.crpower.com.cn:9809/kkFileView/onlinePreview", - // UPLOADURL: 'http://gszhdz.crpower.com.cn:9809/upload/image', //敦煌线上 - // FILEURL: 'http://gszhdz.crpower.com.cn:9809/image/', //敦煌线上 - - UPLOADURL: 'http://192.168.34.221:8111/upload/image', //演示平台 雄本地 - FILEURL: 'http://192.168.34.221:8111/image/', //演示平台 雄本地 + PREVIEWURL: "http://219.147.96.221:8012/onlinePreview", + + // UPLOADURL: 'http://192.168.34.221:8111/upload/image', //演示平台 雄本地 + // FILEURL: 'http://192.168.34.221:8111/image/', //演示平台 雄本地 // UPLOADURL: 'http://jxj.zhgdyun.com:100/upload/image', //演示平台 // FILEURL: 'http://jxj.zhgdyun.com:100/image/', //演示平台 diff --git a/src/views/projectFront/workTicketManage/homeworkControlProcess.vue b/src/views/projectFront/workTicketManage/homeworkControlProcess.vue index 3cf3afb3..c9e4f147 100644 --- a/src/views/projectFront/workTicketManage/homeworkControlProcess.vue +++ b/src/views/projectFront/workTicketManage/homeworkControlProcess.vue @@ -296,6 +296,13 @@ v-if="scope.row.status == 3" >继续作业 + 重新开始 继续作业 +
+ 重新开始 +