Commit 8546bd23 authored by “yiyousong”'s avatar “yiyousong”

pref:修改图片显示

parent a5562f8d
#开发环境 #开发环境
NODE_ENV = "development" NODE_ENV = "development"
#VUE_APP_API_BASE_URL=http://192.168.0.98:11078 VUE_APP_API_BASE_URL=http://192.168.0.98:11078
VUE_APP_API_BASE_URL=http://10.12.185.213:11071 VUE_APP_API_IMG_URL=http://192.168.0.98:11078/
\ No newline at end of file #VUE_APP_API_BASE_URL=http://10.12.185.213:11071
\ No newline at end of file
...@@ -3,3 +3,4 @@ NODE_ENV = production ...@@ -3,3 +3,4 @@ NODE_ENV = production
VUE_APP_API_BASE_URL=/basics_api VUE_APP_API_BASE_URL=/basics_api
VUE_APP_API_portal_URL=/portal_home VUE_APP_API_portal_URL=/portal_home
VUE_APP_API_IMG_URL = /
...@@ -9,6 +9,7 @@ yarn-error.log* ...@@ -9,6 +9,7 @@ yarn-error.log*
/test/e2e/reports/ /test/e2e/reports/
selenium-debug.log selenium-debug.log
dist.zip dist.zip
基础设置系统.zip
# Editor directories and files # Editor directories and files
.idea .idea
.vscode .vscode
......
...@@ -15,7 +15,7 @@ export default { ...@@ -15,7 +15,7 @@ export default {
data() { data() {
return { return {
previewInfo: this.$route.query, previewInfo: this.$route.query,
previewUrl: "http://192.168.0.192:8082", previewUrl: "",
loading: true, loading: true,
}; };
}, },
......
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
<img <img
v-if="text.img" v-if="text.img"
width="50" width="50"
:src="api + text.img" :src="api2 + text.img"
@click="handlePreview('img', api + text.img)" @click="handlePreview('img', api2 + text.img)"
/> />
<span v-else>--</span> <span v-else>--</span>
</template> </template>
...@@ -76,8 +76,8 @@ ...@@ -76,8 +76,8 @@
<video <video
v-if="text.video" v-if="text.video"
width="50" width="50"
:src="api + text.video" :src="api2 + text.video"
@click="handlePreview('vidoe', api + text.video)" @click="handlePreview('vidoe', api2 + text.video)"
/> />
<span v-else>--</span> <span v-else>--</span>
</template> </template>
...@@ -128,6 +128,7 @@ export default { ...@@ -128,6 +128,7 @@ export default {
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_BASE_URL + "/",
api2: process.env.VUE_APP_API_IMG_URL,
appId: this.$route.query.id, appId: this.$route.query.id,
loading: false, loading: false,
current: 1, current: 1,
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
v-if="text.appIconPath" v-if="text.appIconPath"
height="20" height="20"
width="20" width="20"
:src="api + text.appIconPath" :src="api2 + text.appIconPath"
/> />
<span v-else>--</span> <span v-else>--</span>
</template> </template>
...@@ -172,6 +172,7 @@ export default { ...@@ -172,6 +172,7 @@ export default {
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_BASE_URL + "/",
api2: process.env.VUE_APP_API_IMG_URL,
columns, columns,
siteId: local.getLocal("siteId"), siteId: local.getLocal("siteId"),
tableData: [], // 表格数据 tableData: [], // 表格数据
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<img <img
class="icon" class="icon"
v-if="form.appIconPath" v-if="form.appIconPath"
:src="api + form.appIconPath" :src="api2 + form.appIconPath"
/> />
<div v-else> <div v-else>
<a-icon :type="loading ? 'loading' : 'plus'" /> <a-icon :type="loading ? 'loading' : 'plus'" />
...@@ -173,6 +173,7 @@ export default { ...@@ -173,6 +173,7 @@ export default {
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_BASE_URL + "/",
api2: process.env.VUE_APP_API_IMG_URL,
labelCol: { labelCol: {
span: 3, span: 3,
}, },
...@@ -273,7 +274,7 @@ export default { ...@@ -273,7 +274,7 @@ export default {
} }
}); });
}, },
// 图标删除之前 // 图标上传之前
iconBeforeUpload(file) { iconBeforeUpload(file) {
const isJpgOrPng = const isJpgOrPng =
file.type === "image/jpeg" || file.type === "image/png"; file.type === "image/jpeg" || file.type === "image/png";
...@@ -293,7 +294,6 @@ export default { ...@@ -293,7 +294,6 @@ export default {
return; return;
} }
if (info.file.status === "done") { if (info.file.status === "done") {
console.log(info);
this.form.appIconPath = info.file.response.url; this.form.appIconPath = info.file.response.url;
this.loading = false; this.loading = false;
} }
......
...@@ -54,11 +54,11 @@ ...@@ -54,11 +54,11 @@
<!-- 模块图标 --> <!-- 模块图标 -->
<template slot="modelIcon" slot-scope="text"> <template slot="modelIcon" slot-scope="text">
<div v-if="text.modelIcon"> <div v-if="text.modelIcon">
<div class="svg-box" v-if="isSvg(text.modelIcon)"> <!-- <div class="svg-box" v-if="isSvg(text.modelIcon)">
<img width="30" height="30" :src="api + text.modelIcon" /> <img width="30" height="30" :src="api2 + text.modelIcon" />
</div> </div> -->
<div class="svg-box" v-else> <div class="svg-box">
<img width="30" height="30" :src="api + text.modelIcon" /> <img width="30" height="30" :src="api2 + text.modelIcon" />
</div> </div>
</div> </div>
<span v-else>--</span> <span v-else>--</span>
...@@ -161,9 +161,7 @@ ...@@ -161,9 +161,7 @@
> >
<div v-if="fileList.length < 1"> <div v-if="fileList.length < 1">
<a-icon type="plus" /> <a-icon type="plus" />
<div class="ant-upload-text"> <div class="ant-upload-text">点击上传</div>
点击上传
</div>
</div> </div>
</a-upload> </a-upload>
...@@ -275,6 +273,7 @@ export default { ...@@ -275,6 +273,7 @@ export default {
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_BASE_URL + "/",
api2: process.env.VUE_APP_API_IMG_URL,
accept: "image/jpeg,image/png,image/svg+xml", // 上传类型 accept: "image/jpeg,image/png,image/svg+xml", // 上传类型
previewData: {}, // 预览 previewData: {}, // 预览
previewVisible: false, previewVisible: false,
...@@ -370,7 +369,7 @@ export default { ...@@ -370,7 +369,7 @@ export default {
uid: -1, uid: -1,
status: "done", status: "done",
name: this.formData.modelIcon, name: this.formData.modelIcon,
url: this.api + this.formData.modelIcon, url: this.api2 + this.formData.modelIcon,
url2: this.formData.modelIcon, url2: this.formData.modelIcon,
}, },
]; ];
...@@ -438,7 +437,7 @@ export default { ...@@ -438,7 +437,7 @@ export default {
this.fileList = this.fileList.map((v) => { this.fileList = this.fileList.map((v) => {
if (v.response) { if (v.response) {
v.url2 = v.response.url; v.url2 = v.response.url;
v.url = this.api + v.response.url; v.url = this.api2 + v.response.url;
} }
return v; return v;
}); });
...@@ -477,15 +476,15 @@ export default { ...@@ -477,15 +476,15 @@ export default {
this.handleReset(); this.handleReset();
}, },
// 图片类型 // 图片类型
isSvg(url) { // isSvg(url) {
let index = url.lastIndexOf("."); // let index = url.lastIndexOf(".");
let str = url.slice(index + 1); // let str = url.slice(index + 1);
if (str === "svg") { // if (str === "svg") {
return true; // return true;
} else { // } else {
return false; // return false;
} // }
}, // },
}, },
}; };
</script> </script>
......
...@@ -331,6 +331,7 @@ export default { ...@@ -331,6 +331,7 @@ export default {
}; };
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_BASE_URL + "/",
api2: process.env.VUE_APP_API_IMG_URL,
accept: "image/jpeg,image/png", // 上传类型 accept: "image/jpeg,image/png", // 上传类型
loading: false, loading: false,
previewData: {}, // 预览logo信息 previewData: {}, // 预览logo信息
...@@ -615,7 +616,7 @@ export default { ...@@ -615,7 +616,7 @@ export default {
uid: -1, uid: -1,
status: "done", status: "done",
name: this.formInfo.logoPath, name: this.formInfo.logoPath,
url: this.api + this.formInfo.logoPath, url: this.api2 + this.formInfo.logoPath,
url2: this.formInfo.logoPath, url2: this.formInfo.logoPath,
}, },
]; ];
...@@ -665,7 +666,7 @@ export default { ...@@ -665,7 +666,7 @@ export default {
this.fileList = this.fileList.map((v) => { this.fileList = this.fileList.map((v) => {
if (v.response) { if (v.response) {
v.url2 = v.response.url; v.url2 = v.response.url;
v.url = this.api + v.response.url; v.url = this.api2 + v.response.url;
} }
return v; return v;
}); });
...@@ -714,10 +715,8 @@ export default { ...@@ -714,10 +715,8 @@ export default {
}) })
.then((res) => { .then((res) => {
let { location } = res.geocodes[0]; let { location } = res.geocodes[0];
[ [this.formInfo.longitude, this.formInfo.latitude] =
this.formInfo.longitude, location.split(",");
this.formInfo.latitude,
] = location.split(",");
}) })
.catch(() => { .catch(() => {
this.$message.error("经纬度获取失败,请输入正确的地址"); this.$message.error("经纬度获取失败,请输入正确的地址");
......
...@@ -132,7 +132,7 @@ export default { ...@@ -132,7 +132,7 @@ export default {
}, },
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_IMG_URL,
}; };
}, },
methods: { methods: {
......
...@@ -158,7 +158,7 @@ export default { ...@@ -158,7 +158,7 @@ export default {
}, },
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_IMG_URL,
}; };
}, },
methods: { methods: {
......
...@@ -192,7 +192,7 @@ export default { ...@@ -192,7 +192,7 @@ export default {
}, },
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_IMG_URL,
}; };
}, },
methods: { methods: {
......
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
}, },
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_IMG_URL,
}; };
}, },
methods: { methods: {
......
...@@ -174,7 +174,7 @@ export default { ...@@ -174,7 +174,7 @@ export default {
}, },
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_IMG_URL,
}; };
}, },
methods: { methods: {
......
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
}, },
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_IMG_URL,
}; };
}, },
methods: { methods: {
......
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
}, },
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_IMG_URL,
}; };
}, },
methods: { methods: {
......
...@@ -186,7 +186,7 @@ export default { ...@@ -186,7 +186,7 @@ export default {
}, },
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_IMG_URL,
}; };
}, },
methods: { methods: {
......
...@@ -206,9 +206,7 @@ ...@@ -206,9 +206,7 @@
> >
<div v-if="fileList.length < 1"> <div v-if="fileList.length < 1">
<a-icon type="plus" /> <a-icon type="plus" />
<div class="ant-upload-text"> <div class="ant-upload-text">添加照片</div>
添加照片
</div>
</div> </div>
</a-upload> </a-upload>
<!-- <a-upload <!-- <a-upload
...@@ -389,6 +387,7 @@ export default { ...@@ -389,6 +387,7 @@ export default {
}; };
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_BASE_URL + "/",
api2: process.env.VUE_APP_API_IMG_URL,
accept: "image/jpeg,image/png", // 上传类型 accept: "image/jpeg,image/png", // 上传类型
previewData: {}, // 预览 previewData: {}, // 预览
previewVisible: false, previewVisible: false,
...@@ -521,7 +520,7 @@ export default { ...@@ -521,7 +520,7 @@ export default {
uid: -1, uid: -1,
status: "done", status: "done",
name: this.form.photoPath, name: this.form.photoPath,
url: this.api + this.form.photoPath, url: this.api2 + this.form.photoPath,
url2: this.form.photoPath, url2: this.form.photoPath,
}, },
]; ];
...@@ -544,7 +543,7 @@ export default { ...@@ -544,7 +543,7 @@ export default {
this.fileList = this.fileList.map((v) => { this.fileList = this.fileList.map((v) => {
if (v.response) { if (v.response) {
v.url2 = v.response.url; v.url2 = v.response.url;
v.url = this.api + v.response.url; v.url = this.api2 + v.response.url;
} }
return v; return v;
}); });
......
...@@ -212,9 +212,7 @@ ...@@ -212,9 +212,7 @@
> >
<div v-if="fileList.length < 1"> <div v-if="fileList.length < 1">
<a-icon type="plus" /> <a-icon type="plus" />
<div class="ant-upload-text"> <div class="ant-upload-text">添加照片</div>
添加照片
</div>
</div> </div>
<!-- <img <!-- <img
v-if="form.photoPath" v-if="form.photoPath"
...@@ -429,6 +427,7 @@ export default { ...@@ -429,6 +427,7 @@ export default {
}; };
return { return {
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_BASE_URL + "/",
api2: process.env.VUE_APP_API_IMG_URL,
accept: "image/jpeg,image/png", // 上传类型 accept: "image/jpeg,image/png", // 上传类型
previewData: {}, // 预览 previewData: {}, // 预览
previewVisible: false, previewVisible: false,
...@@ -575,7 +574,7 @@ export default { ...@@ -575,7 +574,7 @@ export default {
uid: -1, uid: -1,
status: "done", status: "done",
name: this.form.photoPath, name: this.form.photoPath,
url: this.api + this.form.photoPath, url: this.api2 + this.form.photoPath,
url2: this.form.photoPath, url2: this.form.photoPath,
}, },
]; ];
...@@ -594,7 +593,7 @@ export default { ...@@ -594,7 +593,7 @@ export default {
this.fileList = this.fileList.map((v) => { this.fileList = this.fileList.map((v) => {
if (v.response) { if (v.response) {
v.url2 = v.response.url; v.url2 = v.response.url;
v.url = this.api + v.response.url; v.url = this.api2 + v.response.url;
} }
return v; return v;
}); });
......
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
<template slot="pic" slot-scope="text"> <template slot="pic" slot-scope="text">
<img <img
v-if="text.photoPath" v-if="text.photoPath"
:src="api + text.photoPath" :src="api2 + text.photoPath"
class="pht" class="pht"
/> />
<span v-else>--</span> <span v-else>--</span>
...@@ -386,6 +386,7 @@ export default { ...@@ -386,6 +386,7 @@ export default {
visibleEditPwd: false, visibleEditPwd: false,
editVisible: false, editVisible: false,
api: process.env.VUE_APP_API_BASE_URL + "/", api: process.env.VUE_APP_API_BASE_URL + "/",
api2: process.env.VUE_APP_API_IMG_URL,
siteId: local.getLocal("siteId"), siteId: local.getLocal("siteId"),
deptData: [], // 部门数据 deptData: [], // 部门数据
windowData: [], // 窗口数据 windowData: [], // 窗口数据
......
...@@ -15,8 +15,8 @@ if (!isDev) { ...@@ -15,8 +15,8 @@ if (!isDev) {
events: { events: {
onEnd: { onEnd: {
mkdir: ["./dist"], mkdir: ["./dist"],
delete: ["./dist.zip"], delete: ["./基础设置系统.zip"],
archive: [{ source: "./dist", destination: "./dist.zip" }], archive: [{ source: "./dist", destination: "./基础设置系统.zip" }],
}, },
}, },
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment