FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yanyizhou
2021-11-22 14:58:06 +08:00
parent 1bd8be8d04 39a76c67f2
commit d835e88ac9
6 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+1 -1
View File
@@ -373,7 +373,7 @@ export default {
} }
.el-main { .el-main {
padding: 10px 10px 0 10px; padding: 15px 10px 0 10px;
} }
.content-box { .content-box {
display: flex; display: flex;
src/components/personalCenter/index.vue
+4 -14
View File
@@ -1,14 +1,5 @@
<template> <template>
<div class="header"> <div class="header">
<div style="background-color: #0068B7; height: 65px; width: 100%;">
<div class="header-left">
<div class="logo">
<img src="@/assets/images/shangqi/img/logo2.png" style="height: 61px; width: 160px;" />
</div>
</div>
<span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;">
标准法规管理系统 Standard and Regulation Management System
</span>
<!-- header头部 右侧内容 当前登录人和退出--> <!-- header头部 右侧内容 当前登录人和退出-->
<!-- <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">--> <!-- <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">-->
<!-- <div>--> <!-- <div>-->
@@ -55,7 +46,6 @@
<!-- </el-dropdown>--> <!-- </el-dropdown>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
</div>
</template> </template>
<script> <script>
@@ -128,10 +118,10 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.header { .header {
display: flex; //display: flex;
justify-content: space-between; //justify-content: space-between;
background-color: #171E4A; //background-color: #171E4A;
color: #fff; //color: #fff;
.header-left { .header-left {
float: left; float: left;
src/pages/home2/components/empennage/index.vue
+20 -11
View File
@@ -9,62 +9,62 @@
<div> <div>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<a style="color: #0068B7;" href="http://www.sac.gov.cn/">国标委</a> <a style="color: #0068B7;" href="http://www.sac.gov.cn/" target="_blank">国标委</a>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
<span class="borderMiddle"></span> <span class="borderMiddle"></span>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<a style="color: #0068B7;" href="http://www.catarc.org.cn/">汽标委</a> <a style="color: #0068B7;" href="http://www.catarc.org.cn/" target="_blank">汽标委</a>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
<span class="borderMiddle"></span> <span class="borderMiddle"></span>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<a style="color: #0068B7;" href="http://openstd.samr.gov.cn/bzgk/gb/index">国标全文公开</a> <a style="color: #0068B7;" href="http://openstd.samr.gov.cn/bzgk/gb/index" target="_blank">国标全文公开</a>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
<span class="borderMiddle"></span> <span class="borderMiddle"></span>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<a style="color: #0068B7;" href="http://std.samr.gov.cn/">全国标准信息公共服务</a> <a style="color: #0068B7;" href="http://std.samr.gov.cn/" target="_blank">全国标准信息公共服务</a>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
<span class="borderMiddle"></span> <span class="borderMiddle"></span>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<a style="color: #0068B7;" href="http://jtst.mot.gov.cn/">交通部标准信息</a> <a style="color: #0068B7;" href="http://jtst.mot.gov.cn/" target="_blank">交通部标准信息</a>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div> <div>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<a style="color: #0068B7;" href="https://www.un.org/zh/aboutun/structure/unece/">欧洲经济委员会</a> <a style="color: #0068B7;" href="https://www.un.org/zh/aboutun/structure/unece/" target="_blank">欧洲经济委员会</a>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
<span class="borderMiddle"></span> <span class="borderMiddle"></span>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<a style="color: #0068B7;" href="https://eur-lex.europa.eu">欧盟</a> <a style="color: #0068B7;" href="https://eur-lex.europa.eu" target="_blank">欧盟</a>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
<span class="borderMiddle"></span> <span class="borderMiddle"></span>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<a style="color: #0068B7;" href="https://www.interregs.com/">InterRegs </a> <a style="color: #0068B7;" href="https://www.interregs.com/" target="_blank">InterRegs </a>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
<span class="borderMiddle"></span> <span class="borderMiddle"></span>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<a style="color: #0068B7;" href="https://tbt.sist.org.cn/cslm/wtotbttb/">WTO/TBT通报</a> <a style="color: #0068B7;" href="https://tbt.sist.org.cn/cslm/wtotbttb/" target="_blank">WTO/TBT通报</a>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
<span class="borderMiddle"></span> <span class="borderMiddle"></span>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<a style="color: #0068B7;" href="https://www.iso.org/home.html">ISO</a> <a style="color: #0068B7;" href="https://www.iso.org/home.html" target="_blank">ISO</a>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -180,7 +180,7 @@
border-left: 2px dotted #aaa; border-left: 2px dotted #aaa;
} }
.title { .title {
padding-right: 50px; padding-right: 40px;
font-weight: bold; font-weight: bold;
padding-left: 40px; padding-left: 40px;
width: 80px; width: 80px;
@@ -189,6 +189,15 @@
cursor: pointer; cursor: pointer;
color: #0068B7; color: #0068B7;
} }
.el-col-4 {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
line-height: normal;
margin-top: 10px;
font-size: 5px;
}
} }
</style> </style>
src/pages/home2/components/searchGroup/index.vue
+1
View File
@@ -102,6 +102,7 @@ export default {
border-radius: 5px; border-radius: 5px;
::v-deep { ::v-deep {
.el-input__inner { .el-input__inner {
text-align: center;
width: 18vm; width: 18vm;
height: 40px; height: 40px;
color: #333333; color: #333333;
src/pages/home2/components/todoList/index.vue
+2 -2
View File
@@ -9,8 +9,8 @@
</div> </div>
<ul> <ul>
<li v-for="item in toDoTaskList" :key="item.id" class="time-title"> <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
<div style="height: 18px"> <div style="height: 30px">
<span @click="dealWith(item)">{{ item.prcName }}</span> <span @click="dealWith(item)" style="line-height: 30px">{{ item.prcName }}</span>
</div> </div>
</li> </li>
</ul> </ul>
src/pages/searchCenter/pages/standardSearch.vue
-1
View File
@@ -2760,7 +2760,6 @@
} }
@media screen and (min-width: 1920px) { @media screen and (min-width: 1920px) {
.header{ .header{
height: 65px;
} }
} }
.standard-search-content{ .standard-search-content{