flx: 修改基础信息 合作单位

This commit is contained in:
X_Rian 2024-06-28 16:43:06 +08:00
parent 888d751aed
commit 39d74e1727
4 changed files with 259 additions and 133 deletions

View File

@ -173,8 +173,8 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// 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.155:19111/' //彭洁本地
axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
@ -183,7 +183,7 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上(最新)地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址

View File

@ -52,22 +52,21 @@ export default new Vuex.Store({
// FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://http://192.168.34.155:19111/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/', //郭圣雄本地
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
// WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// 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/", //正式环境
// 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/", //正式环境
// // 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:19998/#/workspace/forms', //鞍钢平台工作流地址
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl

View File

@ -59,7 +59,7 @@
</div>
<div class="table_wrap whiteBlock">
<el-tabs
v-model="activeName"
:value="activeName"
@tab-click="handleClick"
style="padding: 0 15px"
>

View File

@ -30,7 +30,9 @@
<el-table-column prop="value" min-width="35%">
<template slot-scope="scope">
<div
v-if="scope.row.value instanceof Array && scope.row.value.length > 0"
v-if="
scope.row.value instanceof Array && scope.row.value.length > 0
"
class="showImg_wrap"
>
<!-- <img
@ -48,7 +50,11 @@
/>
</div>
<div
v-else-if="scope.row.value && typeof(scope.row.value) == 'string' && scope.row.value.indexOf('http://') >= 0"
v-else-if="
scope.row.value &&
typeof scope.row.value == 'string' &&
scope.row.value.indexOf('http://') >= 0
"
class="showImg_wrap"
>
<!-- <img
@ -69,12 +75,15 @@
{{ scope.row.value }}
</div>
</template>
</el-table-column>
</el-table-column>
<el-table-column prop="fieldName2" min-width="15%"> </el-table-column>
<el-table-column prop="value2" min-width="35%">
<template slot-scope="scope">
<div
v-if="scope.row.value2 instanceof Array && scope.row.value2.length > 0"
v-if="
scope.row.value2 instanceof Array &&
scope.row.value2.length > 0
"
class="showImg_wrap"
>
<!-- <img
@ -92,7 +101,11 @@
/>
</div>
<div
v-else-if="scope.row.value2 && typeof(scope.row.value2) == 'string' && scope.row.value2.indexOf('http://') >= 0"
v-else-if="
scope.row.value2 &&
typeof scope.row.value2 == 'string' &&
scope.row.value2.indexOf('http://') >= 0
"
class="showImg_wrap"
>
<!-- <img
@ -123,10 +136,13 @@
type="primary"
size="medium"
@click="addBtn(1)"
v-permission="{key: 'hzdw_add_qualifications', menuPath: '/project/summary/cooperationUnit'}"
v-permission="{
key: 'hzdw_add_qualifications',
menuPath: '/project/summary/cooperationUnit',
}"
>新增</el-button
>
<vue-scroll style="height: 600px">
<el-table
:data="qualificationList"
stripe
@ -166,14 +182,38 @@
bigImageUrl = url[index];
"
/> -->
<img
<!-- <div
v-for="item in scope.row.fileUrl && JSON.parse(scope.row.fileUrl)"
:key="index"
>
</div> -->
<a
v-if="!scope.row.flag"
:href="scope.row.fileUrl"
:download="scope.row.fileNameNew.substring(0, scope.row.fileNameNew.indexOf('.'))"
target="self"
class="qualificationHref"
>{{ scope.row.fileNameNew }}</a
>
<img
v-else
:src="scope.row.fileUrl"
class="showImg"
@click="showImgBtn(scope.row.fileUrl)"
/>
<!-- <img
v-else
:src="scope.row.fileUrl"
class="showImg"
@click="
bigImageDialog = true;
bigImageUrl = scope.row.fileUrl;
"
/>
/> -->
<!-- <a
:href="url[index]"
download
@ -182,13 +222,13 @@
target="self"
class="qualificationHref"
> -->
<!-- <img
<!-- <img
v-if="scope.row.fileUrl && matchResult"
:key="index"
:src="url[index]"
class="showImg"
/> -->
<!-- {{ matchResult ? "" : url[index]}}
<!-- {{ matchResult ? "" : url[index]}}
</a> -->
</template>
</el-table-column>
@ -198,6 +238,7 @@
>
</el-table-column>
</el-table>
</vue-scroll>
</div>
<div class="qualificationDialog">
<el-dialog
@ -211,42 +252,40 @@
:rules="qualificationFormRules"
ref="qualificationForm"
label-width="120px"
size="medium"
class="dialogFormBox"
size="medium"
class="dialogFormBox"
>
<el-form-item label="资质文件名称" prop="fileName">
<el-form-item label="资质文件名称" prop="fileName">
<el-input
v-model="qualificationForm.fileName"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item
label="资质文件编号"
prop="fileNumber"
>
<el-form-item label="资质文件编号" prop="fileNumber">
<el-input
v-model="qualificationForm.fileNumber"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item label="上传资质文件" prop="fileUrl">
<el-form-item label="上传资质文件" prop="fileUrl">
<!-- accept="image/jpg,image/jpeg,image/png" -->
<el-upload
class="upload-demo"
:action="$store.state.UPLOADURL"
:on-preview="showImgBtn"
:on-remove="handleRemove"
:on-success="handleSuccess"
accept="image/jpg,image/jpeg,image/png"
:before-upload="handleBeforeUpload"
name="files"
multiple
ref="upload"
:limit="1"
:file-list="fileList"
>
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-form-item label="备注" prop="remarks">
<el-input
v-model="qualificationForm.remarks"
autocomplete="off"
@ -261,13 +300,17 @@
</div>
<div v-show="activeIndex == '3'" class="content_wrap">
<el-button
v-permission="{key: 'hzdw_add_bad', menuPath: '/project/summary/cooperationUnit'}"
v-permission="{
key: 'hzdw_add_bad',
menuPath: '/project/summary/cooperationUnit',
}"
class="addBadRecordBtn"
type="primary"
size="medium"
@click="addBtn(2)"
>新增</el-button
>
<vue-scroll style="height: 600px">
<el-table
:data="badRecordList"
stripe
@ -307,6 +350,7 @@
>
</el-table-column>
</el-table>
</vue-scroll>
</div>
<div class="badRecordDialog">
<el-dialog
@ -320,22 +364,22 @@
:rules="badRecordFormRules"
ref="badRecordForm"
label-width="100px"
size="medium"
class="dialogFormBox"
size="medium"
class="dialogFormBox"
>
<el-form-item label="发生事项" prop="ariseMatter">
<el-form-item label="发生事项" prop="ariseMatter">
<el-input
v-model="badRecordForm.ariseMatter"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item label="发生原因" prop="ariseReason">
<el-form-item label="发生原因" prop="ariseReason">
<el-input
v-model="badRecordForm.ariseReason"
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item label="发生时间" prop="ariseTime">
<el-form-item label="发生时间" prop="ariseTime">
<div class="block">
<span class="demonstration"></span>
<el-date-picker
@ -347,7 +391,7 @@
</el-date-picker>
</div>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-form-item label="备注" prop="remarks">
<el-input
v-model="badRecordForm.remarks"
autocomplete="off"
@ -381,11 +425,9 @@ import {
addEnterpriseBadRecord,
} from "@/assets/js/api/cooperationUnit";
import {
getProjectDetail
} from '@/assets/js/api/baseInfo.js'
import { getProjectDetail } from "@/assets/js/api/baseInfo.js";
export default {
props: ["detailId", "projectEnterpriseId","enterpriseSn"],
props: ["detailId", "projectEnterpriseId", "enterpriseSn"],
data() {
return {
activeIndex: "1",
@ -432,7 +474,7 @@ export default {
{ required: true, message: "请选择发生时间", trigger: "blur" },
],
},
infoEnterpriseId: ""
infoEnterpriseId: "",
};
},
created() {
@ -455,13 +497,13 @@ export default {
}
},
//
getDataDateils(){
getDataDateils() {
getProjectDetail({
projectSn: this.$props.enterpriseSn,
}).then((res) => {
if (res.code == 200) {
if(!res.result) return;
console.log('~~~~~~~~~~~~~~~~~~~~',res)
if (!res.result) return;
console.log("~~~~~~~~~~~~~~~~~~~~", res);
}
});
},
@ -480,13 +522,20 @@ export default {
fieldName2: this.$t("message.laborMange.photosOfQualification"),
value: res.result.enterpriseName,
value2:
res.result.enterpriseQualificationUrl && res.result.enterpriseQualificationUrl.split(',').length > 0?
res.result.enterpriseQualificationUrl.split(',').map(item => {
return {
name: item.split('*')[0],
url: this.$store.state.FILEURL + item.split('*')[1],
}
}) : res.result.enterpriseQualificationUrl.indexOf('http://') >= 0 ? res.result.enterpriseQualificationUrl: res.result.enterpriseQualificationUrl,
res.result.enterpriseQualificationUrl &&
res.result.enterpriseQualificationUrl.split(",").length > 0
? res.result.enterpriseQualificationUrl
.split(",")
.map((item) => {
return {
name: item.split("*")[0],
url: this.$store.state.FILEURL + item.split("*")[1],
};
})
: res.result.enterpriseQualificationUrl.indexOf("http://") >=
0
? res.result.enterpriseQualificationUrl
: res.result.enterpriseQualificationUrl,
},
{
fieldName: this.$t("message.laborMange.formOfBusiness"),
@ -514,7 +563,9 @@ export default {
? this.$t("message.cooperationUnit.subpackage10")
: res.result.enterpriseTypeId == 11
? this.$t("message.cooperationUnit.subpackage11")
: res.result.enterpriseTypeId == 12 ? this.$t("message.cooperationUnit.subpackage12") : '',
: res.result.enterpriseTypeId == 12
? this.$t("message.cooperationUnit.subpackage12")
: "",
value2: res.result.enterpriseLegalPerson,
},
{
@ -551,7 +602,9 @@ export default {
fieldName: this.$t("message.laborMange.laborCertificateNo"),
fieldName2: this.$t("message.laborMange.safetyProductionLicense"),
value: res.result.qualificationNumber,
value2: res.result.enterpriseSafeAllow && res.result.enterpriseSafeAllow,
value2:
res.result.enterpriseSafeAllow &&
res.result.enterpriseSafeAllow,
},
{
fieldName: this.$t("message.laborMange.natureOfUnit"),
@ -564,12 +617,17 @@ export default {
: res.result.enterpriseProperty == 3
? this.$t("message.laborMange.collectiveEnterprises")
: this.$t("message.laborMange.privateEnterprise"),
value2: res.result.logo && res.result.logo.split(',').length > 0 ? res.result.logo.split(',').map(item => {
return {
name: item.split('*')[0],
url: this.$store.state.FILEURL + item.split('*')[1],
}
}) : res.result.logo.indexOf('http://') >= 0 || !res.result.logo ? res.result.logo : this.$store.state.FILEURL + res.result.logo
value2:
res.result.logo && res.result.logo.split(",").length > 0
? res.result.logo.split(",").map((item) => {
return {
name: item.split("*")[0],
url: this.$store.state.FILEURL + item.split("*")[1],
};
})
: res.result.logo.indexOf("http://") >= 0 || !res.result.logo
? res.result.logo
: this.$store.state.FILEURL + res.result.logo,
// res.result.logo ? this.$store.state.FILEURL +res.result.logo : "",
},
{
@ -581,70 +639,117 @@ export default {
{
fieldName: "承包商名称",
fieldName2: "项目施工区域",
value: res.result.projectEnterprise.cbsName ? res.result.projectEnterprise.cbsName : "",
value2: res.result.projectEnterprise.projectBuildArea ? res.result.projectEnterprise.projectBuildArea : "",
value: res.result.projectEnterprise.cbsName
? res.result.projectEnterprise.cbsName
: "",
value2: res.result.projectEnterprise.projectBuildArea
? res.result.projectEnterprise.projectBuildArea
: "",
},
{
fieldName: "项目经理",
fieldName2: "项目类型",
value: res.result.projectEnterprise.projectManage ? res.result.projectEnterprise.projectManage :"",
value2: res.result.projectEnterprise.cbsProjectTypeName ? res.result.projectEnterprise.cbsProjectTypeName:"",
value: res.result.projectEnterprise.projectManage
? res.result.projectEnterprise.projectManage
: "",
value2: res.result.projectEnterprise.cbsProjectTypeName
? res.result.projectEnterprise.cbsProjectTypeName
: "",
},
{
fieldName: "施工阶段",
fieldName2: "纬度位置",
value: res.result.projectEnterprise.constructionStageName?res.result.projectEnterprise.constructionStageName:"",
value2: res.result.projectEnterprise.latitude ? res.result.projectEnterprise.latitude :"",
value: res.result.projectEnterprise.constructionStageName
? res.result.projectEnterprise.constructionStageName
: "",
value2: res.result.projectEnterprise.latitude
? res.result.projectEnterprise.latitude
: "",
},
{
fieldName: "经度位置",
fieldName2: "工程类别",
value: res.result.projectEnterprise.longitude ? res.result.projectEnterprise.longitude:"",
value2: res.result.projectEnterprise.projectTypeName?res.result.projectEnterprise.projectTypeName:"",
value: res.result.projectEnterprise.longitude
? res.result.projectEnterprise.longitude
: "",
value2: res.result.projectEnterprise.projectTypeName
? res.result.projectEnterprise.projectTypeName
: "",
},
{
fieldName: "项目编号",
fieldName2: "结构类型",
value: res.result.projectEnterprise.projectNumber ? res.result.projectEnterprise.projectNumber:"",
value2: res.result.projectEnterprise.structureTypeName ? res.result.projectEnterprise.structureTypeName:"",
value: res.result.projectEnterprise.projectNumber
? res.result.projectEnterprise.projectNumber
: "",
value2: res.result.projectEnterprise.structureTypeName
? res.result.projectEnterprise.structureTypeName
: "",
},
{
fieldName: "项目面积(m²)",
fieldName2: "工程状态",
value: res.result.projectEnterprise.projectAcreage ? res.result.projectEnterprise.projectAcreage:"",
value2: this.$t('message.companyDiagram.BUILDSTATUS')[res.result.projectEnterprise.bulidStatus].name,
value: res.result.projectEnterprise.projectAcreage
? res.result.projectEnterprise.projectAcreage
: "",
value2: this.$t("message.companyDiagram.BUILDSTATUS")[
res.result.projectEnterprise.bulidStatus
].name,
},
{
fieldName: "开工日期",
fieldName2: "竣工日期",
value: res.result.projectEnterprise.startWorkDate?res.result.projectEnterprise.startWorkDate:"",
value2: res.result.projectEnterprise.completionDate ? res.result.projectEnterprise.completionDate :"",
value: res.result.projectEnterprise.startWorkDate
? res.result.projectEnterprise.startWorkDate
: "",
value2: res.result.projectEnterprise.completionDate
? res.result.projectEnterprise.completionDate
: "",
},
{
fieldName: "现场布置图",
fieldName2: "现场施工图",
value: res.result.projectEnterprise.layoutImage && JSON.parse(res.result.projectEnterprise.layoutImage) instanceof Array && JSON.parse(res.result.projectEnterprise.layoutImage).length > 0? JSON.parse(res.result.projectEnterprise.layoutImage).map(item => {
return {
name: item.name,
url: this.$store.state.FILEURL + item.url,
}
}) :"",
value2: res.result.projectEnterprise.constructionMapUrl && JSON.parse(res.result.projectEnterprise.constructionMapUrl) instanceof Array && JSON.parse(res.result.projectEnterprise.constructionMapUrl).length > 0 ? JSON.parse(res.result.projectEnterprise.constructionMapUrl).map(item => {
return {
name: item.name,
url: this.$store.state.FILEURL + item.url,
}
}):"",
value:
res.result.projectEnterprise.layoutImage &&
JSON.parse(res.result.projectEnterprise.layoutImage) instanceof
Array &&
JSON.parse(res.result.projectEnterprise.layoutImage).length > 0
? JSON.parse(res.result.projectEnterprise.layoutImage).map(
(item) => {
return {
name: item.name,
url: this.$store.state.FILEURL + item.url,
};
}
)
: "",
value2:
res.result.projectEnterprise.constructionMapUrl &&
JSON.parse(
res.result.projectEnterprise.constructionMapUrl
) instanceof Array &&
JSON.parse(res.result.projectEnterprise.constructionMapUrl)
.length > 0
? JSON.parse(
res.result.projectEnterprise.constructionMapUrl
).map((item) => {
return {
name: item.name,
url: this.$store.state.FILEURL + item.url,
};
})
: "",
},
{
fieldName: "联系电话",
value: res.result.projectEnterprise.projectTel?res.result.projectEnterprise.projectTel:"",
value: res.result.projectEnterprise.projectTel
? res.result.projectEnterprise.projectTel
: "",
},
];
this.infoEnterpriseId = res.result.id;
// this.getDataDateils();
console.log(this.enterpriseInfo,666777888)
console.log(this.enterpriseInfo, 666777888);
}
});
},
@ -652,20 +757,34 @@ export default {
getQueryById() {
let data = {
// enterpriseId: this.$props.projectEnterpriseId,
enterpriseId: this.infoEnterpriseId
enterpriseId: this.infoEnterpriseId,
};
getQueryByIdListApi(data).then((res) => {
if (res.code == 200) {
this.qualificationList = res.result;
this.qualificationList.map(item => {
// console.log(22222222, res.result)
this.qualificationList = res.result.map((item) => {
// console.log(!item.fileUrl.includes(this.$store.state.FILEURL))
if (!item.fileUrl.includes(this.$store.state.FILEURL)) {
if(item.fileUrl.includes("name")){
// console.log(item.fileUrl.includes("name"))
const imageType = [ '.jpg','.png', '.jpeg']
if (item.fileUrl.includes("name")) {
const name = JSON.parse(item.fileUrl)[0].name;
const type = name.substring(name.indexOf('.'),name.length);
console.log(type)
item.flag = imageType.includes(type);
console.log(item.flag)
item.fileNameNew = name;
item.fileUrl = this.$store.state.FILEURL + JSON.parse(item.fileUrl)[0].url;
// // this.$set(item, "fileNameNew", JSON.parse(item.fileUrl)[0].name)
} else {
item.fileUrl = this.$store.state.FILEURL + item.fileUrl;
}
}
})
return {
...item
}
});
// console.log(111111111, this.qualificationList)
}
});
},
@ -674,6 +793,7 @@ export default {
// type 1 2
if (type === 1) {
this.qualificationDialog = true;
this.fileList = [];
this.$nextTick(() => {
this.$refs.qualificationForm.resetFields();
});
@ -687,18 +807,18 @@ export default {
//
addQualification() {
this.$refs.qualificationForm.validate((valid) => {
console.log('新增的参数',this.qualificationForm);
console.log("新增的参数", this.qualificationForm);
if (valid) {
let data = this.qualificationForm;
// (data.enterpriseId = this.$props.projectEnterpriseId),
data.enterpriseId = this.infoEnterpriseId;
addEnterpriseQualification(data).then((res) => {
// console.log('',res)
this.getQueryById();
this.$refs.upload.clearFiles();
this.fileList = [];
this.$refs.qualificationForm.resetFields();
});
addEnterpriseQualification(data).then((res) => {
// console.log('',res)
this.getQueryById();
this.$refs.upload.clearFiles();
this.fileList = [];
this.$refs.qualificationForm.resetFields();
});
this.qualificationDialog = false;
} else {
console.log("error submit!!");
@ -743,8 +863,13 @@ export default {
},
//
handleSuccess(file) {
console.log('上传成功放回的值',file)
let data = { name: file.data[0].filename, url: file.data[0].imageUrl };
console.log("上传成功放回的值", file);
let data = {
name: file.data[0].fileInfo.originalFilename
? file.data[0].fileInfo.originalFilename
: file.data[0].filename,
url: file.data[0].imageUrl,
};
// let data = { name: file.data[0].fileInfo.attr.originalFilename, url: file.data[0].imageUrl };
this.fileList.push(data);
this.qualificationForm.fileUrl =
@ -765,20 +890,20 @@ export default {
},
//
handleBeforeUpload(file) {
var img = file.name.substring(file.name.lastIndexOf('.') + 1)
const suffix = img === 'jpg'
const suffix2 = img === 'png'
const suffix3 = img === 'jpeg'
const isLt1M = file.size / 1024 / 1024 < 1;
if (!suffix && !suffix2 && !suffix3) {
this.$message.error("只能上传图片!");
return false
}
//
if (!isLt1M) {
this.$message.error('上传图片大小不能超过 1MB!');
}
return suffix || suffix2 || suffix3
// var img = file.name.substring(file.name.lastIndexOf('.') + 1)
// const suffix = img === 'jpg'
// const suffix2 = img === 'png'
// const suffix3 = img === 'jpeg'
// const isLt1M = file.size / 1024 / 1024 < 1;
// if (!suffix && !suffix2 && !suffix3) {
// this.$message.error("");
// return false
// }
// //
// if (!isLt1M) {
// this.$message.error(' 1MB!');
// }
// return suffix || suffix2 || suffix3
},
//
@ -792,20 +917,20 @@ export default {
showArr.push(this.fileUrl + showUrl);
}
return showArr;
} else if(type == 2) {
} else if (type == 2) {
let arr = JSON.parse(url);
// this.matchResult = arr.match("(.+?).(png|jpg|gif)");
// console.log('this.matchResult',this.matchResult)
// arr = arr.split(",");
let showArr = [];
showArr = arr.map((item)=>{
let showUrl = item.url
let showArray = []
showArr = arr.map((item) => {
let showUrl = item.url;
let showArray = [];
showArray.push(this.fileUrl + showUrl);
return showArray
})
return showArray;
});
return showArr;
// for (let i = 0; i < arr.length; i++) {
// let showUrl = arr[i].url;
// // showArr.push(this.fileUrl + showUrl);
@ -817,7 +942,6 @@ export default {
// }
// }
// console.log('showArr',showArr)
}
},
@ -830,6 +954,9 @@ export default {
};
</script>
<style lang="less" scoped>
.pageDataContainer {
overflow: initial;
}
.el-menu--horizontal > .el-menu-item {
height: 40px;
line-height: 40px;
@ -885,4 +1012,4 @@ export default {
margin-top: -20px;
margin-bottom: 10px;
}
</style>
</style>