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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-10-11 16:53:25 +08:00
parent d4c312d982 dddb7b613e
commit d2a2b6ad74
36 changed files with 133 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/attributeCustom/components/buss.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<template>
<div class="attribute-custom v-class">
<div class="action-bar1">
<el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
<el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog" >展示区域管理</el-button>
</div>
<loading :loading="attributeDataLoading">数据处理中</loading>
src/pages/config/pages/attributeCustom/components/laws.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<template>
<div class="attribute-custom v-class">
<div class="action-bar1">
<el-button class="common-button-primary add-button" size="mini" type="primary" v-btn-permission="'H9WU2ZJHG5WNTY5MDUXH'" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
<el-button class="common-button-primary add-button" size="mini" type="primary" v-btn-permission="'H9WU2ZJHG5WNTY5MDUXH'" @click="showAddModel"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default" size="mini" @click="showDisplayLocationDialog" v-btn-permission="'XT94XKWBCTELWNJQVYCU'">展示区域管理</el-button>
</div>
<loading :loading="attributeDataLoading">数据处理中</loading>
src/pages/config/pages/attributeCustom/components/stand.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<template>
<div class="attribute-custom v-class">
<div class="action-bar1">
<el-button size="mini" style="margin-right: 5px" class="common-button-primary add-button" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
<el-button size="mini" style="margin-right: 5px" class="common-button-primary add-button" type="primary" @click="showAddModel"><i class="el-icon-plus"></i>新增</el-button>
<el-button size="small" class="common-button-default" @click="showDisplayLocationDialog">展示区域管理</el-button>
</div>
<loading :loading="attributeDataLoading">数据处理中</loading>
src/pages/config/pages/dynamicInformationManage/index.vue
+1 -1
View File
@@ -37,7 +37,7 @@
type="primary"
round
@click="openAddMSGModal"
v-btn-permission="'HJ9NVMRSUN'"><i class="iconfont">&#xe84e;</i>新增</el-button>
v-btn-permission="'HJ9NVMRSUN'"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default delete-button"
round
@click="batchMSGDel"
src/pages/config/pages/dynamicInformations/index.vue
+1 -1
View File
@@ -31,7 +31,7 @@
type="primary"
round
v-btn-permission="'QZL5DZDFNM'"
@click="openAddMSGModal(1)"><i class="iconfont">&#xe84e;</i>新增</el-button>
@click="openAddMSGModal(1)"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default delete-button"
round
v-btn-permission="'HVGR9K778X'"
src/pages/config/pages/enterpriseStandardNumberManagement/index.vue
+1 -1
View File
@@ -5,7 +5,7 @@
<el-button class="common-button-primary add-button"
type="primary"
round
@click="openAddMSGModal(1)" v-btn-permission="'W8VY4K4XNPH6GABQBG82'"><i class="iconfont">&#xe84e;</i>新增</el-button>
@click="openAddMSGModal(1)" v-btn-permission="'W8VY4K4XNPH6GABQBG82'"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default delete-button"
round
@click="batchMSGDel(1)" v-btn-permission="'58URKBHGS4QDHSKXG4SS'"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
src/pages/config/pages/enterpriseStandardNumberManagement/managementTree.vue
+1 -1
View File
@@ -8,7 +8,7 @@
<!-- class="common-button-primary add-button"-->
<!-- type="primary"-->
<!-- round-->
<!-- @click="clickAddTree"><i class="iconfont">&#xe84e;</i>新增</el-button>-->
<!-- @click="clickAddTree"><i class="el-icon-plus"></i>新增</el-button>-->
</span>
<div class="tree">
<laws-tree :zNodes="zNodes"
src/pages/config/pages/processManage/process.vue
+1 -1
View File
@@ -41,7 +41,7 @@
<!-- round-->
<!-- @click="addRow"-->
<!-- v-btn-permission="'XBRKH5BP5K'"-->
<!-- ><i class="iconfont">&#xe84e;</i>新增</el-button>-->
<!-- ><i class="el-icon-plus"></i>新增</el-button>-->
<!--</div>-->
<loading :loading="tableDataLoading">{{$t('m.dataProcessing')}}</loading>
<el-table
src/pages/config/pages/processManage/processClassification.vue
+1 -1
View File
@@ -41,7 +41,7 @@
round
@click="addRow"
v-btn-permission="'XBRKH5BP5K'"
><i class="iconfont">&#xe84e;</i>新增</el-button>
><i class="el-icon-plus"></i>新增</el-button>
</div>
<loading :loading="tableDataLoading">{{$t('m.dataProcessing')}}</loading>
<el-table
src/pages/config/pages/standLawsAttrManage/index.vue
+1 -1
View File
@@ -52,7 +52,7 @@
size="mini"
@click="showAddModel(1, null)"
v-btn-permission="''"
><i class="iconfont">&#xe84e;</i>新增</el-button
><i class="el-icon-plus"></i>新增</el-button
>
<el-button @click="deleteAttr" size="mini" class="common-button-default" v-btn-permission=""
><i class="iconfont">&#xe61b;</i>删除</el-button
src/pages/config/pages/userManage/index.vue
+1 -1
View File
@@ -108,7 +108,7 @@
round
@click="openAddUserModal"
v-btn-permission="'KFKJFQ97LC'"
><i class="iconfont">&#xe84e;</i>新增</el-button>
><i class="el-icon-plus"></i>新增</el-button>
<el-button
@click="batchUserDel"
v-btn-permission="'Q2G9W2GCVU'"
src/pages/details/otherLawsDetails/index.vue
+1 -1
View File
@@ -677,7 +677,7 @@
<el-button type="primary"
class="common-button-primary add-button"
round
@click="addknowledge(1)"><i class="iconfont">&#xe84e;</i>新增</el-button>
@click="addknowledge(1)"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default delete-button"
round
@click="deleteknowledge(2)"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
src/pages/details/otherStandardDetails/index.vue
+2 -2
View File
@@ -957,7 +957,7 @@
class="common-button-primary add-button"
size="mini"
:v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'PVBSWCJQ9X4RVBM9RK7L' : 'NJ3YL4SVEJADWH7ESHDX'"
@click="addknowledge(1)"><i class="iconfont">&#xe84e;</i>新增
@click="addknowledge(1)"><i class="el-icon-plus"></i>新增
</el-button>
<el-button class="common-button-default delete-button"
size="mini"
@@ -1116,7 +1116,7 @@
size="mini"
@click="clearComparison()"></el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="addComparison">
<i class="iconfont">&#xe84e;</i>新增
<i class="el-icon-plus"></i>新增
</el-button>
</el-form-item>
</el-form>
src/pages/details/process/ruku/index.vue
+3 -3
View File
@@ -686,7 +686,7 @@
<el-button type="primary"
class="common-button-primary add-button"
round
@click="addknowledge(1)"><i class="iconfont">&#xe84e;</i>新增</el-button>
@click="addknowledge(1)"><i class="el-icon-plus"></i>新增</el-button>
<el-button class="common-button-default delete-button"
round
@click="deleteknowledge(2)"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
@@ -827,7 +827,7 @@
icon="el-icon-refresh-left"
round
@click="clearComparison()"></el-button>
<el-button type="primary" class="common-button-primary" round @click="addComparison"><i class="iconfont">&#xe84e;</i>新增</el-button>
<el-button type="primary" class="common-button-primary" round @click="addComparison"><i class="el-icon-plus"></i>新增</el-button>
</el-form-item>
</el-form>
</div>
@@ -835,7 +835,7 @@
<!-- <el-button type="primary"-->
<!-- class="common-button-primary add-button"-->
<!-- round-->
<!-- @click="addComparison"><i class="iconfont">&#xe84e;</i>新增</el-button>-->
<!-- @click="addComparison"><i class="el-icon-plus"></i>新增</el-button>-->
<div class="myRadio">
<template>
<el-radio-group v-for="(item, index) in comparisonList" :key="index" v-model="comparisonId">
src/pages/home/components/EnterCard.vue
+38 -8
View File
@@ -1,9 +1,6 @@
<template>
<div class="wx-card" @click="toPage">
<div @click="toPage">
<div>
<div>
<i class="icon" :class="icon" />
</div>
<div v-if="label">
<span class="card-font">{{ label }}</span>
</div>
@@ -30,16 +27,49 @@
<style lang="less" scoped>
.wx-card {
width: 214px;
line-height: 70px;
text-align: center;
background: rgba(182, 213, 255, 0.22);
margin-left: 10px;
background: #fff;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
cursor: pointer;
padding-left: 10px;
& > div {
width: 100%;
height: 70px;
background-color: #E4E4E4;
}
}
.wx-card:hover {
& > div {
color: #fff;
background-color: #5ea9f6;
}
}
.wx-card1 {
line-height: 70px;
text-align: center;
background: #fff;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
cursor: pointer;
padding-left: 10px;
& > div {
width: 100%;
height: 70px;
background: #fff;
border: 2px dashed #E4E4E4;
div {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
}
}
}
.labelNull {
height: 100%;
@@ -47,7 +77,7 @@
align-items: center;
.el-icon-circle-plus-outline {
font-size: 50px;
color: #F4F4F4;
color: #E4E4E4;
}
}
</style>
src/pages/home2/components/empennage/index.vue
+13 -7
View File
@@ -3,12 +3,12 @@
<div class="link">
<div class="title">友情链接</div>
<ul>
<li v-for="(link, index) in linkList" v-if="index<5" :key="index" @click="openLinkUrl(link.url)">
<li class="myLi1" v-for="(link, index) in linkList" v-if="index<5" :key="index" @click="openLinkUrl(link.url)">
<a v-if="link.name.length>10" v-html="link.name.substring(0,10)+'...'" :title="link.name"></a>
<a v-else v-html="link.name" :title="link.name"></a>
</li>
<li>
<router-link to="/linkManage">更多链接></router-link>
<li class="myLi2">
<span @click="$router.push('linkManage')">更多链接 ⋙</span>
</li>
</ul>
</div>
@@ -61,6 +61,7 @@ export default {
border-radius: 3px;
height: 100%;
.title {
font-weight: bold;
padding-left: 10px;
width: 80px;
}
@@ -70,20 +71,25 @@ export default {
height: 100%;
text-align: center;
user-select: none;
li {
border-right: 1px solid #f4f4f4;
.myLi1 {
border-right: 2px solid #f4f4f4;
flex: 1;
a {
color: #333333;
}
}
li:hover {
.myLi1:hover {
background: #5ea9f6;
a {
color: #e9ca32;
color: #fff;
text-decoration: none;
}
}
.myLi2 {
padding: 0 10px;
cursor: pointer;
color: #5ea9f6 !important;
}
}
}
</style>
src/pages/home2/components/navMenu/index.vue
+12 -18
View File
@@ -2,13 +2,13 @@
<template>
<div class="nav-menu">
<div class="lattice">
<div class="title">快捷入口</div>
<div class="title"><i class="el-icon-s-promotion"></i> 快捷入口</div>
<div class="menu-wrap">
<enter-card v-for="(item, index) in list"
:key="index"
:label="item.label"
:path="item.path"
:class="list.length === 1 ? 'wx-card1' : (list.length == 2 ? 'wx-card2' :'')">
:class="item.class">
</enter-card>
</div>
</div>
@@ -43,6 +43,7 @@
var json = {}
json.label = item.menuName
json.path = item.menuUrl
json.class = 'wx-card'
this.list.push(json)
}
})
@@ -50,6 +51,7 @@
var json = {}
json.label = ''
json.path = '/plate'
json.class = 'wx-card1'
this.list.push(json)
}
}
@@ -65,6 +67,8 @@
<style lang="less" scoped>
.nav-menu {
.lattice {
background: #fff;
margin-bottom: 10px;
.title {
margin-bottom: 10px;
padding-left: 10px;
@@ -78,36 +82,26 @@
height: 240px;
display: flex;
flex-wrap: wrap;
justify-content:space-between;
font-size: 18px;
justify-content: space-between;
color: #333333;
margin-bottom: 10px;
margin: 0 10px 10px 0;
text-align: center;
&:last-child {
margin-bottom: 0;
}
.wx-card {
height: 70px;
background-color: #FFFFFF;
width: 32%;
margin: 0 0 10px 0;
height: 70px;
width: 33.333333%;
}
.wx-card1 {
width: 100%;
}
.wx-card2 {
width: 49%;
height: 70px;
width: 33.333333%;
}
.menu-item {
flex: 1;
height: 70px;
line-height: 70px;
text-align: center;
margin-right: 10px;
background: #FFFFFF;
&:last-child {
margin-right: 0;
}
}
}
}
src/pages/home2/components/release/index.vue
+2 -1
View File
@@ -13,12 +13,13 @@
ref="selection"
:data="standardReleaseList"
tooltip-effect="dark"
style="padding:0 0 20px 0;"
border
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
style="width: 100%">
<el-table-column
label="序号"
type="index"
align="center"
width="50">
</el-table-column>
<el-table-column
src/pages/home2/components/solicitopinions/index.vue
+2 -1
View File
@@ -13,12 +13,13 @@
ref="selection"
:data="domesticDynamics"
tooltip-effect="dark"
style="padding:0 0 20px 0;"
border
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
style="width: 100%">
<el-table-column
label="序号"
type="index"
align="center"
width="50">
</el-table-column>
<el-table-column
src/pages/home2/components/todoList/index.vue
+22 -14
View File
@@ -1,14 +1,16 @@
<!-- 待办任务 -->
<template>
<div class="to-do-list">
<div>
<span class="task">待办任务</span>
<div class="more" @click="togo">更多</div>
<div style="border-bottom: 2px solid #f4f4f4">
<span class="task">
<i class="el-icon-s-goods"></i> 待办任务
</span>
<div class="more" @click="togo">更多 ⋙</div>
</div>
<ul>
<li v-for="item in toDoTaskList" :key="item.id" class="time-title">
<div style="height: 18px">
<a style="color: #333333" @click="dealWith(item)">{{ item.prcName }}</a>
<span @click="dealWith(item)">{{ item.prcName }}</span>
</div>
</li>
</ul>
@@ -646,34 +648,40 @@ export default {
<style lang="less" scoped>
.to-do-list {
border-radius: 3px;
//flex: 1;
height: calc(~'100% - 300px');
height: calc(~'100% - 310px');
overflow: hidden;
background: #FFFFFF;
.task {
display: inline-block;
margin: 15px;
color: #333333;
font-size: 18px;
font-size: 16px;
font-weight: bold;
}
.more {
float: right;
color: #333333;
color: #5ea9f6;
margin: 15px 15px;
&:hover {
color: #5ea9f6;
cursor: pointer;
}
}
ul {
height: calc(~'100% - 50px');
overflow-y: auto;
}
ul::-webkit-scrollbar {
display: none;
}
.time-title {
margin: 15px;
border-bottom: 1px dashed #cccccc;
}
a {
color: #333333;
&:hover {
color: #e9c851;
text-decoration: underline;
span {
cursor: pointer;
}
span:hover {
color: #5ea9f6;
}
}
}
src/pages/home2/index.vue
+3 -1
View File
@@ -132,9 +132,11 @@ export default {
.home-tabs {
/deep/.el-tabs__content {
height: calc(~'100% - 55px');
margin: 0 10px;
}
::v-deep.el-tabs__header{
margin: 0 70px 15px 10px
margin: 0 10px 15px 10px;
border-bottom: 1px solid #F4F4F4;
}
::v-deep {
.el-tabs__item {
src/pages/processCenter/pages/newProcess/index.vue
+3 -3
View File
@@ -450,14 +450,14 @@ export default {
.card-top {
width: 100%;
background: #2d8cf0;
height: 120px;
height: 100px;
display: flex;
justify-content: space-between;
.card-top-left {
img {
margin: 10px;
width: 100px;
height: 100px;
width: 80px;
height: 80px;
}
}
.card-top-right {
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+1 -1
View File
@@ -54,7 +54,7 @@
size="mini"
@click="openModal(null,'addOpt')"
v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'"
><i class="iconfont">&#xe84e;</i>新增
><i class="el-icon-plus"></i>新增
</el-button>
<el-button
class="common-button-default delete-button"
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+4 -2
View File
@@ -44,8 +44,10 @@
class="common-button-primary add-button"
size="mini"
@click="openModal(null,'addOpt')"
v-btn-permission="'389d3690eeea9d3808bdff4d02dddbd8'"
><i class="iconfont">&#xe84e;</i>新增
v-btn-permission="'389d3690eeea9d3808bdff4d02dddbd8'">
<i class="el-icon-plus"></i>
<!-- <i class="el-icon-plus"></i>-->
新增
</el-button>
<el-button
class="common-button-default delete-button"
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+1 -1
View File
@@ -55,7 +55,7 @@
size="mini"
@click="openModal(null,'addOpt')"
v-btn-permission="'2dd158ffb07ddcc89ed41468b196b451'"
><i class="iconfont">&#xe84e;</i>新增
><i class="el-icon-plus"></i>新增
</el-button>
<el-button
class="common-button-default delete-button"
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+1 -1
View File
@@ -51,7 +51,7 @@
size="mini"
@click="openModal(null,'addOpt')"
v-btn-permission="'J2YEFN9MH4KWW5HMR2QH'"
><i class="iconfont">&#xe84e;</i>新增</el-button>
><i class="el-icon-plus"></i>新增</el-button>
<el-button
class="common-button-default delete-button"
:loading="delLoading"
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+3 -3
View File
@@ -125,7 +125,7 @@
<!-- @click="addModal"-->
<!-- size="mini"-->
<!-- v-btn-permission="'57f40856850c95912be0760a082db0e0'"-->
<!-- :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增</el-button>-->
<!-- :disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增</el-button>-->
<el-button class="common-button-default in-button"
:loading="searching"
size="mini"
@@ -2417,7 +2417,7 @@ export default {
}
this.modalShowFlag2 = false
}
this.$forceUpdate()
},
popoverHideBusVsCancel(){
@@ -2434,7 +2434,7 @@ export default {
}
this.modalShowFlag3 = false
}
this.$forceUpdate()
},
popoverHideCarVsCancel(){
src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue
+1 -1
View File
@@ -173,7 +173,7 @@
round
@click="handleOpenAddModal"
v-btn-permission="'MHV7SA5CPD8UHYBUT3YQ'"
><i class="iconfont">&#xe84e;</i>新增</el-button
><i class="el-icon-plus"></i>新增</el-button
>
<el-button
class="common-button-default in-button"
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1 -1
View File
@@ -220,7 +220,7 @@
<!-- round-->
<!-- @click="addModal"-->
<!-- v-btn-permission="'RKK25EG2WD'"-->
<!-- ><i class="iconfont">&#xe84e;</i>新增</el-button>-->
<!-- ><i class="el-icon-plus"></i>新增</el-button>-->
<!-- <el-button-->
<!-- class="common-button-default in-button"-->
<!-- round-->
src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue
+1 -1
View File
@@ -82,7 +82,7 @@
class="common-button-primary add-button"
round
@click="addModal"
v-btn-permission="'KFW98JENT2N8VPVR8JM6'"><i class="iconfont">&#xe84e;</i>新增</el-button>
v-btn-permission="'KFW98JENT2N8VPVR8JM6'"><i class="el-icon-plus"></i>新增</el-button>
<el-button
class="common-button-default in-button"
round
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+1 -1
View File
@@ -85,7 +85,7 @@
round
@click="openLawsModal"
v-btn-permission="'XBRKH5BP5K'"
><i class="iconfont">&#xe84e;</i>新增</el-button>
><i class="el-icon-plus"></i>新增</el-button>
<el-button
class="common-button-default in-button"
round
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -122,7 +122,7 @@
size="mini"
@click="addModal"
v-btn-permission="'ceb5fb1e00'"
:disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增
:disabled="addBtnDisabled"><i class="el-icon-plus"></i>新增
</el-button>
<el-button class="common-button-default in-button"
size="mini"
src/pages/standardComparisonLibrary/index.vue
+1 -1
View File
@@ -38,7 +38,7 @@
class="common-button-primary add-button"
@click="openAddModel"
v-btn-permission="'L8CEXYGB4TFUUWY8P89V'"
><i class="iconfont">&#xe84e;</i>新增</el-button>
><i class="el-icon-plus"></i>新增</el-button>
<!--<el-button-->
<!-- round-->
src/pages/standardComparisonLibrary/view.vue
+1 -1
View File
@@ -144,7 +144,7 @@
<!-- round-->
<!-- @click="openAddModel"-->
<!-- v-btn-permission="'4C796W933W'"-->
<!--&gt;<i class="iconfont">&#xe84e;</i>新增</el-button>-->
<!--&gt;<i class="el-icon-plus"></i>新增</el-button>-->
<!--<el-button-->
<!-- round-->