Merge branch 'develop' into FOTON

# Conflicts:
#	src/components/navMenu/index.vue

src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app">
 <!--    <router-view v-if="!isBoolean"/>-->
-    <span v-if="this.$route.name === 'Login'">
+    <span v-if="this.$route.name === 'Login'|| !isBoolean">
       <router-view />
     </span>
     <span v-else>
@@ -373,7 +373,7 @@ export default {
   }
 
   .el-main {
-    padding: 10px 10px 0 10px;
+    padding: 15px 10px 0 10px;
   }
   .content-box {
     display: flex;

src/assets/languages/cn.js

@@ -152,8 +152,8 @@ export const m = {
   title: '标题',
   creator: '创建人',
   serialNumber: '序号',
-  dataType: '资料类型',
+  dataType: '标准类别',
-  standardNumberAndPolicyNumber: '标准号/政策号',
+  standardNumberAndPolicyNumber: '标准编号/政策编号',
   standardNameAndPolicyName: '标准名称/政策名称',
   textState: '文本状态',
   conversionResults: '转换结果',

src/components/CustomFormComponents/InputForStandards.vue

@@ -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

@@ -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

@@ -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/navMenu/index.vue

@@ -1,34 +1,34 @@
 <!--左侧导航菜单 liuyan -->
 <template>
   <div class="nav-menu v-class" :class="{'is-collapse': isCollapse}">
-    <!--    <div class="nav-menu-header" style="height: 65px; background-color: #4788c0;">
+<!--    <div class="nav-menu-header" style="height: 65px; background-color: #4788c0;">
-          <div class="header-left">
+      <div class="header-left">
-            <div class="logo">
+        <div class="logo">
-              <img :src="logo" height="58" width="149" />
+          <img :src="logo" height="58" width="149" />
-            </div>
+        </div>
-          </div>
+      </div>
-        </div>-->
+    </div>-->
     <!--    <div class="toggle-btn el-icon-s-fold" v-if="isCollapse === false" style="margin: 10px 0; display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar">-->
     <!--      <div style="font-size: 14px; line-height: 30px;">{{ this.isCollapse ? '' : '' }}</div><i class=""></i></div>-->
     <!--    <div class="toggle-btn el-icon-s-unfold" v-else style="margin: 10px 0; display: flex;justify-content: center; font-size: 30px; color: #333333;" @click="handleToggleSideBar">-->
     <!--      <div style="font-size: 14px; line-height: 30px;">{{ this.isCollapse ? '' : '' }}</div></div>-->
     <div class="left-tree">
       <el-menu
-              unique-opened
+          unique-opened
-              :default-active="defaultActive"
+          :default-active="defaultActive"
-              background-color="#4788c0"
+          background-color="#4788c0"
-              text-color="#fff"
+          text-color="#fff"
-              active-text-color="#000"
+          active-text-color="#000"
-              router
+          router
-              :collapse="isCollapse"
+          :collapse="isCollapse"
-              @select="handleSelect"
+          @select="handleSelect"
       >
         <template v-for="(item, index) in navMenuList">
           <el-submenu
-                  :key="index"
+              :key="index"
-                  :index="item.path"
+              :index="item.path"
-                  popper-class="nav-menu-popper"
+              popper-class="nav-menu-popper"
-                  v-if="!item.isChildren && (!item.menuId || $hasPermission(item.menuId))"
+              v-if="!item.isChildren && (!item.menuId || $hasPermission(item.menuId))"
           >
             <template slot="title">
               <i class="shangqi-icon" :class="item['icon-class']"></i>
@@ -37,11 +37,11 @@
               </el-badge>
             </template>
             <el-menu-item
-                    v-for="(children, childrenIndex) in item.children"
+                v-for="(children, childrenIndex) in item.children"
-                    :key="childrenIndex"
+                :key="childrenIndex"
-                    :index="children.path"
+                :index="children.path"
-                    style="text-align: center;"
+                style="text-align: center;"
-                    v-if="!children.menuId || $hasPermission(children.menuId)"itemSplitInfo
+                v-if="!children.menuId || $hasPermission(children.menuId)"itemSplitInfo
             >
               <el-badge :value="getDynamicTotal.msgCount" class="item" v-if="children.title === '我的消息' && getDynamicTotal.msgCount !== 0">
                 {{ children.title }}
@@ -512,133 +512,170 @@
   }
 </script>
 <style lang="less" scoped>
-  @import '~@/assets/styles/mixins';
+@import '~@/assets/styles/mixins';
-  /deep/.el-menu--popup > div {
+/deep/.el-menu--popup > div {
-    border-radius: 5px;
+  border-radius: 5px;
-  }
+}
-  .el-menu--collapse {
+.el-menu--collapse {
-    .is-active {
+  .is-active {
-      background-color: #697178 !important;
+    background-color: #697178 !important;
-      .shangqi-icon {
+    .shangqi-icon {
-        color: #fff !important;
-      }
-      color: #697178 !important;
-    }
-  }
-  .nav-menu {
-    width: 58px;
-    height: 90%;
-    overflow-y: auto;
-    user-select: none;
-    box-sizing: border-box;
-    position: absolute;
-    background: #697178;
-    background-size: 100% 100%;
-    /deep/.el-tooltip {
-      padding: 0px 16px !important;
-    }
-    .left-tree::-webkit-scrollbar {
-      display: none;
-    }
-    &:not(.is-collapse) {
-      width: 200px;
-      background: #697178;
-      background-size: 100% 100%;
-      .logo {
-        padding: 10px;
-        text-align: left;
-        img {
-          width: 150px;
-          height: 61px;
-          margin-top: -7px;
-        }
-      }
-    }
-    .tree-collapse{
-      display: inline-block;
-      position: absolute;
-      right: 0;
-      top: 0px;
-      align-items: center;
-      justify-content: center;
-      width: 15px;
-      min-height: 140%;
-      background: #EEE;
-      cursor: pointer;
-      &:hover{
-        background-color: #f0f2f5;
-      }
-    }
-    .logo{
-      text-align: center;
-      padding: 15px 0;
-      img {
-        width: 36px;
-        height: 35px;
-      }
-    }
-    .nav-menu-header{
-      /*background:url("../../assets/images/shangqi/home/logo3.png");*/
-    }
-    /deep/:not(.is-collapse) .el-menu-item.is-active{
-      background: #4788c0 !important;
       color: #fff !important;
     }
+    color: #697178 !important;
   }
-  .has-no-read{
+}
-    position: relative;
+.nav-menu {
-    top:-15px;
+  width: 58px;
-    left:10px
+  height: 100%;
+  overflow-y: auto;
+  user-select: none;
+  box-sizing: border-box;
+  position: absolute;
+  background: #697178;
+  background-size: 100% 100%;
+  /deep/.el-tooltip {
+    padding: 0px 16px !important;
   }
-  /*.el-menu--collapse {*/
+  .left-tree::-webkit-scrollbar {
-  /*  .shangqi-icon {*/
+    display: none;
-  /*    color: #4091FF !important;*/
-  /*  }*/
-  /*  .is-active /deep/.shangqi-icon {*/
-  /*    color: #4091FF !important;*/
-  /*  }*/
-  /*  /deep/.el-submenu__title i {*/
-  /*    color: #fff;*/
-  /*  }*/
-  /*  /deep/.el-submenu__title i {*/
-  /*    color: #fff;*/
-  /*  }*/
-  /*}*/
-  .is-active /deep/.shangqi-icon {
-    color: #fff;
   }
-  /deep/.el-submenu__title i {
+  &:not(.is-collapse) {
-    color: #fff;
+    width: 200px;
+    background: #697178;
+    background-size: 100% 100%;
+    .logo {
+      padding: 10px;
+      text-align: left;
+      img {
+        width: 150px;
+        height: 61px;
+        margin-top: -7px;
+      }
+    }
   }
-  .nav-menu /deep/.el-submenu__title i {
+  .tree-collapse{
-    color: #fff;
+    display: inline-block;
+    position: absolute;
+    right: 0;
+    top: 0px;
+    align-items: center;
+    justify-content: center;
+    width: 15px;
+    min-height: 140%;
+    background: #EEE;
+    cursor: pointer;
+    &:hover{
+      background-color: #f0f2f5;
+    }
   }
-  .nav-menu{
+  .logo{
-    background-color: #697178;
+    text-align: center;
-    scrollbar-width: none;
+    padding: 15px 0;
-    -ms-overflow-style: none; /* IE 10+ */
+    img {
+      width: 36px;
+      height: 35px;
+    }
   }
-  .nav-menu::-webkit-scrollbar {
+  .nav-menu-header{
-    display: none; /* Chrome Safari */
+    /*background:url("../../assets/images/shangqi/home/logo3.png");*/
   }
-  .nav-menu-popper .el-menu .el-menu-item {
+  /deep/:not(.is-collapse) .el-menu-item.is-active{
+    background: #4788c0 !important;
     color: #fff !important;
   }
-  .nav-menu-popper .el-menu .el-menu-item.is-active {
+}
-    background-color: #fff !important;
+.has-no-read{
-    color: #4788c0 !important;
+  position: relative;
-    font-weight: bold;
+  top:-15px;
-  }
+  left:10px
-  .nav-menu-popper .el-menu .el-menu-item:hover {
+}
-    background-color: #697178 !important;
+/*.el-menu--collapse {*/
-    color: #fff !important;
+/*  .shangqi-icon {*/
-    font-weight: bold;
+/*    color: #4091FF !important;*/
-  }
+/*  }*/
+/*  .is-active /deep/.shangqi-icon {*/
+/*    color: #4091FF !important;*/
+/*  }*/
+/*  /deep/.el-submenu__title i {*/
+/*    color: #fff;*/
+/*  }*/
+/*  /deep/.el-submenu__title i {*/
+/*    color: #fff;*/
+/*  }*/
+/*}*/
+.is-active /deep/.shangqi-icon {
+  color: #fff;
+}
+/deep/.el-submenu__title i {
+  color: #fff;
+}
+.nav-menu /deep/.el-submenu__title i {
+  color: #fff;
+}
+.nav-menu{
+  background-color: #697178;
+  scrollbar-width: none;
+  -ms-overflow-style: none; /* IE 10+ */
+}
+.nav-menu::-webkit-scrollbar {
+  display: none; /* Chrome Safari */
+}
+.nav-menu-popper .el-menu .el-menu-item {
+  color: #fff !important;
+}
+.nav-menu-popper .el-menu .el-menu-item.is-active {
+  background-color: #fff !important;
+  color: #4788c0 !important;
+  font-weight: bold;
+}
+.nav-menu-popper .el-menu .el-menu-item:hover {
+  background-color: #697178 !important;
+  color: #fff !important;
+  font-weight: bold;
+}
 
-  .el-menu-item {
+.el-menu-item {
+  span {
+    margin-left: 5px;
+    font-weight: normal;
+  }
+  .shangqi-icon {
+    display: inline-block;
+    width: 18px;
+    height: 18px;
+    background-repeat: no-repeat;
+    background-size: 85% 85%;
+    background-position: center center;
+    &.home {
+      background-image: url("~assets/images/shangqi/sideBar/home.png");
+    }
+    &.baobiao {
+      background-image: url("~assets/images/shangqi/sideBar/baobiao.png");
+    }
+    &.ucenter {
+      background-image: url("~assets/images/shangqi/sideBar/ucenter.png");
+    }
+    &.search {
+      background-image: url("~assets/images/shangqi/sideBar/search.png");
+    }
+    &.warning {
+      background-image: url("~assets/images/shangqi/sideBar/warning.png");
+    }
+    &.liucheng {
+      background-image: url("~assets/images/shangqi/sideBar/liucheng.png");
+    }
+  }
+}
+.el-submenu {
+  .is-opened {
+    background-color: red;
+  }
+  /deep/.el-submenu__title {
+    padding: 0 16px !important;
     span {
-      margin-left: 5px;
       font-weight: normal;
+      margin-left: 5px;
     }
     .shangqi-icon {
       display: inline-block;
@@ -647,11 +684,11 @@
       background-repeat: no-repeat;
       background-size: 85% 85%;
       background-position: center center;
-      &.home {
+      &.fagui {
-        background-image: url("~assets/images/shangqi/sideBar/home.png");
+        background-image: url("~assets/images/shangqi/sideBar/fagui.png");
       }
-      &.baobiao {
+      &.tools {
-        background-image: url("~assets/images/shangqi/sideBar/baobiao.png");
+        background-image: url("~assets/images/shangqi/sideBar/tools.png");
       }
       &.ucenter {
         background-image: url("~assets/images/shangqi/sideBar/ucenter.png");
@@ -659,78 +696,41 @@
       &.search {
         background-image: url("~assets/images/shangqi/sideBar/search.png");
       }
-      &.warning {
+      &.conf {
-        background-image: url("~assets/images/shangqi/sideBar/warning.png");
+        background-image: url("~assets/images/shangqi/sideBar/conf.png");
       }
       &.liucheng {
         background-image: url("~assets/images/shangqi/sideBar/liucheng.png");
       }
     }
   }
-  .el-submenu {
+  .el-menu-item {
-    .is-opened {
+    padding-left: 29px !important;
-      background-color: red;
+    font-size: 15px;
-    }
+    font-weight: normal;
-    /deep/.el-submenu__title {
+    height: 40px;
-      padding: 0 16px !important;
+    line-height: 40px;
-      span {
+    div {
-        font-weight: normal;
-        margin-left: 5px;
-      }
-      .shangqi-icon {
-        display: inline-block;
-        width: 18px;
-        height: 18px;
-        background-repeat: no-repeat;
-        background-size: 85% 85%;
-        background-position: center center;
-        &.fagui {
-          background-image: url("~assets/images/shangqi/sideBar/fagui.png");
-        }
-        &.tools {
-          background-image: url("~assets/images/shangqi/sideBar/tools.png");
-        }
-        &.ucenter {
-          background-image: url("~assets/images/shangqi/sideBar/ucenter.png");
-        }
-        &.search {
-          background-image: url("~assets/images/shangqi/sideBar/search.png");
-        }
-        &.conf {
-          background-image: url("~assets/images/shangqi/sideBar/conf.png");
-        }
-        &.liucheng {
-          background-image: url("~assets/images/shangqi/sideBar/liucheng.png");
-        }
-      }
-    }
-    .el-menu-item {
-      padding-left: 29px !important;
-      font-size: 15px;
-      font-weight: normal;
-      height: 40px;
-      line-height: 40px;
-      div {
-      }
-    }
-    /deep/.el-menu {
-      /*padding-left: 18px;*/
     }
   }
-  .el-menu--collapse{
+  /deep/.el-menu {
-    width: 100%;
+    /*padding-left: 18px;*/
-    .shangqi-icon{
+  }
-      width: 24px;
+}
-      height: 24px;
+.el-menu--collapse{
-    }
+  width: 100%;
-    .el-submenu{
+  .shangqi-icon{
-      /deep/.el-submenu__title{
+    width: 24px;
-        .shangqi-icon{
+    height: 24px;
-          width: 24px;
+  }
-          height: 24px;
+  .el-submenu{
-        }
+    /deep/.el-submenu__title{
+      .shangqi-icon{
+        width: 24px;
+        height: 24px;
       }
     }
   }
+}
 
 </style>

src/components/personalCenter/index.vue

@@ -1,14 +1,5 @@
 <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>
       <!-- header头部 右侧内容 当前登录人和退出-->
 <!--      <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">-->
 <!--        <div>-->
@@ -55,7 +46,6 @@
 <!--        </el-dropdown>-->
 <!--      </div>-->
 <!--    </div>-->
-  </div>
 </template>
 
 <script>
@@ -128,10 +118,10 @@ export default {
 
 <style lang="less" scoped>
 .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 {
     float: left;

src/components/roleTree/index.vue

@@ -17,6 +17,7 @@
                     <el-input
                             v-model="filterText"
                             placeholder="请输入姓名"
+                            @input="changeInput"
                     ></el-input>
                 </el-form-item>
             </el-form>
@@ -25,7 +26,6 @@
                     node-key="id"
                     style="height: 100%; overflow: auto;"
                     class="filter-tree tree-line"
-                    :class="treeClass"
                     @check-change="checkChange"
                     :data="treeData"
                     :props="defaultProps"
@@ -50,6 +50,7 @@
                     class="filter-tree tree-line"
                     :data="treeData1"
                     :props="defaultProps"
+                    @check-change="checkChange2"
                     :default-checked-keys="nodeList"
                     highlight-current
                     check-strictly
@@ -74,6 +75,15 @@
 </template>
 
 <script>
+    function debounce(func, wait = 500){
+        let timeout;
+        return function(event){
+            clearTimeout(timeout)
+            timeout = setTimeout(()=>{
+                func.call(this, event)
+            },wait)
+        }
+    }
     export default {
         name: "roleTree",
         props: {
@@ -117,54 +127,73 @@
             }
         },
         methods: {
-            checkChange (row, type, c) {
+            changeInput:debounce(function (val) {
-                if (!type) {
+                if (val.length) {
-                    if (this.nodeList.length > 0) {
+                    this.open1 = false
-                        for (let a = 0; a < this.nodeList.length; a ++) {
+                    this.treeLoading = true
-                            if (row.id === this.nodeList[a]) {
+                    this.$http.get('SarInstitution/institution/institutionAndUser', {
-                                this.nodeList.splice(a, 1)
+                        userName: val
-                            }
+                    }, {}, res => {
+                        this.treeData1 = res.data
+                        this.treeLoading = false
+                    })
+                } else {
+                    this.open1 = true
+                }
+            }),
+            checkChange2 (row, type, c) {
+                if (type) {
+                    this.nodeList.push(row.id)
+                } else {
+                    for (let a = 0; a < this.nodeList.length; a ++) {
+                        if (row.id === this.nodeList[a]) {
+                            this.nodeList.splice(a, 1)
                         }
                     }
                 }
             },
-            treeClass () {
+            checkChange (row, type, c) {
+                if (type) {
+                    this.nodeList.push(row.id)
+                } else {
+                    for (let a = 0; a < this.nodeList.length; a ++) {
+                        if (row.id === this.nodeList[a]) {
+                            this.nodeList.splice(a, 1)
+                        }
+                    }
+                }
             },
             handleTreeDrawerCancel () {
                 this.filterText = ''
                 this.isVisible2 = false
             },
             saveUserInfo () {
-                if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) {
+                if (this.checkBox) {
-                    let ids = ''
-                    this.nodeList.forEach(item => {
-                        if (ids.length > 0) {
-                            ids += ','
-                            ids += item
-                        } else {
-                            ids = item
-                        }
-                    })
-                    this.$http.get('SarInstitution/institution/getNextById', {
-                        ids: ids
-                    }, {
-                        _this: this
-                    }, res => {
-                        let oldList2 = res.concat(this.roleList)
-                        let result = []
-                        let obj = {}
-                        for(let i = 0; i < oldList2.length; i++){
-                            if(!obj[oldList2[i].id]){
-                                result.push(oldList2[i]);
-                                obj[oldList2[i].id] = true;
-                            }
-                        }
-                        this.isVisible2 = false
-                        this.$emit('checkedRole', result)
-                    })
-                } else {
                     this.isVisible2 = false
                     this.$emit('checkedRole', this.roleList)
+                } else {
+                    if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) {
+                        let ids = ''
+                        this.nodeList.forEach(item => {
+                            if (ids.length > 0) {
+                                ids += ','
+                                ids += item
+                            } else {
+                                ids = item
+                            }
+                        })
+                        this.$http.get('SarInstitution/institution/getNextById', {
+                            ids: ids
+                        }, {
+                            _this: this
+                        }, res => {
+                            this.isVisible2 = false
+                            this.$emit('checkedRole', res)
+                        })
+                    } else {
+                        this.isVisible2 = false
+                        this.$emit('checkedRole', this.roleList)
+                    }
                 }
             },
             drawerCheck (data) {
@@ -173,7 +202,7 @@
                     var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
                     if(getlist.length == 1) {
                         this.roleRow = getlist[0]
-                    }else {
+                    } else {
                         this.$refs.tree.setCheckedKeys([data.id]);
                         this.roleRow = this.$refs.tree.getCheckedNodes()[0]
                     }
@@ -211,20 +240,6 @@
             isVisible2 (val) {
                 this.$emit('update:isVisible', val)
             },
-            filterText (val) {
-                if (val.length) {
-                    this.open1 = false
-                    this.treeLoading = true
-                    this.$http.get('SarInstitution/institution/institutionAndUser', {
-                        userName: val
-                    }, {}, res => {
-                        this.treeData1 = res.data
-                        this.treeLoading = false
-                    })
-                } else {
-                    this.open1 = true
-                }
-            },
         },
         mounted () {
             this.getTree()

src/main.js

@@ -102,7 +102,11 @@ router.beforeEach(function (to, from, next) {
                 if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) {
                     extractedVerify(token)
                 }else {
-                    extractedLocalStorage('home2','');
+                    if(path === '/standardSearch/All'){
+                        extractedLocalStorage('standardSearch/All','');
+                    }else {
+                        extractedLocalStorage('home2','');
+                    }
                     // ssoLoginUrlDev 默认sso 地址
                     window.location.href = ssoLoginUrlDev
                 }

src/pages/details/otherStandardDetails/index.vue

@@ -369,7 +369,7 @@
               >
                 <div
                         :key="child.id"
-                        :class="'modular-item'"
+                        :class="'modular-item half'"
                 >
                   <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
                   <span
@@ -390,7 +390,7 @@
                       <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
                   || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
                   || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
-                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
                         <i
                                 title="下载"
                                 @click="downloadFile(file.id)"
@@ -411,7 +411,7 @@
 <!--                        <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                       </template>
                       <template v-else>
-                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
                         <i
                                 title="下载"
                                 @click="downloadFile(file.id)"
@@ -611,19 +611,19 @@
             <el-form-item class="search-item btn-box">
               <el-button
                       :loading="searching"
-                      icon="el-icon-search"
                       type="primary"
                       size="mini"
                       class="common-button-primary"
                       @click="searchSarStandItems">
+                查询
               </el-button>
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
                       class="common-button-default"
-                      icon="el-icon-refresh-left"
                       @click="clearAllSearch"
                       size="mini">
+                清空
               </el-button>
             </el-form-item>
           </el-form>

src/pages/home2/components/empennage/index.vue

@@ -9,62 +9,62 @@
         <div>
           <el-row>
             <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 :span="1">
               <span class="borderMiddle"></span>
             </el-col>
             <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 :span="1">
               <span class="borderMiddle"></span>
             </el-col>
             <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 :span="1">
               <span class="borderMiddle"></span>
             </el-col>
             <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 :span="1">
               <span class="borderMiddle"></span>
             </el-col>
             <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-row>
         </div>
         <div>
           <el-row>
             <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 :span="1">
               <span class="borderMiddle"></span>
             </el-col>
             <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 :span="1">
               <span class="borderMiddle"></span>
             </el-col>
             <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 :span="1">
               <span class="borderMiddle"></span>
             </el-col>
             <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 :span="1">
               <span class="borderMiddle"></span>
             </el-col>
             <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-row>
         </div>
@@ -180,7 +180,7 @@
         border-left: 2px dotted #aaa;
       }
         .title {
-          padding-right: 50px;
+          padding-right: 40px;
             font-weight: bold;
             padding-left: 40px;
             width: 80px;
@@ -189,6 +189,15 @@
             cursor: pointer;
             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>
 

src/pages/home2/components/searchGroup/index.vue

@@ -102,6 +102,7 @@ export default {
     border-radius: 5px;
     ::v-deep {
       .el-input__inner {
+        text-align: center;
         width: 18vm;
         height: 40px;
         color: #333333;

src/pages/home2/components/todoList/index.vue

@@ -9,8 +9,8 @@
     </div>
     <ul>
       <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>
       </li>
     </ul>

src/pages/localTool/standardRecognition/index.vue

@@ -272,20 +272,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
+                size="small"
                 @click="searchLawBtn">
+              查询
             </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="clearLawBtn"></el-button>
+                size="small"
+                @click="clearLawBtn">
+              清空
+            </el-button>
           </el-form-item>
         </el-form>
         <loading :loading="lawInfoTableLoading">数据获取中</loading>
@@ -315,7 +316,7 @@
                 width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
+                <a v-if="scope.row.standYear && scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
@@ -335,7 +336,7 @@
                 min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
+                <a v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
                 <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
@@ -345,7 +346,7 @@
                 width="120"
                 label="发布日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
                 <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
@@ -356,8 +357,8 @@
                 label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}</span>
-                <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-else>{{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}</span>
 
               </template>
             </el-table-column>
@@ -368,7 +369,7 @@
                 width="150"
                 label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
@@ -378,7 +379,7 @@
                 width="150"
                 label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
@@ -393,10 +394,10 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{
-                    textStatusMap[scope.row.textStatus]
+                    scope.row.standTextStatusShow
                   }}</span>
-                <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-else>{{ scope.row.standTextStatusShow }}</span>
               </template>
             </el-table-column>
           </div>
@@ -406,10 +407,10 @@
                 width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-if="scope.row.standYear && scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-else-if="scope.row.standYear && scope.row.standTextStatusShow === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
                     scope.row.standSortShow
                   }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
                 <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
@@ -428,10 +429,10 @@
                 min-width="300"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standName
                   }}</a>
-                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standName
                   }}</a>
                 <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
@@ -445,10 +446,10 @@
                 width="120"
                 label="发布日期">
               <template slot-scope="scope">
-                <div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
+                <div v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
-                <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
+                <div v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
                 <div v-else style="color: #333333">
@@ -463,10 +464,10 @@
                 label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{
                     scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
                   }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                <span v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF">{{
                     scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-'
                   }}</span>
                 <span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
@@ -479,10 +480,10 @@
                 width="150"
                 label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{
                     scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
                   }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                <span v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF">{{
                     scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-'
                   }}</span>
                 <span v-else style="color: #333333">{{
@@ -496,10 +497,10 @@
                 width="150"
                 label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{
                     scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
                   }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                <span v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF">{{
                     scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-'
                   }}</span>
                 <span v-else style="color: #333333">{{
@@ -518,13 +519,13 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
+                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{
-                    textStatusMap[scope.row.textStatus]
+                    scope.row.standTextStatusShow
                   }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
+                <span v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF">{{
-                    textStatusMap[scope.row.textStatus]
+                    scope.row.standTextStatusShow
                   }}</span>
-                <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-else style="color: #333333">{{ scope.row.standTextStatusShow }}</span>
               </template>
             </el-table-column>
           </div>
@@ -992,13 +993,13 @@ export default {
         this.$message.warning('请选择一条数据')
       }
       else {
-        console.log('619',this.handleSelectForm.dataSource)
         // this.attributeEO.dataSource = this.handleSelectForm.dataSource
         // this.attributeEO.lawId = this.handleSelectTableList[0].id
         this.uploadFilesdfEo.standNumber =this.handleSelectTableList[0].standCode || this.handleSelectTableList[0].lawsNumber || this.handleSelectTableList[0].standSort+" "+this.handleSelectTableList[0].standNumber+"-"+this.handleSelectTableList[0].standYear
         this.uploadFilesdfEo.standName = this.handleSelectTableList[0].standName || this.handleSelectTableList[0].lawsName
-        //文本状态，下次一定
+        // console.log('999',this.handleSelectTableList[0])
-        // this.uploadFilesdfEo.fileType = this.handleSelectTableList[0].textStatus || this.handleSelectTableList[0].standStatusShow
+        //文本状态，下次一定(tnnd，人家的文本状态和这个的文本状态都不是一个东西，不用画蛇添足）
+        // this.uploadFilesdfEo.fileType = this.handleSelectTableList[0].standTextStatusShow || this.handleSelectTableList[0].standStatusShow
         this.selectModal = false
       }
       console.log('确定',this.handleSelectTableList)

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -956,20 +956,21 @@
                         </el-form-item>
                         <el-form-item class="search-item btn-box">
                             <el-button
-                                    icon="el-icon-search"
+                                    size="mini"
                                     type="primary"
                                     class="common-button-primary"
-                                    round
                                     @click="getReplaceLawsNumRowFirst">
+                              查询
                             </el-button>
                         </el-form-item>
                         <el-form-item class="search-item btn-box">
                             <el-button
                                     class="common-button-default"
-                                    icon="el-icon-refresh-left"
+                                    size="mini"
-                                    round
                                     type="default"
-                                    @click="getResetLawsNumRow"></el-button>
+                                    @click="getResetLawsNumRow">
+                              清空
+                            </el-button>
                         </el-form-item>
                     </el-form>
                 </div>
@@ -1126,17 +1127,19 @@
                             </el-form-item>
                             <el-form-item>
                                 <el-button
-                                        icon="el-icon-search"
                                         type="primary"
                                         class="common-button-primary"
-                                        @click="handleSearchStandard"
+                                        size="mini"
-                                        round>
+                                        style="margin-left: 5px"
+                                        @click="handleSearchStandard">
+                                  查询
                                 </el-button>
                                 <el-button
                                         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>
                     </div>

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -57,7 +57,7 @@
                 </el-form-item>
                 <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
                   <el-input
-                          v-model.number="form.standYear"
+                          v-model="form.standYear"
                           placeholder="请输入标准标准年份"
                           clearable
                   ></el-input>
@@ -1257,20 +1257,21 @@
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
-                      icon="el-icon-search"
+                      size="mini"
                       type="primary"
                       class="common-button-primary"
-                      round
                       @click="getReplaceLawsNumRowFirst">
+                查询
               </el-button>
             </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
                       class="common-button-default"
-                      icon="el-icon-refresh-left"
+                      size="mini"
-                      round
                       type="default"
-                      @click="getResetLawsNumRow"></el-button>
+                      @click="getResetLawsNumRow">
+                清空
+              </el-button>
             </el-form-item>
           </el-form>
         </div>

src/pages/processCenter/pages/creatProcess/zcrk/step1.vue

@@ -16,7 +16,7 @@
                     class="label-input-form"
                     label-width="210px"
             >
-                <div style="flex: auto; overflow: auto;" v-show="active === '1'">
+                <div style="flex: auto;" v-show="active === '1'">
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>

src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue

@@ -211,17 +211,17 @@
               </el-form-item>
               <el-form-item>
                 <el-button
-                    icon="el-icon-search"
+                    size="mini"
                     type="primary"
                     class="common-button-primary"
-                    @click="handleSearchStandard"
+                    @click="handleSearchStandard">
-                    round>
+                  查询
                 </el-button>
                 <el-button
+                    size="mini"
                     class="common-button-default"
-                    icon="el-icon-refresh-left"
+                    @click="handleResetSearch">
-                    @click="handleResetSearch"
+                  清空
-                    round>
                 </el-button>
               </el-form-item>
             </el-form>

src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue

@@ -246,17 +246,17 @@
               </el-form-item>
               <el-form-item>
                 <el-button
-                    icon="el-icon-search"
+                    size="mini"
                     type="primary"
                     class="common-button-primary"
-                    @click="getDomesticStandardTable"
+                    @click="getDomesticStandardTable">
-                    round>
+                  查询
                 </el-button>
                 <el-button
                     class="common-button-default"
-                    icon="el-icon-refresh-left"
+                    size="mini"
-                    @click="handleResetSearch"
+                    @click="handleResetSearch">
-                    round>
+                  清空
                 </el-button>
               </el-form-item>
             </el-form>

src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue

@@ -36,16 +36,14 @@
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-                    icon="el-icon-search"
                     type="primary"
                     class="common-button-primary"
                     size="mini"
-                    @click="selectProcessBtn"></el-button>
+                    @click="selectProcessBtn">查询</el-button>
             <el-button
                     class="common-button-default"
-                    icon="el-icon-refresh-left"
                     size="mini"
-                    @click="resetSelect"></el-button>
+                    @click="resetSelect">清空</el-button>
           </el-form-item>
         </div>
         <div class="search-area-item">

src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue

@@ -36,16 +36,14 @@
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-                    icon="el-icon-search"
                     type="primary"
                     class="common-button-primary"
                     size="mini"
-                    @click="selectProcessBtn"></el-button>
+                    @click="selectProcessBtn">查询</el-button>
             <el-button
                     class="common-button-default"
-                    icon="el-icon-refresh-left"
                     size="mini"
-                    @click="resetSelect"></el-button>
+                    @click="resetSelect">清空</el-button>
           </el-form-item>
         </div>
         <div class="search-area-item">

src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue

@@ -36,16 +36,14 @@
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-                    icon="el-icon-search"
                     type="primary"
                     class="common-button-primary"
                     size="mini"
-                    @click="selectProcessBtn"></el-button>
+                    @click="selectProcessBtn">查询</el-button>
             <el-button
                     class="common-button-default"
-                    icon="el-icon-refresh-left"
                     size="mini"
-                    @click="resetSelect"></el-button>
+                    @click="resetSelect">清空</el-button>
           </el-form-item>
         </div>
         <div class="search-area-item">

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -36,16 +36,14 @@
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-              icon="el-icon-search"
               type="primary"
               class="common-button-primary"
               size="mini"
-              @click="selectProcessBtn"></el-button>
+              @click="selectProcessBtn">查询</el-button>
             <el-button
               class="common-button-default"
-              icon="el-icon-refresh-left"
               size="mini"
-              @click="resetSelect"></el-button>
+              @click="resetSelect">清空</el-button>
           </el-form-item>
         </div>
         <div class="search-area-item">

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -36,16 +36,14 @@
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-                    icon="el-icon-search"
                     type="primary"
                     class="common-button-primary"
                     size="mini"
-                    @click="selectProcessBtn"></el-button>
+                    @click="selectProcessBtn">查询</el-button>
             <el-button
                     class="common-button-default"
-                    icon="el-icon-refresh-left"
                     size="mini"
-                    @click="resetSelect"></el-button>
+                    @click="resetSelect">清空</el-button>
           </el-form-item>
         </div>
         <div class="search-area-item">

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue

@@ -285,20 +285,21 @@
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
-                icon="el-icon-search"
+                size="small"
                 type="primary"
                 class="common-button-primary"
-                round
                 @click="searchLawBtn">
+              查询
             </el-button>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
                 class="common-button-default"
-                icon="el-icon-refresh-left"
+                size="small"
-                round
                 type="default"
-                @click="clearLawBtn"></el-button>
+                @click="clearLawBtn">
+              清空
+            </el-button>
           </el-form-item>
         </el-form>
         <loading :loading="lawInfoTableLoading">数据获取中</loading>

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -17,6 +17,7 @@
               :indent="0"
               :props="props"
               :data="treeList"
+              default-expanded-keys="['64df1d5522bb49c09af2']"
               highlight-current
               @node-click="treeClick"
               :filter-node-method="filterNode"
@@ -938,12 +939,16 @@
                             placeholder="根据标准号/名称查找" clearable/>
                 </el-formItem>
                 <el-form-item label="" class="search-item btn-box">
-                  <el-button size="mini" class="common-button-primary" type="primary" icon="el-icon-search"
+                  <el-button size="mini" class="common-button-primary" type="primary"
-                             @click="selectConfiguraStand(true)"></el-button>
+                             @click="selectConfiguraStand(true)">
+                    查询
+                  </el-button>
                 </el-form-item>
                 <el-form-item label="" class="search-item btn-box">
-                  <el-button size="mini" class="common-button-default" icon="el-icon-refresh-left"
+                  <el-button size="mini" class="common-button-default"
-                             @click="clearAllSearch(3)"></el-button>
+                             @click="clearAllSearch(3)">
+                    清空
+                  </el-button>
                 </el-form-item>
               </el-form>
             </div>
@@ -1674,7 +1679,7 @@
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
                   <!--            采标编号-->
-                  <el-form-item label="采标编号" prop="nameShow" class="add-form-item form-item-disabled">
+                  <el-form-item label="采标===编号" prop="nameShow" class="add-form-item form-item-disabled">
                     <el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -20,6 +20,7 @@
                   :indent="0"
                   :props="props"
                   :data="treeList"
+                  default-expanded-keys="['22179d54d4e640098e30']"
                   highlight-current
                   @node-click="treeClick"
                   :filter-node-method="filterNode"
@@ -766,20 +767,22 @@
                 </el-formItem>
                 <el-form-item class="search-item btn-box">
                   <el-button
-                    icon="el-icon-search"
                     type="primary"
                     class="common-button-primary"
                     round
                     :loading="searching"
-                    @click="searchConfiguraStand"></el-button>
+                    @click="searchConfiguraStand">
+                    查询
+                  </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
                     @click="clearAllSearch(3)"
-                  ></el-button>
+                  >
+                    清空
+                  </el-button>
                 </el-form-item>
               </el-form>
             </div>

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -18,6 +18,7 @@
                     :indent="0"
                     :props="props"
                     :data="treeList"
+                    default-expanded-keys="['64df1d5522bb49c09af6']"
                     highlight-current
                     @node-click="treeClick"
                     :filter-node-method="filterNode"

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -18,6 +18,7 @@
               :indent="0"
               :props="props"
               :data="treeList"
+              default-expanded-keys="['22179d54d4e640098e29']"
               highlight-current
               @node-click="treeClick"
               :filter-node-method="filterNode"
@@ -1320,10 +1321,14 @@
                             placeholder="根据标准号/名称查找" clearable/>
                 </el-formItem>
                 <el-form-item label="" class="search-item btn-box">
-                  <el-button class="common-button-primary" type="primary" icon="el-icon-search" size="mini" @click="selectConfiguraStand"></el-button>
+                  <el-button class="common-button-primary" type="primary" size="mini" @click="selectConfiguraStand">
+                    查询
+                  </el-button>
                 </el-form-item>
                 <el-form-item label="" class="search-item btn-box">
-                  <el-button class="common-button-default" icon="el-icon-refresh-left" @click="clearAllSearch('standCommonlySearch')" size="mini"></el-button>
+                  <el-button class="common-button-default"  @click="clearAllSearch('standCommonlySearch')" size="mini">
+                    清空
+                  </el-button>
                 </el-form-item>
               </el-form>
             </div>

src/pages/searchCenter/pages/standardSearch.vue

@@ -2760,7 +2760,6 @@
         }
         @media screen and (min-width: 1920px) {
             .header{
-                height: 65px;
             }
         }
         .standard-search-content{