usa样式修改
continuous-integration/drone/push Build is failing Details

main
wangxiaoshuang 2025-04-17 16:04:31 +08:00
parent 1e45537adc
commit ec9be3ceae
5 changed files with 41 additions and 40 deletions

View File

@ -46,4 +46,4 @@ VUE_APP_OSS_CONFIG_REGION = 'oss-cn-shanghai'
VUE_APP_OSS_CONFIG_BUCKET = 'zyypacs'
VUE_APP_OSS_PATH = '/test/dist'
VUE_APP_OSS_PATH = /hir_test/dist

View File

@ -2,7 +2,7 @@
"name": "HICS",
"version": "1.0.0",
"scripts": {
"dev": "vue-cli-service serve --open",
"dev": "vue-cli-service serve --open --mode development",
"build": "vue-cli-service build",
"build:prod": "vue-cli-service build --mode prod",
"build:uat": "vue-cli-service build --mode uat",

View File

@ -1,21 +1,9 @@
<template>
<div class="notice-marquee_wrapper">
<marquee
ref="mar"
hspace="0"
direction="left"
width="500"
@mouseout="start()"
@mouseover="stop()"
>
<marquee ref="mar" hspace="0" direction="left" :width="isEN ? '400' : '500'" @mouseout="start()" @mouseover="stop()">
<!-- <i class="el-icon-message-solid" /> -->
<svg-icon v-if="noticeList.length > 0" icon-class="speaker" />
<span
v-for="item in noticeList"
:key="item.Id"
style="cursor: pointer"
@click="showDetail(item)"
>
<span v-for="item in noticeList" :key="item.Id" style="cursor: pointer" @click="showDetail(item)">
{{ item.Content }}
</span>
</marquee>
@ -35,6 +23,9 @@ export default {
noticeList() {
return this.$store.state.global.noticeList || [];
},
isEN() {
return this.$i18n.locale !== 'zh'
}
},
mounted() {
this.getDicData();
@ -119,12 +110,15 @@ export default {
.notice-marquee_wrapper {
display: flex;
align-items: center;
span {
font-size: 20px;
}
>>>.el-dialog__header {
padding: 10px;
}
>>>.el-dialog__body {
padding: 10px 20px;
line-height: 25px;

View File

@ -3,7 +3,7 @@
<div class="leftMenu">
<!-- <img v-if="language === 'zh' && hospital.HospitalLogoPath" -->
<img v-if="hospital.HospitalLogoPath" :src="OSSclientConfig.basePath + hospital.HospitalLogoPath"
crossOrigin="anonymous" alt="" style="min-width: 170px;" />
crossOrigin="anonymous" alt="" style="min-width: 170px;" :class="{ img_en: isEN }" />
<div v-else style="width: 170px;"></div>
<!-- <img v-else src="@/assets/zzlogo3.png" alt="" /> -->
<span style="white-space: nowrap">
@ -126,6 +126,9 @@ export default {
},
isDev() {
return process.env.VUE_APP_OSS_PATH === "/hir_test/dist"
},
isEN() {
return this.$i18n.locale !== 'zh'
}
},
watch: {
@ -309,6 +312,10 @@ export default {
margin-right: 10px;
}
.img_en {
height: 60px;
}
span {
font-size: 20px;
position: relative;

View File

@ -18,7 +18,7 @@ const name = defaultSettings.title || 'HIRS' // page title
// eslint-disable-next-line no-undef
module.exports = {
transpileDependencies: ['minio'],
publicPath: process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? process.env.VUE_APP_BASE_PATH : `${process.env.VUE_FILE_PATH}${process.env.VUE_APP_OSS_PATH}${distDate}/`,
publicPath: process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'usa' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-uat' ? process.env.VUE_APP_BASE_PATH : `${process.env.VUE_FILE_PATH}${process.env.VUE_APP_OSS_PATH}${distDate}/`,
outputDir: 'dist',
assetsDir: 'static',
productionSourceMap: false,
@ -94,7 +94,7 @@ module.exports = {
ignore: ['.*']
}
]),
process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function() {}
process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'usa' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-uat' ? function () { }
: new WebpackAliyunOss({
from: ['./dist/**'],
dist: process.env.VUE_APP_OSS_PATH + distDate,