zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

This commit is contained in:
caoqianming 2023-11-23 16:07:54 +08:00
parent 5d8621cac0 c073c25436
commit 0a4b380668
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/baseJson.json
View File

@ -16,7 +16,7 @@
}, },
"gz":{ "gz":{
"base": { "base": {
"base_name": "中建材光子科技有限公司", "base_name": "光子科技生产管理系统",
"base_logo": "/media/default/gz_logo.png", "base_logo": "/media/default/gz_logo.png",
"base_login_img":"/media/default/gz_login_img.png", "base_login_img":"/media/default/gz_login_img.png",
"base_name_short": "光子科技", "base_name_short": "光子科技",

BIN
src/utils/youShe.ttf Normal file
View File

Binary file not shown.

4
src/views/bigScreen/index_10dept.vue
View File

@ -543,10 +543,10 @@ export default {
<style scoped> <style scoped>
@font-face { @font-face {
font-family: 'myfont'; /* 字体名称 */ font-family: 'myfont'; /* 字体名称 */
src: url('../../style/youShe.ttf'); /* 字体文件相对路径 */ src: url('../../utils/youShe.ttf'); /* 字体文件相对路径 */
} }
.dashboard { .dashboard {
background-image: url("https://cdn-upload.datav.aliyun.com/upload/download/1678758744858-EWBrlDVf.jpg"); background-image: url("/public/img/photon_bg.png");
color: #fff; color: #fff;
font-family: "Microsoft Yahei" !important; font-family: "Microsoft Yahei" !important;
} }

4
src/views/bigScreen/index_6dept.vue
View File

@ -426,10 +426,10 @@ export default {
<style scoped> <style scoped>
@font-face { @font-face {
font-family: 'myfont'; /* 字体名称 */ font-family: 'myfont'; /* 字体名称 */
src: url('../../style/youShe.ttf'); /* 字体文件相对路径 */ src: url('../../utils/youShe.ttf'); /* 字体文件相对路径 */
} }
.dashboard { .dashboard {
background-image: url("https://cdn-upload.datav.aliyun.com/upload/download/1678758744858-EWBrlDVf.jpg"); background-image: url("/public/img/photon_bg.png");
color: #fff; color: #fff;
font-family: "Microsoft Yahei" !important; font-family: "Microsoft Yahei" !important;
} }

4
src/views/bigScreen/index_7dept.vue
View File

@ -440,10 +440,10 @@ export default {
<style scoped> <style scoped>
@font-face { @font-face {
font-family: 'myfont'; /* 字体名称 */ font-family: 'myfont'; /* 字体名称 */
src: url('../../style/youShe.ttf'); /* 字体文件相对路径 */ src: url('../../utils/youShe.ttf'); /* 字体文件相对路径 */
} }
.dashboard { .dashboard {
background-image: url("https://cdn-upload.datav.aliyun.com/upload/download/1678758744858-EWBrlDVf.jpg"); background-image: url("/public/img/photon_bg.png");
color: #fff; color: #fff;
font-family: "Microsoft Yahei" !important; font-family: "Microsoft Yahei" !important;
} }

4
src/views/bigScreen/index_photon.vue
View File

@ -2,7 +2,7 @@
<el-container class="container"> <el-container class="container">
<el-header class="pageHeader"> <el-header class="pageHeader">
<span class="top-line top-line-left"></span> <span class="top-line top-line-left"></span>
中建材光子科技有限公司 光子科技生产管理系统
<span class="top-line top-line-right"></span> <span class="top-line top-line-right"></span>
</el-header> </el-header>
<el-main style="padding:0;overflow: hidden;" id="mainBlock"> <el-main style="padding:0;overflow: hidden;" id="mainBlock">
@ -1319,7 +1319,7 @@ export default {
<style scoped> <style scoped>
@font-face { @font-face {
font-family: 'myfont'; /* 字体名称 */ font-family: 'myfont'; /* 字体名称 */
src: url('../../style/youShe.ttf'); /* 字体文件相对路径 */ src: url('../../utils/youShe.ttf'); /* 字体文件相对路径 */
} }
.container { .container {
background: url('/public/img/photon_bg.png') no-repeat; background: url('/public/img/photon_bg.png') no-repeat;

2
src/views/bigScreen/textIndex.vue
View File

@ -1276,7 +1276,7 @@ export default {
} */ } */
@font-face { @font-face {
font-family: 'myfont'; /* 字体名称 */ font-family: 'myfont'; /* 字体名称 */
src: url('../../style/youShe.ttf'); /* 字体文件相对路径 */ src: url('../../utils/youShe.ttf'); /* 字体文件相对路径 */
} }
.container { .container {
background: url('/public/img/photon_bg.png') no-repeat; background: url('/public/img/photon_bg.png') no-repeat;