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:
zhaokaiyao@91isoft.com
2021-11-22 15:04:25 +08:00
parent 244ca20a4f b9b7e4ffc9
commit e834074f26
8 changed files with 39 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+1 -1
View File
@@ -1,7 +1,7 @@
<template> <template>
<div id="app"> <div id="app">
<!-- <router-view v-if="!isBoolean"/>--> <!-- <router-view v-if="!isBoolean"/>-->
<span v-if="this.$route.name === 'Login'"> <span v-if="this.$route.name === 'Login'|| !isBoolean">
<router-view /> <router-view />
</span> </span>
<span v-else> <span v-else>
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/localTool/standardRecognition/index.vue
+6 -5
View File
@@ -272,20 +272,21 @@
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
icon="el-icon-search"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
round size="small"
@click="searchLawBtn"> @click="searchLawBtn">
查询
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left"
round
type="default" type="default"
@click="clearLawBtn"></el-button> size="small"
@click="clearLawBtn">
清空
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<loading :loading="lawInfoTableLoading">数据获取中</loading> <loading :loading="lawInfoTableLoading">数据获取中</loading>
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+14 -11
View File
@@ -956,20 +956,21 @@
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
icon="el-icon-search" size="mini"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
round
@click="getReplaceLawsNumRowFirst"> @click="getReplaceLawsNumRowFirst">
查询
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left" size="mini"
round
type="default" type="default"
@click="getResetLawsNumRow"></el-button> @click="getResetLawsNumRow">
清空
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@@ -1126,17 +1127,19 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
icon="el-icon-search"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
@click="handleSearchStandard" size="mini"
round> style="margin-left: 5px"
@click="handleSearchStandard">
查询
</el-button> </el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left" size="mini"
@click="handleResetSearch" @click="handleResetSearch">
round></el-button> 清空
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+6 -5
View File
@@ -1257,20 +1257,21 @@
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
icon="el-icon-search" size="mini"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
round
@click="getReplaceLawsNumRowFirst"> @click="getReplaceLawsNumRowFirst">
查询
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left" size="mini"
round
type="default" type="default"
@click="getResetLawsNumRow"></el-button> @click="getResetLawsNumRow">
清空
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+2 -4
View File
@@ -36,16 +36,14 @@
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
icon="el-icon-search"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
@click="selectProcessBtn"></el-button> @click="selectProcessBtn">查询</el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left"
size="mini" size="mini"
@click="resetSelect"></el-button> @click="resetSelect">清空</el-button>
</el-form-item> </el-form-item>
</div> </div>
<div class="search-area-item"> <div class="search-area-item">
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+6 -5
View File
@@ -285,20 +285,21 @@
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
icon="el-icon-search" size="small"
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
round
@click="searchLawBtn"> @click="searchLawBtn">
查询
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
class="common-button-default" class="common-button-default"
icon="el-icon-refresh-left" size="small"
round
type="default" type="default"
@click="clearLawBtn"></el-button> @click="clearLawBtn">
清空
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<loading :loading="lawInfoTableLoading">数据获取中</loading> <loading :loading="lawInfoTableLoading">数据获取中</loading>
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{