From 73c4bdf9f455cb5c15dc6e5466b82f76f815beb4 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 22 Nov 2021 10:48:30 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E8=A6=81=E5=B1=95=E5=BC=80=EF=BC=8C=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E5=AD=90=E6=A0=91=E9=BB=98=E8=AE=A4=E6=94=B6?=
 =?UTF-8?q?=E8=B5=B7=EF=BC=8C=E5=8F=AA=E6=9C=89=E7=AC=AC=E4=B8=80=E5=B1=82?=
 =?UTF-8?q?=E5=AD=90=E6=A0=91=E5=B1=95=E5=BC=80=20=E5=92=8C=E4=BB=96?=
 =?UTF-8?q?=E9=A2=84=E6=9C=9F=E7=9A=84=E7=BB=93=E6=9E=9C=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E6=AF=AB=E4=B8=8D=E5=B7=AE=EF=BC=8C=E5=8A=A9=E5=8A=9B=E6=AF=8F?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=A2=A6=E6=83=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                    | 1 +
 .../components/EnterpriseStandardDatabase.vue                    | 1 +
 .../regulatoryRepository/foreignRegulationsDatabase/index.vue    | 1 +
 .../foreignStandardsAndRegulations/index.vue                     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 38acdcbe4..f111f0532 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/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"
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 505e10a72..93e63f2c8 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/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"
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 064cd101c..266d15605 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/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"
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 0ca0a8d12..e5190b838 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/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"

From d6179082973f0c616d393e070961f4af6ab75086 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 22 Nov 2021 11:02:18 +0800
Subject: [PATCH 02/18] commit

---
 src/components/roleTree/index.vue | 119 +++++++++++++++++-------------
 1 file changed, 67 insertions(+), 52 deletions(-)

diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 9abd493f7..d630fa787 100644
--- a/src/components/roleTree/index.vue
+++ b/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) {
-                if (!type) {
-                    if (this.nodeList.length > 0) {
-                        for (let a = 0; a < this.nodeList.length; a ++) {
-                            if (row.id === this.nodeList[a]) {
-                                this.nodeList.splice(a, 1)
-                            }
+            changeInput:debounce(function (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
+                }
+            }),
+            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) {
-                    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 {
+                if (this.checkBox) {
                     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()

From b475ea03dcb746b95a6ece2c3ed7988dfbf69e3d Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 22 Nov 2021 11:03:47 +0800
Subject: [PATCH 03/18] bzrk Step4 20xxx

---
 src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 55e39ac25..119525d4d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/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>

From 8598e4ae3d1264ccfd38af416d08b4c973087011 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 22 Nov 2021 11:30:45 +0800
Subject: [PATCH 04/18] =?UTF-8?q?OCR=E8=AF=86=E5=88=AB=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=B8=8A=E4=BC=A0=EF=BC=8C=E8=AF=A5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=A6=81=E5=8A=A0=E4=B8=AA=E6=A3=80=E7=B4=A2=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E4=BB=8E=E5=BA=93=E4=B8=AD=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=20=EF=BC=88=E4=BC=98=E5=8C=96=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E7=8E=B0=E5=9C=A8=E5=8F=AF=E4=BB=A5=E5=92=8C?=
 =?UTF-8?q?=E5=BA=93=E9=87=8C=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=80=E6=A8=A1?=
 =?UTF-8?q?=E4=B8=80=E6=A0=B7=E4=BA=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localTool/standardRecognition/index.vue   | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index dd1952cb4..e758a060c 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -315,7 +315,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 +335,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 +345,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 +356,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-else>{{ 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>
 
               </template>
             </el-table-column>
@@ -368,7 +368,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 +378,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 +393,10 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
-                    textStatusMap[scope.row.textStatus]
+                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{
+                    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 +406,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 +428,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 +445,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 +463,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 +479,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 +496,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 +518,13 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
-                    textStatusMap[scope.row.textStatus]
+                <span v-if="scope.row.standTextStatusShow === '废止' || scope.row.standTextStatusShow === '被代替'" style="color: #F56C6C">{{
+                    scope.row.standTextStatusShow
                   }}</span>
-                <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
-                    textStatusMap[scope.row.textStatus]
+                <span v-else-if="scope.row.standTextStatusShow === '——' " style="color: #409EFF">{{
+                    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 +992,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
-        //文本状态，下次一定
-        // this.uploadFilesdfEo.fileType = this.handleSelectTableList[0].textStatus || this.handleSelectTableList[0].standStatusShow
+        // console.log('999',this.handleSelectTableList[0])
+        //文本状态，下次一定(tnnd，人家的文本状态和这个的文本状态都不是一个东西，不用画蛇添足）
+        // this.uploadFilesdfEo.fileType = this.handleSelectTableList[0].standTextStatusShow || this.handleSelectTableList[0].standStatusShow
         this.selectModal = false
       }
       console.log('确定',this.handleSelectTableList)

From 5ea7ae8c3b649b5d10d5e0b178f2845bc397f004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 22 Nov 2021 14:17:46 +0800
Subject: [PATCH 05/18] commit

---
 src/pages/home2/components/todoList/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index dc89ece40..83eb643c1 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/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">
-           <span @click="dealWith(item)">{{ item.prcName }}</span>
+         <div style="height: 30px">
+           <span @click="dealWith(item)" style="line-height: 30px">{{ item.prcName }}</span>
          </div>
       </li>
     </ul>

From 03da3d36e38a2d9bb98af03cff18445d8c9a61c4 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 22 Nov 2021 14:18:21 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home2/components/empennage/index.vue   | 11 ++++++++++-
 src/pages/home2/components/searchGroup/index.vue |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue
index cf1404463..e5dff05af 100644
--- a/src/pages/home2/components/empennage/index.vue
+++ b/src/pages/home2/components/empennage/index.vue
@@ -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>
 
diff --git a/src/pages/home2/components/searchGroup/index.vue b/src/pages/home2/components/searchGroup/index.vue
index f919ddf18..f3af3f4f8 100644
--- a/src/pages/home2/components/searchGroup/index.vue
+++ b/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;

From 3ed3ce1b981051755a11e3c5d37c2b2dbb1ab79f Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 22 Nov 2021 14:28:30 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 3389bc52a..20b84633e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -373,7 +373,7 @@ export default {
   }
 
   .el-main {
-    padding: 10px 10px 0 10px;
+    padding: 15px 10px 0 10px;
   }
   .content-box {
     display: flex;

From 8de85832d6acd13dcff2f166c6d5d1c77a8e9d60 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 22 Nov 2021 14:31:52 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A4=96=E9=93=BE?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E6=96=B0=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home2/components/empennage/index.vue      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue
index e5dff05af..db012f25f 100644
--- a/src/pages/home2/components/empennage/index.vue
+++ b/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>

From 39a76c67f20eb913dcb4b32df66c194d18b887c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 22 Nov 2021 14:51:24 +0800
Subject: [PATCH 09/18] commit

---
 src/components/personalCenter/index.vue        | 18 ++++--------------
 .../searchCenter/pages/standardSearch.vue      |  1 -
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue
index 85867ce15..5d75c2133 100644
--- a/src/components/personalCenter/index.vue
+++ b/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;
-  justify-content: space-between;
-  background-color: #171E4A;
-  color: #fff;
+  //display: flex;
+  //justify-content: space-between;
+  //background-color: #171E4A;
+  //color: #fff;
 
   .header-left {
     float: left;
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index de91fb48c..efcb33c68 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -2760,7 +2760,6 @@
         }
         @media screen and (min-width: 1920px) {
             .header{
-                height: 65px;
             }
         }
         .standard-search-content{

From 1bd8be8d04afa61e49a8c7caffaab3e2d669a075 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 22 Nov 2021 14:58:02 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localTool/standardRecognition/index.vue   | 11 ++++----
 .../pages/creatProcess/bzrk/step1.vue         | 25 +++++++++++--------
 .../pages/creatProcess/bzrk/step4.vue         | 11 ++++----
 .../tabComponents/processCenter/index.vue     |  6 ++---
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index e758a060c..669fd8666 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/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>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 0cfdaa0bc..ea6b7430c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/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"
-                                    round
+                                    size="mini"
                                     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"
-                                        round>
+                                        size="mini"
+                                        style="margin-left: 5px"
+                                        @click="handleSearchStandard">
+                                  查询
                                 </el-button>
                                 <el-button
                                         class="common-button-default"
-                                        icon="el-icon-refresh-left"
-                                        @click="handleResetSearch"
-                                        round></el-button>
+                                        size="mini"
+                                        @click="handleResetSearch">
+                                  清空
+                                </el-button>
                             </el-form-item>
                         </el-form>
                     </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 119525d4d..5ebcc9eac 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -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"
-                      round
+                      size="mini"
                       type="default"
-                      @click="getResetLawsNumRow"></el-button>
+                      @click="getResetLawsNumRow">
+                清空
+              </el-button>
             </el-form-item>
           </el-form>
         </div>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 4a0427751..73022ed85 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/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">

From 8c2f82442d4ae45a08fe0f342bdeed2e56dce9ca Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 22 Nov 2021 14:59:08 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E5=9C=A8?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=87=BA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 20b84633e..2f9429400 100644
--- a/src/App.vue
+++ b/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>

From 08e8156edb0a9f7089da4c7f6beb560f574264ff Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 22 Nov 2021 15:00:34 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/listTracking.vue                             | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index 2b1e09ec3..7606c4c8b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/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"
-                round
+                size="small"
                 type="default"
-                @click="clearLawBtn"></el-button>
+                @click="clearLawBtn">
+              清空
+            </el-button>
           </el-form-item>
         </el-form>
         <loading :loading="lawInfoTableLoading">数据获取中</loading>

From 244ca20a4f8351df5ecb3d3b734a75dc5288c37a Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 22 Nov 2021 15:04:17 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E6=9F=A5=E8=AF=A2,=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomFormComponents/InputForStandards.vue     |  6 ++++--
 .../InputForStandardsForEnterprise.vue             |  7 ++++---
 .../InputForStandardsForForeign.vue                |  7 ++++---
 src/pages/details/otherStandardDetails/index.vue   |  4 ++--
 .../domesticStandardsAndRegulations/index.vue      | 14 +++++++++-----
 .../components/EnterpriseStandardDatabase.vue      | 10 ++++++----
 .../foreignStandardsAndRegulations/index.vue       |  8 ++++++--
 7 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index 39274d02a..7ab9a7286 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/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>
diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
index 18586f89e..8c74fdbfb 100644
--- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
+++ b/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>
diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
index bcd048c27..7651cc3ab 100644
--- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue
+++ b/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>
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index d414d8724..7f91d242c 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -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>
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index f111f0532..a2e4a51ff 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -939,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"
-                             @click="selectConfiguraStand(true)"></el-button>
+                  <el-button size="mini" class="common-button-primary" type="primary"
+                             @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"
-                             @click="clearAllSearch(3)"></el-button>
+                  <el-button size="mini" class="common-button-default"
+                             @click="clearAllSearch(3)">
+                    清空
+                  </el-button>
                 </el-form-item>
               </el-form>
             </div>
@@ -1675,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>
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 93e63f2c8..2c55be7df 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -767,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>
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index e5190b838..0368a7373 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1321,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>

From 97a5f4578846bc6a6eb784f85683d38a7f014d55 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 22 Nov 2021 15:09:24 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/zczqyj/step1.vue              | 12 ++++++------
 .../pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue
index ebb071570..7d74ea179 100644
--- a/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue
+++ b/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"
-                    round>
+                    @click="handleSearchStandard">
+                  查询
                 </el-button>
                 <el-button
+                    size="mini"
                     class="common-button-default"
-                    icon="el-icon-refresh-left"
-                    @click="handleResetSearch"
-                    round>
+                    @click="handleResetSearch">
+                  清空
                 </el-button>
               </el-form-item>
             </el-form>
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue
index 6e46ac8fa..6296a6e22 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue
+++ b/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"
-                    round>
+                    @click="getDomesticStandardTable">
+                  查询
                 </el-button>
                 <el-button
                     class="common-button-default"
-                    icon="el-icon-refresh-left"
-                    @click="handleResetSearch"
-                    round>
+                    size="mini"
+                    @click="handleResetSearch">
+                  清空
                 </el-button>
               </el-form-item>
             </el-form>

From 1748fe5d6c929c77593d7be9237070656be71d5b Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 22 Nov 2021 15:18:51 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processList/tabComponents/alreadyProcess/index.vue      | 6 ++----
 .../pages/processList/tabComponents/alreadySend/index.vue   | 6 ++----
 .../processList/tabComponents/monitorProcess/index.vue      | 6 ++----
 .../pages/processList/tabComponents/taskDraft/index.vue     | 6 ++----
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
index 962af638b..305570678 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+++ b/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">
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
index fbb422655..135be39c7 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+++ b/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">
diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
index fd285bc97..0955129cd 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+++ b/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">
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index f0b5823ce..b6bfe5df8 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/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">

From 4c7f49876fbac12f6a7a19998e9375762c5ccb92 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 22 Nov 2021 15:56:46 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E7=A8=BF=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 7f91d242c..f2af50bfe 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/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)"

From fc64506d52cf8f6f4580a1f6906dc97414d25caf Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 22 Nov 2021 15:57:27 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomFormComponents/InputForStandards.vue       | 2 +-
 .../CustomFormComponents/InputForStandardsForForeign.vue        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue
index 7ab9a7286..be2036358 100644
--- a/src/components/CustomFormComponents/InputForStandards.vue
+++ b/src/components/CustomFormComponents/InputForStandards.vue
@@ -185,7 +185,7 @@ export default {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         total: 0,
-        standType: 'ALL',
+        standType: 'INLAND',
         quoteIdList: '',
         validFlag: '0',
         menuId: 'nomenu'
diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
index 7651cc3ab..8b758b590 100644
--- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue
+++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue
@@ -196,7 +196,7 @@ export default {
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         total: 0,
-        standType: 'ALL',
+        standType: 'FOREIGN',
         quoteIdList: '',
         validFlag: '0',
         menuId: 'nomenu'

From c978efe84b6b6059ab541edacfcb7f3d45e53ddf Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 22 Nov 2021 16:10:26 +0800
Subject: [PATCH 18/18] =?UTF-8?q?orc=E8=AF=86=E5=88=AB=E7=9A=84=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E8=A1=A8=E6=A0=BC=E5=AD=97=E6=AE=B5=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/languages/cn.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/languages/cn.js b/src/assets/languages/cn.js
index 7542fe423..ee1dbbd3d 100644
--- a/src/assets/languages/cn.js
+++ b/src/assets/languages/cn.js
@@ -152,8 +152,8 @@ export const m = {
   title: '标题',
   creator: '创建人',
   serialNumber: '序号',
-  dataType: '资料类型',
-  standardNumberAndPolicyNumber: '标准号/政策号',
+  dataType: '标准类别',
+  standardNumberAndPolicyNumber: '标准编号/政策编号',
   standardNameAndPolicyName: '标准名称/政策名称',
   textState: '文本状态',
   conversionResults: '转换结果',