Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java

@@ -133,7 +133,8 @@ public class ShiroRealm extends AuthorizingRealm {
         try {
             loginUser = commonAPI.getUserByName(username);
         }catch (SerializationException e){
-            throw e;
+            LoginException.loginException(401,"用户不存在!");
+            return null;
         }
         if (loginUser == null) {
             LoginException.loginException(401,"用户不存在!");

jero-web/src/components/libraryPush/index.vue

@@ -110,14 +110,14 @@
           this.confirmLoading = false
           this.submitLoading = false
           if (res.success) {
-            this.$message.success(res.message)
+            this.$message.success(this.$t('OperationSuccessful'))
             this.userIds = []
             this.visible = false
             this.visibleTree = false
             this.$emit('clearSelected')
             eventBUs.$emit('searchReset')
           } else {
-            this.$message.warning(res.message)
+            this.$message.warning(this.$t('operationFailed'))
           }
         })
       },

jero-web/src/views/projectManagement/components/nonConformance.vue

@@ -213,7 +213,8 @@
           serialNumber: val.serialNumber,
           actiProcInstId: val.prcId,
           primaryKeyId: val.projectTaskInventoryDetailId,
-          TaskKey: val.status == 'NotDone' ? val.taskDefinitionKey : 'hhhhh'
+          TaskKey:  val.taskDefinitionKey,
+          isDisplay: val.status == 'NotDone' ? true : false
         }
         switch (num) {
           case '2':
@@ -222,6 +223,8 @@
             query.personLiable = 'designDutyName'
             query.typeOfDeliverables = 'designDeliverableType_dictText'
             query.deliverableTemplate = 'designDeliverableTemplate'
+            query.DueDate = 'designDueDate'
+            query.remarks = 'designRemark'
             break
           case '3':
             query.flowType = 3
@@ -229,6 +232,8 @@
             query.personLiable = 'prehomoDutyName'
             query.typeOfDeliverables = 'prehomoDeliverableType_dictText'
             query.deliverableTemplate = 'prehomoDeliverableTemplate'
+            query.DueDate = 'prehomoDueDate'
+            query.remarks = 'prehomoRemark'
             break
           case '4':
             query.flowType = 4
@@ -236,6 +241,8 @@
             query.personLiable = 'verifyDutyName'
             query.typeOfDeliverables = 'verifyDeliverableType_dictText'
             query.deliverableTemplate = 'verifyDeliverableTemplate'
+            query.DueDate = 'verifyDueDate'
+            query.remarks = 'verifyRemark'
             break
         }
         let newUrl = this.$router.resolve({

jero-web/src/views/projectManagement/projectNonConformance/index.vue

@@ -349,7 +349,8 @@
           serialNumber: val.serialNumber,
           actiProcInstId: val.prcId,
           primaryKeyId: val.projectTaskInventoryDetailId,
-          TaskKey: val.status == 'NotDone' ? val.taskDefinitionKey : 'hhhhh'
+          TaskKey: val.taskDefinitionKey,
+          isDisplay: val.status == 'NotDone' ? true : false
         }
         switch (num) {
           case '2':
@@ -358,6 +359,8 @@
             query.personLiable = 'designDutyName'
             query.typeOfDeliverables = 'designDeliverableType_dictText'
             query.deliverableTemplate = 'designDeliverableTemplate'
+            query.DueDate = 'designDueDate'
+            query.remarks = 'designRemark'
             break
           case '3':
             query.flowType = 3
@@ -365,6 +368,8 @@
             query.personLiable = 'prehomoDutyName'
             query.typeOfDeliverables = 'prehomoDeliverableType_dictText'
             query.deliverableTemplate = 'prehomoDeliverableTemplate'
+            query.DueDate = 'prehomoDueDate'
+            query.remarks = 'prehomoRemark'
             break
           case '4':
             query.flowType = 4
@@ -372,6 +377,8 @@
             query.personLiable = 'verifyDutyName'
             query.typeOfDeliverables = 'verifyDeliverableType_dictText'
             query.deliverableTemplate = 'verifyDeliverableTemplate'
+            query.DueDate = 'verifyDueDate'
+            query.remarks = 'verifyRemark'
             break
         }
         let newUrl = this.$router.resolve({

jero-web/src/views/projectManagement/projectStatusBoard/index.vue

@@ -285,7 +285,7 @@
             left: 'right'
           },
           tooltip: {
-            position: 'top',
+            position: 'left',
             formatter: function(params) {
               return (
                 timeDataList[params.value[3]].name + '<br/>' +
@@ -294,7 +294,7 @@
             }
           },
           grid: {
-            top: 0,
+            top: 10,
             left: 40,
             right: 40,
             containLabel: true