From 1e78dae43a74ff6ea9c8bb6ba779349b5867a625 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 25 May 2022 14:17:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/zh-cn.js             |  4 +-
 jero-web/src/components/page/GlobalHeader.vue | 23 ++++++-----
 .../dashboard/components/customContent.vue    | 39 ++++++++++++++-----
 .../reviewedByThePersonInCharge.vue           |  3 ++
 .../processForm/taskListProcess/index.vue     |  8 +++-
 5 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 91836919a..0343b852e 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -596,11 +596,11 @@ module.exports = {
   certificationType: '认证类型',
   certificationLevel: '认证级别',
   areaOfResponsibility: '责任领域',
-  confirmationOfDesignConformity: '法规设计符合性确认',
+  confirmationOfDesignConformity: '设计符合性确认',
   Deliverables: '交付物',
   personLiable: '责任人',
   PrehomoConfirmation: 'Pre-Homo确认',
-  verificationAndConformityconfirmation: '法规验证符合性确认',
+  verificationAndConformityconfirmation: '验证符合性确认',
   StandardImplementationDate: '标准实施日期',
   regulatoryEngineer: '法规工程师',
   certifiedEngineer: '认证工程师',
diff --git a/jero-web/src/components/page/GlobalHeader.vue b/jero-web/src/components/page/GlobalHeader.vue
index 698c963c5..7e60e76ac 100644
--- a/jero-web/src/components/page/GlobalHeader.vue
+++ b/jero-web/src/components/page/GlobalHeader.vue
@@ -6,16 +6,18 @@
     :style="{ padding: '0' , background:'#fff'}">
 
     <div v-if="mode === 'sidemenu'" class="header" :class="theme">
-<!--      <a-icon-->
-<!--        v-if="device==='mobile'"-->
-<!--        class="trigger"-->
-<!--        :type="collapsed ? 'menu-fold' : 'menu-unfold'"-->
-<!--        @click="toggle"></a-icon>-->
-<!--      <a-icon-->
-<!--        v-else-->
-<!--        class="trigger"-->
-<!--        :type="collapsed ? 'menu-unfold' : 'menu-fold'"-->
-<!--        @click="toggle"/>-->
+      <a-icon
+        v-if="device==='mobile'"
+        class="trigger"
+        style="color: #000"
+        :type="collapsed ? 'menu-fold' : 'menu-unfold'"
+        @click="toggle"></a-icon>
+      <a-icon
+        v-else
+        class="trigger"
+        style="color: #000"
+        :type="collapsed ? 'menu-unfold' : 'menu-fold'"
+        @click="toggle"/>
 
 <!--      <span v-if="device === 'desktop'">欢迎进入 蔚来法规</span>-->
 <!--      <span v-else>Jero-Boot</span>-->
@@ -179,6 +181,7 @@
         }
       }
       .trigger {
+        background: #000;
         line-height: 64px;
         &:hover {
           background: rgba(0, 0, 0, 0.05);
diff --git a/jero-web/src/views/dashboard/components/customContent.vue b/jero-web/src/views/dashboard/components/customContent.vue
index f1865df84..b6ba8bfcc 100644
--- a/jero-web/src/views/dashboard/components/customContent.vue
+++ b/jero-web/src/views/dashboard/components/customContent.vue
@@ -1,10 +1,12 @@
 <template>
   <div class="customContent-box">
-    <div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index">
-      <img src="../../../assets/jspg.png" class="img" alt="">
-      <div class="text">{{item.iconName}}</div>
+    <div class="box-content-top">
+      <div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index" @click="urlClick(item)">
+        <img :src="item.iconPath" class="img" alt="">
+        <div class="text">{{item.iconName}}</div>
+      </div>
     </div>
-    <div class="box-content" @click="customClick()">
+    <div class="box-content" @click="customClick()" style=";margin-top: 0">
       <img src="../../../assets/zdy.png" class="img" alt="">
       <div class="text">{{$t('custom')}}</div>
     </div>
@@ -22,7 +24,7 @@
         <div style="display: inline-block" v-for="(item,index) in dataSourceTopList">
           <div class="box-top" @click="statusClick(1,item,index)">
             <div class="box-content">
-              <img src="../../../assets/jspg.png" class="img" alt="">
+              <img :src="item.iconPath" class="img" alt="">
               <div class="text">{{item.iconName}}</div>
             </div>
           </div>
@@ -101,10 +103,17 @@
         dataSourceTopList.forEach(res => {
           dataSource.unshift(res)
         })
-        postAction(this.url.add, dataSource).then((res) => {
+        dataSource.forEach((res, index) => {
+          res.sort = index
+        })
+        let query = {
+          listMap: dataSource
+        }
+        postAction(this.url.add, query).then((res) => {
           if (res.success) {
             this.visible = false
             this.confirmLoading = false
+            this.getList()
             this.$message.success(this.$t('OperationSuccessful'))
           } else {
             this.$message.warning(this.$t('operationFailed'))
@@ -115,6 +124,11 @@
       handleCancel() {
         this.visible = false
       },
+      urlClick(item) {
+        this.$router.push({
+          path: item.url
+        })
+      },
       statusClick(num, item, index) {
         if (num == 1) {
           if (this.dataSourceTopList && this.dataSourceTopList.length > 0) {
@@ -137,9 +151,6 @@
           }
         } else {
           this.dataSourceTopList.push(item)
-          for (let i = 0; i < this.dataSourceTopList.length; i++) {
-            this.dataSourceTopList[i].sort = i
-          }
           if (this.dataSource && this.dataSource.length > 0) {
             for (let i = 0; i < this.dataSource.length; i++) {
               if (this.dataSource[i].id == item.id) {
@@ -159,11 +170,20 @@
     width: 100%;
     text-align: center;
 
+    .box-content-top {
+      max-width: calc(100% - 130px);
+      display: inline-block;
+      overflow: hidden;
+      white-space: nowrap;
+      float: left;
+    }
+
     .box-content {
       text-align: center;
       display: inline-block;
       margin-right: 30px;
       cursor: pointer;
+      width: 100px;
 
       .img {
         width: 44px;
@@ -196,6 +216,7 @@
       margin-right: 30px;
       cursor: pointer;
       margin-bottom: 30px;
+      width: 100px;
 
       .img {
         width: 44px;
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index 1c204b22b..83255d637 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -253,6 +253,9 @@
           }
         })
       },
+      submitNoRule(callBack) {
+        callBack(this.formInline)
+      },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 08c8a8f83..7dd2bde28 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -222,7 +222,9 @@
         this.textLoading = this.$t('terminationProcessing')
         this.loading = true
         this.queryBy.reviewResult = 'Termination of task'
-        this.completeTask({ flag: 2, operatorTime: operatorTime })
+        this.$refs.reviewedByThePersonInChargeRef.submitNoRule((res) => {
+          this.completeTask({ flag: 2, operatorTime: operatorTime, ...res })
+        })
       },
       adopt(operatorTime) {
         this.$refs.reviewedByThePersonInChargeRef.submit((res) => {
@@ -241,7 +243,9 @@
         } else {
           this.queryBy.reviewResult = 'No rating'
         }
-        this.completeTask({ flag: 1, operatorTime: operatorTime })
+        this.$refs.reviewedByThePersonInChargeRef.submitNoRule((res) => {
+          this.completeTask({ flag: 1, operatorTime: operatorTime, ...res })
+        })
       },
       Resubmit(operatorTime) {
         this.$refs.reviewedByThePersonInChargeRef.submit((res) => {