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:
zhutianqi
2021-11-22 18:01:03 +08:00
parent 12ed48f629 a6ac3c76cf
commit 7178058e6c
38 changed files with 187 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForStandards.vue
+5 -3
View File
@@ -55,11 +55,11 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
icon="el-icon-search"
type="primary"
class="common-button-primary"
round
@click="getReplaceLawsNumRowFirst(true)">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
@@ -68,7 +68,9 @@
icon="el-icon-refresh-left"
round
type="default"
@click="getResetLawsNumRow"></el-button>
@click="getResetLawsNumRow">
清空
</el-button>
</el-form-item>
</el-form>
</div>
@@ -183,7 +185,7 @@ export default {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
standType: 'ALL',
standType: 'INLAND',
quoteIdList: '',
validFlag: '0',
menuId: 'nomenu'
src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
+4 -3
View File
@@ -55,20 +55,21 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
icon="el-icon-search"
type="primary"
class="common-button-primary"
round
@click="getReplaceLawsNumRowSearch">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
round
type="default"
@click="getResetLawsNumRow"></el-button>
@click="getResetLawsNumRow">
清空
</el-button>
</el-form-item>
</el-form>
</div>
src/components/CustomFormComponents/InputForStandardsForForeign.vue
+5 -4
View File
@@ -49,20 +49,21 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
icon="el-icon-search"
type="primary"
class="common-button-primary"
round
@click="getReplaceLawsNumRow(true)">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
round
type="default"
@click="getResetLawsNumRow"></el-button>
@click="getResetLawsNumRow">
清空
</el-button>
</el-form-item>
</el-form>
</div>
@@ -195,7 +196,7 @@ export default {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
standType: 'ALL',
standType: 'FOREIGN',
quoteIdList: '',
validFlag: '0',
menuId: 'nomenu'
src/components/personalCenter/index.vue
+7 -14
View File
@@ -1,14 +1,8 @@
<template>
<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>
<div>
<img style="height: 50px;width: 100%" :src="require('@/assets/images/shangqi/home/top-logo.png')">
</div>
<!-- header头部 右侧内容 当前登录人和退出-->
<!-- <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">-->
<!-- <div>-->
@@ -55,7 +49,6 @@
<!-- </el-dropdown>-->
<!-- </div>-->
<!-- </div>-->
</div>
</template>
<script>
@@ -128,10 +121,10 @@ export default {
<style lang="less" scoped>
.header {
display: flex;
justify-content: space-between;
background-color: #171E4A;
color: #fff;
//display: flex;
//justify-content: space-between;
//background-color: #171E4A;
//color: #fff;
.header-left {
float: left;