提交 bc39e135 编写于 作者: guangjun.yang's avatar guangjun.yang

可能没有解决360上的问题

上级 fb5ad0c8
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
size="small" size="small"
type="datetime" type="datetime"
placeholder="请选择开始时间" placeholder="请选择开始时间"
value-format="yyyy/MM/dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy/MM/dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions0" :picker-options="pickerOptions0"
style="width: 100%;" style="width: 100%;"
:disabled="formData.status4Flag == 1 || isPreview==1" :disabled="formData.status4Flag == 1 || isPreview==1"
...@@ -89,8 +89,8 @@ ...@@ -89,8 +89,8 @@
size="small" size="small"
type="datetime" type="datetime"
placeholder="请选择结束时间" placeholder="请选择结束时间"
value-format="yyyy/MM/dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy/MM/dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions1" :picker-options="pickerOptions1"
default-time="00:00:00" default-time="00:00:00"
style="width: 100%;" style="width: 100%;"
...@@ -416,8 +416,8 @@ export default { ...@@ -416,8 +416,8 @@ export default {
// 设置已有的基本信息 // 设置已有的基本信息
setBaseMessage(data) { setBaseMessage(data) {
data.projectData.projectBegintime = convertTime(data.projectData.projectBegintime); // data.projectData.projectBegintime = convertTime(data.projectData.projectBegintime);
data.projectData.projectEndtime = convertTime(data.projectData.projectEndtime); // data.projectData.projectEndtime = convertTime(data.projectData.projectEndtime);
vm.formData = Object.assign(vm.formData, data.projectData); vm.formData = Object.assign(vm.formData, data.projectData);
vm.formData.attachmentUrl1 = data.attachmentData[0].attachmentUrl; vm.formData.attachmentUrl1 = data.attachmentData[0].attachmentUrl;
...@@ -425,8 +425,8 @@ export default { ...@@ -425,8 +425,8 @@ export default {
vm.formData.attachmentMore1 = Object.assign( vm.formData.attachmentMore1, data.attachmentData[0]); vm.formData.attachmentMore1 = Object.assign( vm.formData.attachmentMore1, data.attachmentData[0]);
// 暂存为1 下一步为3 // 暂存为1 下一步为3
vm.formData.projectType = vm.formData.projectType == 0 ? 4 : vm.formData.projectType; vm.formData.projectType = vm.formData.projectType == 0 ? 4 : vm.formData.projectType;
vm.formData.projectBegintime = vm.formData.projectBegintime ? new Date(vm.formData.projectBegintime) : ""; // vm.formData.projectBegintime = vm.formData.projectBegintime ? new Date(vm.formData.projectBegintime) : "";
vm.formData.projectEndtime = vm.formData.projectBegintime ? new Date(vm.formData.projectEndtime) : ""; // vm.formData.projectEndtime = vm.formData.projectBegintime ? new Date(vm.formData.projectEndtime) : "";
if (data.attachmentData[1]) { if (data.attachmentData[1]) {
let attachmentUrl2 = data.attachmentData[1].attachmentUrl; let attachmentUrl2 = data.attachmentData[1].attachmentUrl;
vm.selectedAttachUrl(attachmentUrl2, 2, false); vm.selectedAttachUrl(attachmentUrl2, 2, false);
...@@ -609,14 +609,14 @@ export default { ...@@ -609,14 +609,14 @@ export default {
} }
} }
vm.formData.projectBegintime = convertTime( // vm.formData.projectBegintime = convertTime(
vm.formData.projectBegintime, // vm.formData.projectBegintime,
false // false
); // );
vm.formData.projectEndtime = convertTime( // vm.formData.projectEndtime = convertTime(
vm.formData.projectEndtime, // vm.formData.projectEndtime,
false // false
); // );
if (status) { if (status) {
vm.formData.projectStatus = status; vm.formData.projectStatus = status;
} }
......
...@@ -54,7 +54,7 @@ service.interceptors.request.use(config => { ...@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
} }
if( process.env.BUILD_ENV == "development" ){ // 本地开发环境 if( process.env.BUILD_ENV == "development" ){ // 本地开发环境
// console.log('环境变量>>>> ', process.env.BUILD_ENV); // console.log('环境变量>>>> ', process.env.BUILD_ENV);
config.headers['token'] = '3AD5FF6E07894218969500173624A30F'; config.headers['token'] = '69A24843079C458DBAC7E7C954923718';
// config.headers['token'] = localStorage.getItem('storageToken') // config.headers['token'] = localStorage.getItem('storageToken')
}else{ }else{
config.headers['token'] = localStorage.getItem('storageToken') config.headers['token'] = localStorage.getItem('storageToken')
......
...@@ -236,13 +236,15 @@ export function convertTime(time, isToSlash = true) { ...@@ -236,13 +236,15 @@ export function convertTime(time, isToSlash = true) {
} else { } else {
if(isToSlash) { if(isToSlash) {
if(typeof(time) == 'object') { if(typeof(time) == 'object') {
return time.format("yyyy/MM/dd hh:mm:ss"); // return time.format("yyyy/MM/dd hh:mm:ss");
return new Date(time.getTime()).format("yyyy/MM/dd hh:mm:ss");
} else { } else {
return time.replace(/-/g, '/') return time.replace(/-/g, '/')
} }
} else { } else {
if(typeof(time) == 'object') { if(typeof(time) == 'object') {
return time.format("yyyy-MM-dd hh:mm:ss"); // return time.format("yyyy-MM-dd hh:mm:ss");
return new Date(time.getTime()).format("yyyy-MM-dd hh:mm:ss");
} else { } else {
return time.replace(/\//g, '-') return time.replace(/\//g, '-')
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册