williamet/cas_cloud_admin_i18n
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
quantulr
2023-12-11 15:25:14 +08:00
parent 62b38cbefb
commit 14c8ee028a
7 changed files with 405 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/ImagePreview/index.vue
View File

@ -8,14 +8,17 @@
> >
<template #error> <template #error>
<div class="image-slot"> <div class="image-slot">
<el-icon><picture-filled /></el-icon> <el-icon>
<picture-filled/>
</el-icon>
</div> </div>
</template> </template>
</el-image> </el-image>
</template> </template>
<script setup> <script setup>
import { isExternal } from "@/utils/validate"; import {isExternal} from "@/utils/validate";
import {resolveStaticUrl} from "@/utils/uri";
const props = defineProps({ const props = defineProps({
src: { src: {
@ -37,7 +40,7 @@ const realSrc = computed(() => {
if (isExternal(real_src)) { if (isExternal(real_src)) {
return real_src; return real_src;
} }
return import.meta.env.VITE_APP_BASE_API + real_src; return resolveStaticUrl(real_src)
}); });
const realSrcList = computed(() => { const realSrcList = computed(() => {
@ -47,7 +50,7 @@ const realSrcList = computed(() => {
if (isExternal(item)) { if (isExternal(item)) {
return srcList.push(item); return srcList.push(item);
} }
return srcList.push(import.meta.env.VITE_APP_BASE_API + item); return srcList.push(resolveStaticUrl(item));
}); });
return srcList; return srcList;
}); });
@ -66,13 +69,16 @@ const realHeight = computed(() =>
border-radius: 5px; border-radius: 5px;
background-color: #ebeef5; background-color: #ebeef5;
box-shadow: 0 0 5px 1px #ccc; box-shadow: 0 0 5px 1px #ccc;
:deep(.el-image__inner) { :deep(.el-image__inner) {
transition: all 0.3s; transition: all 0.3s;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
transform: scale(1.2); transform: scale(1.2);
} }
} }
:deep(.image-slot) { :deep(.image-slot) {
display: flex; display: flex;
justify-content: center; justify-content: center;

22
src/store/modules/user.js
View File

@ -1,18 +1,18 @@
import { getInfo, login, logout } from "@/api/login"; import {getInfo, login, logout} from "@/api/login";
import { getToken, removeToken, setToken } from "@/utils/auth"; import {getToken, removeToken, setToken} from "@/utils/auth";
import defAva from "@/assets/images/profile.jpg"; import defAva from "@/assets/images/profile.jpg";
import md5 from "js-md5"; import md5 from "js-md5";
import { companyList } from "@/api/dataList/enterprise"; import {companyList} from "@/api/dataList/enterprise";
import { expertList } from "@/api/expert/expert"; import {expertList} from "@/api/expert/expert";
import { listCasDemand } from "../../api/dataApproval/enterpriseServiceDemand"; import {listCasDemand} from "../../api/dataApproval/enterpriseServiceDemand";
import { expertAchievementList } from "../../api/dataApproval/achivement"; import {expertAchievementList} from "../../api/dataApproval/achivement";
import { businessList } from "../../api/Businessneeds"; import {businessList} from "../../api/Businessneeds";
import { enterpriseProductApprovalList } from "../../api/dataApproval/enterpriseProduct"; import {enterpriseProductApprovalList} from "../../api/dataApproval/enterpriseProduct";
import { import {
getUnApprovalCount, getUnApprovalCount,
resetUnApprovalCount, resetUnApprovalCount,
} from "../../api/dataApproval/count"; } from "../../api/dataApproval/count";
import { casLaboratoryList } from "@/api/dataList/laboratory"; import {casLaboratoryList} from "@/api/dataList/laboratory";
const useUserStore = defineStore("user", { const useUserStore = defineStore("user", {
state: () => ({ state: () => ({
@ -59,9 +59,9 @@ const useUserStore = defineStore("user", {
.then((res) => { .then((res) => {
const user = res.user; const user = res.user;
const avatar = const avatar =
/* user.avatar == "" || user.avatar == null !user.avatar
? defAva ? defAva
: import.meta.env.VITE_APP_BASE_API + */user.avatar; : import.meta.env.VITE_APP_BASE_API + user.avatar.substring(user.avatar.indexOf("/file"));
if (res.roles && res.roles.length > 0) { if (res.roles && res.roles.length > 0) {
// 验证返回的roles是否是一个非空数组 // 验证返回的roles是否是一个非空数组

9
src/utils/uri.js Normal file
View File

@ -0,0 +1,9 @@
export const resolveStaticUrl = (url) => {
const fileIndex = url.indexOf('/file')
if (fileIndex > 0) {
return `${import.meta.env.VITE_APP_BASE_API}/${url.substring(fileIndex)}`
} else {
return `${import.meta.env.VITE_APP_BASE_API}/file${url}`
}
}

63
src/views/website/siteSet/banner/index.vue
View File

@ -50,10 +50,12 @@
icon="search" icon="search"
size="default" size="default"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索
</el-button
> >
<el-button icon="refresh" size="default" @click="resetQuery" <el-button icon="refresh" size="default" @click="resetQuery"
>重置</el-button >重置
</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -66,7 +68,8 @@
icon="plus" icon="plus"
size="default" size="default"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增
</el-button
> >
</el-col> </el-col>
<right-toolbar <right-toolbar
@ -76,9 +79,9 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="dataList"> <el-table v-loading="loading" :data="dataList">
<el-table-column label="数据编号" prop="id" align="center" /> <el-table-column label="数据编号" prop="id" align="center"/>
<el-table-column label="banner图名称" prop="title" align="center" /> <el-table-column label="banner图名称" prop="title" align="center"/>
<el-table-column label="所在位置" prop="locals" align="center" /> <el-table-column label="所在位置" prop="locals" align="center"/>
<el-table-column label="是否显示多图" align="center"> <el-table-column label="是否显示多图" align="center">
<template #default="{ row }"> <template #default="{ row }">
{{ row.multipleFlag === "1" ? "是" : "否" }} {{ row.multipleFlag === "1" ? "是" : "否" }}
@ -86,10 +89,11 @@
</el-table-column> </el-table-column>
<el-table-column label="图片" prop="images" align="center"> <el-table-column label="图片" prop="images" align="center">
<template #default="{ row }"> <template #default="{ row }">
<ImagePreview :width="50" :height="50" :src="row.images" /> <ImagePreview :width="50" :height="50"
:src="row.images"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="建议上传图片尺寸" prop="sizes" align="center" /> <el-table-column label="建议上传图片尺寸" prop="sizes" align="center"/>
<el-table-column label="所属站点" prop="area" align="center"> <el-table-column label="所属站点" prop="area" align="center">
<template #default="{ row }"> <template #default="{ row }">
{{ siteList.find((el) => el.id === row.tenantId)?.name || "无" }} {{ siteList.find((el) => el.id === row.tenantId)?.name || "无" }}
@ -111,14 +115,16 @@
type="text" type="text"
icon="edit" icon="edit"
@click="handleUpdate(row)" @click="handleUpdate(row)"
>编辑</el-button >编辑
</el-button
> >
<el-button <el-button
size="small" size="small"
type="text" type="text"
icon="delete" icon="delete"
@click="handleDelete(row)" @click="handleDelete(row)"
>删除</el-button >删除
</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
@ -163,7 +169,8 @@
style="margin-left: 15px" style="margin-left: 15px"
@click="addDomain" @click="addDomain"
v-if="form.domains ? (form.domains.length ? false : true) : false" v-if="form.domains ? (form.domains.length ? false : true) : false"
>添加子节点</el-button >添加子节点
</el-button
> >
</div> </div>
</el-form-item> </el-form-item>
@ -183,24 +190,26 @@
<el-button <el-button
style="margin-left: 30px" style="margin-left: 30px"
@click.prevent="removeDomain(domain)" @click.prevent="removeDomain(domain)"
>删除</el-button >删除
</el-button
> >
<el-button <el-button
v-if="index + 1 == form.domains.length" v-if="index + 1 == form.domains.length"
type="primary" type="primary"
@click="addDomain" @click="addDomain"
>添加</el-button >添加
</el-button
> >
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="图片名称:" prop="title"> <el-form-item label="图片名称:" prop="title">
<el-input v-model="form.title" placeholder="请输入banner图名称" /> <el-input v-model="form.title" placeholder="请输入banner图名称"/>
</el-form-item> </el-form-item>
<el-form-item label="建议尺寸:" prop="sizes"> <el-form-item label="建议尺寸:" prop="sizes">
<el-input v-model="form.sizes" placeholder="请输入图片建议尺寸" /> <el-input v-model="form.sizes" placeholder="请输入图片建议尺寸"/>
</el-form-item> </el-form-item>
<el-form-item label="图片:" prop="images"> <el-form-item label="图片:" prop="images">
<ImageUpload v-model="form.images" :isShowTip="false" :limit="2" /> <ImageUpload v-model="form.images" :isShowTip="false" :limit="2"/>
</el-form-item> </el-form-item>
<el-form-item label="显示多张:" prop="multipleFlag"> <el-form-item label="显示多张:" prop="multipleFlag">
<el-radio v-model="form.multipleFlag" label="1">是</el-radio> <el-radio v-model="form.multipleFlag" label="1">是</el-radio>
@ -223,9 +232,10 @@ import {
bannerEdit, bannerEdit,
bannerDelete, bannerDelete,
} from "@/api/website/siteSet"; } from "@/api/website/siteSet";
import { tenantSelect } from "@/api/subPlatform/tenant"; import {tenantSelect} from "@/api/subPlatform/tenant";
import { reactive, toRefs } from "vue"; import {reactive, toRefs} from "vue";
import { ElMessage, ElMessageBox } from "element-plus"; import {ElMessage, ElMessageBox} from "element-plus";
import {resolveStaticUrl} from "@/utils/uri";
const loading = ref(true); // 是否正在加载 const loading = ref(true); // 是否正在加载
const showSearch = ref(true); // 是否显示搜索栏 const showSearch = ref(true); // 是否显示搜索栏
@ -258,9 +268,9 @@ const data = reactive({
trigger: ["blur", "change"], trigger: ["blur", "change"],
}, },
], ],
local: [{ required: true, message: "所在位置不能为空", trigger: "change" }], local: [{required: true, message: "所在位置不能为空", trigger: "change"}],
title: [{ required: true, message: "数据名称不能为空", trigger: "blur" }], title: [{required: true, message: "数据名称不能为空", trigger: "blur"}],
sizes: [{ required: true, message: "建议尺寸不能为空", trigger: "blur" }], // sizes: [{required: true, message: "建议尺寸不能为空", trigger: "blur"}],
images: [ images: [
{ {
required: true, required: true,
@ -270,14 +280,14 @@ const data = reactive({
], ],
}, },
}); });
const { queryParams, form, rules } = toRefs(data); const {queryParams, form, rules} = toRefs(data);
const filterLocal = (data, parentTitle, out) => { const filterLocal = (data, parentTitle, out) => {
data.forEach((item) => { data.forEach((item) => {
let title = item.title; let title = item.title;
if (parentTitle != "") title = parentTitle + ">" + item.title; if (parentTitle != "") title = parentTitle + ">" + item.title;
out.push({ title: title }); out.push({title: title});
if (item.children && item.children.length > 0) { if (item.children && item.children.length > 0) {
this.filterLocal(item.children, title, out); this.filterLocal(item.children, title, out);
@ -377,7 +387,7 @@ const handleUpdate = (row) => {
// form.value.local = arr[0]; // form.value.local = arr[0];
form.value.locals = arr[0]; form.value.locals = arr[0];
for (let i = 1; i < arr.length; i++) { for (let i = 1; i < arr.length; i++) {
form.value.domains.push({ title: arr[i] }); form.value.domains.push({title: arr[i]});
} }
showEditDialog.value = true; showEditDialog.value = true;
title.value = "修改"; title.value = "修改";
@ -411,7 +421,8 @@ const handleDelete = (row) => {
getList(); getList();
ElMessage.success("删除成功"); ElMessage.success("删除成功");
}) })
.catch(() => {}); .catch(() => {
});
}; };
getList(); getList();
getSiteList(); getSiteList();

53
src/views/website/solution/service/index.vue
View File

@ -43,7 +43,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所属站点" prop="tenantId"> <el-form-item label="所属站点" prop="tenantId">
<SiteOptions v-model="queryParams.tenantId" :site-list="siteList" /> <SiteOptions v-model="queryParams.tenantId" :site-list="siteList"/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
@ -51,10 +51,12 @@
icon="search" icon="search"
size="default" size="default"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索
</el-button
> >
<el-button icon="refresh" size="default" @click="resetQuery" <el-button icon="refresh" size="default" @click="resetQuery"
>重置</el-button >重置
</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -67,7 +69,8 @@
icon="plus" icon="plus"
size="default" size="default"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增
</el-button
> >
</el-col> </el-col>
<right-toolbar <right-toolbar
@ -77,14 +80,14 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="dataList"> <el-table v-loading="loading" :data="dataList">
<el-table-column label="数据编号" prop="id" align="center" /> <el-table-column label="数据编号" prop="id" align="center"/>
<el-table-column label="数据名称" prop="title" width="120" /> <el-table-column label="数据名称" prop="title" width="120"/>
<el-table-column label="图片" align="center" width="120"> <el-table-column label="图片" align="center" width="120">
<template #default="{ row }"> <template #default="{ row }">
<div> <div>
<el-image <el-image
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
:src="row.image" :src="resolveStaticUrl(row.image)"
fit="cover" fit="cover"
></el-image> ></el-image>
</div> </div>
@ -117,14 +120,16 @@
type="text" type="text"
icon="edit" icon="edit"
@click="handleUpdate(row)" @click="handleUpdate(row)"
>编辑</el-button >编辑
</el-button
> >
<el-button <el-button
size="small" size="small"
type="text" type="text"
icon="delete" icon="delete"
@click="handleDelete(row)" @click="handleDelete(row)"
>删除</el-button >删除
</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
@ -142,10 +147,10 @@
<el-dialog :title="title" v-model="showEditDialog" width="500px"> <el-dialog :title="title" v-model="showEditDialog" width="500px">
<el-form ref="formRef" :model="form" :rules="rules" label-width="100px"> <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="数据名称:" prop="title"> <el-form-item label="数据名称:" prop="title">
<el-input v-model="form.title" placeholder="请输入数据名称" /> <el-input v-model="form.title" placeholder="请输入数据名称"/>
</el-form-item> </el-form-item>
<el-form-item label="所属站点:" prop="tenantId"> <el-form-item label="所属站点:" prop="tenantId">
<SiteOptions v-model="form.tenantId" :site-list="siteList" /> <SiteOptions v-model="form.tenantId" :site-list="siteList"/>
</el-form-item> </el-form-item>
<el-form-item label="归属导航:" prop="mode"> <el-form-item label="归属导航:" prop="mode">
<el-select v-model="form.mode" placeholder="请选择"> <el-select v-model="form.mode" placeholder="请选择">
@ -174,7 +179,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="图片:" prop="image"> <el-form-item label="图片:" prop="image">
<ImageUpload v-model="form.image" :isShowTip="false" :limit="1" /> <ImageUpload v-model="form.image" :isShowTip="false" :limit="1"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="关联案例:" prop="name"> <!-- <el-form-item label="关联案例:" prop="name">
<el-cascader <el-cascader
@ -196,7 +201,7 @@
</div> </div>
</template> </template>
<script setup name="Service"> <script setup name="Service">
import { reactive, ref, toRefs } from "vue"; import {reactive, ref, toRefs} from "vue";
import { import {
serviceList, serviceList,
serviceAdd, serviceAdd,
@ -210,10 +215,11 @@ import {
planCategoryDetail, planCategoryDetail,
planCategoryUpdate, planCategoryUpdate,
} from "@/api/website/solution"; } from "@/api/website/solution";
import { tenantSelect } from "@/api/subPlatform/tenant"; import {tenantSelect} from "@/api/subPlatform/tenant";
import { ElMessage, ElMessageBox } from "element-plus"; import {ElMessage, ElMessageBox} from "element-plus";
import { cloneDeep } from "lodash"; import {cloneDeep} from "lodash";
import SiteOptions from "@/views/components/SiteOptions"; import SiteOptions from "@/views/components/SiteOptions";
import {resolveStaticUrl} from "@/utils/uri";
const dataList = ref([]); const dataList = ref([]);
// TODO:isSuper // TODO:isSuper
@ -247,7 +253,7 @@ const total = ref(0);
const data = reactive({ const data = reactive({
form: {}, form: {},
rules: { rules: {
title: [{ required: true, message: "数据名称不能为空", trigger: "blur" }], title: [{required: true, message: "数据名称不能为空", trigger: "blur"}],
tenantId: [ tenantId: [
{ {
required: true, required: true,
@ -270,7 +276,7 @@ const data = reactive({
}, },
], ],
description: [ description: [
{ required: true, message: "服务介绍不能为空", trigger: "blur" }, {required: true, message: "服务介绍不能为空", trigger: "blur"},
], ],
}, },
queryParams: { queryParams: {
@ -282,7 +288,7 @@ const data = reactive({
}, },
}); });
const { queryParams, form, rules } = toRefs(data); const {queryParams, form, rules} = toRefs(data);
const resetQuery = () => { const resetQuery = () => {
if (queryFormRef.value) { if (queryFormRef.value) {
@ -307,7 +313,7 @@ const getList = async () => {
// 获取站点列表 // 获取站点列表
const getSiteList = async () => { const getSiteList = async () => {
const { rows } = await tenantSelect(); const {rows} = await tenantSelect();
siteList.value = rows; siteList.value = rows;
}; };
// 取消按钮 // 取消按钮
@ -332,9 +338,9 @@ const reset = () => {
}; };
const categoryList = ref([]); const categoryList = ref([]);
const getPlanCategoryList = async () => { const getPlanCategoryList = async () => {
const { data } = await planCategoryList(); const {data} = await planCategoryList();
categoryList.value = data.map((el) => { categoryList.value = data.map((el) => {
return { ...el, id: el.id.toString() }; return {...el, id: el.id.toString()};
}); });
}; };
getPlanCategoryList(); getPlanCategoryList();
@ -377,7 +383,8 @@ const handleDelete = (row) => {
getList(); getList();
ElMessage.success("删除成功"); ElMessage.success("删除成功");
}) })
.catch(() => {}); .catch(() => {
});
}; };
getList(); getList();

3
src/views/website/solution/serviceCase/index.vue
View File

@ -63,7 +63,7 @@
<div> <div>
<el-image <el-image
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
:src="row.image" :src="resolveStaticUrl(row.image)"
fit="cover" fit="cover"
></el-image> ></el-image>
</div> </div>
@ -185,6 +185,7 @@ import {
import WangEditor from "@/components/WangEditor/index.vue"; import WangEditor from "@/components/WangEditor/index.vue";
import SiteOptions from "@/views/components/SiteOptions"; import SiteOptions from "@/views/components/SiteOptions";
import {planCategoryList} from "../../../../api/website/solution"; import {planCategoryList} from "../../../../api/website/solution";
import {resolveStaticUrl} from "@/utils/uri";
const dataList = ref([]); const dataList = ref([]);
const loading = ref(true); const loading = ref(true);

2
vite.config.js
View File

@ -32,7 +32,7 @@ export default defineConfig(({ mode, command }) => {
// https://cn.vitejs.dev/config/#server-proxy // https://cn.vitejs.dev/config/#server-proxy
"/dev-api": { "/dev-api": {
// target: "http://192.168.110.10:1618", // target: "http://192.168.110.10:1618",
target: 'http://101.34.131.16:81/api', target: 'http://119.45.197.174:81/api',
// target: "http://101.34.251.155:81/api", // target: "http://101.34.251.155:81/api",
changeOrigin: true, changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, ""), rewrite: (p) => p.replace(/^\/dev-api/, ""),