Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java

@@ -211,7 +211,7 @@ public class SyncDataServiceImpl implements ISyncDataService{
                     if (!localUserMap.containsKey(ppEmployee.getId())) {
                         //删除数据库中与该账户相同的数据
                         if(StringUtils.isNotBlank(ppEmployee.getId())) {
-                            sysUserService.removeById(ppEmployee.getId());
+//                            sysUserService.removeById(ppEmployee.getId()); // 这个为什么是逻辑删除
                             log.info("需要新增的用户信息为:" + JSONObject.toJSONString(ppEmployee));
                             SysUser newUser = sysUserService.addPPUserInfo(ppEmployee);
                             localUserMap.put(ppEmployee.getId(), newUser);
@@ -260,16 +260,16 @@ public class SyncDataServiceImpl implements ISyncDataService{
             }
             List<PPEmployee> userEmailInfoList = JSONObject.parseArray(user.get("people_contact_email").toString(), PPEmployee.class);
             if (CollectionUtil.isNotEmpty(userEmailInfoList)) {
-                PPEmployee userEmailInfo = userEmailInfoList.stream().filter(e->"WORK".equals(e.getEmail_type())).collect(Collectors.toList()).get(0);
+                List<PPEmployee> userEmailInfo = userEmailInfoList.stream().filter(e->"WORK".equals(e.getEmail_type())).collect(Collectors.toList());
-                if (ObjectUtil.isNotEmpty(userEmailInfo)) {
+                if (CollectionUtil.isNotEmpty(userEmailInfo)) {
-                    userMainInfo.setEmail_address(userEmailInfo.getEmail_address());
+                    userMainInfo.setEmail_address(userEmailInfo.get(0).getEmail_address());
                 }
             }
             List<PPEmployee> userPhoneInfoList = JSONObject.parseArray(user.get("people_contact_phone").toString(), PPEmployee.class);
             if (CollectionUtil.isNotEmpty(userPhoneInfoList)) {
-                PPEmployee userPhoneInfo = userPhoneInfoList.stream().filter(e->"WORK".equals(e.getPhone_type()) && "Mobile".equals(e.getPhone_device_type())).collect(Collectors.toList()).get(0);
+                List<PPEmployee> userPhoneInfo = userPhoneInfoList.stream().filter(e->"WORK".equals(e.getPhone_type()) && "Mobile".equals(e.getPhone_device_type())).collect(Collectors.toList());
-                if (ObjectUtil.isNotEmpty(userPhoneInfo)) {
+                if (CollectionUtil.isNotEmpty(userPhoneInfo)) {
-                    userMainInfo.setFormatted_phone_number(userPhoneInfo.getFormatted_phone_number());
+                    userMainInfo.setFormatted_phone_number(userPhoneInfo.get(0).getFormatted_phone_number());
                 }
             }
 

jero-web/src/common/lang/en-us.js

@@ -712,6 +712,7 @@ module.exports = {
   uploadTime: 'Upload time',
   enclosure: 'Enclosure',
   // 认证
+  Theselectedconfiguration: 'The selected item has incomplete data collection, unable to add configuration',
   theCurrent: 'The current status of this data is',
   thisbuttonCompleted: 'This button can only be operated when the status is completed',
   Frozenstatus: 'Frozen status, can only be viewed',

jero-web/src/common/lang/zh-cn.js

@@ -723,6 +723,7 @@ module.exports = {
   uploadTime: '上传时间',
   enclosure: '附件',
   // 认证
+  Theselectedconfiguration: '所选项目有未完成收集数据，不能添加配置',
   theCurrent: '此数据当前状态为',
   thisbuttonCompleted: '当状态为"已完成"时，才可操作此按钮',
   Frozenstatus: '冻结状态,仅可以查看',

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

@@ -10,19 +10,19 @@
         :wrapper-col='wrapperCol'
       >
         <a-row :gutter='24'>
-<!--          <a-col :span='9'>-->
+          <a-col :span='9'>
-<!--            <a-form-model-item ref='paramsTemplateName' :label="$t('fullName')" prop='paramsTemplateName'>-->
+            <a-form-model-item ref='paramsTemplateName' :label="$t('fullName')" prop='paramsTemplateName'>
-<!--              <a-input-->
+              <a-input
-<!--                v-model='form.realname' />-->
+                v-model='form.realname' />
-<!--            </a-form-model-item>-->
+            </a-form-model-item>
-<!--          </a-col>-->
+          </a-col>
           <a-col :span='9'>
             <a-form-model-item ref='paramsTemplateName' :label="$t('accountNumber')" prop='paramsTemplateName'>
               <a-input
                 v-model='form.username' />
             </a-form-model-item>
           </a-col>
-          <a-col :span='6'>
+          <a-col :span='6' style='margin-top: 5px;'>
             <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
             <a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
           </a-col>
@@ -141,6 +141,9 @@ export default {
       if(this.form.username !== undefined) {
         params.username = `*${this.form.username}*`
       }
+      if(this.form.realname !== undefined) {
+        params.realname = `*${this.form.realname}*`
+      }
       getAction(`sys/user/page`, params).then(res => {
         if (res.success) {
           this.areaTable = [...res.result.records]

jero-web/src/views/parameter/ParameterTemplate/index.vue

@@ -60,7 +60,7 @@
           <a @click="entryNameClick(record)">{{text}}</a>
         </span>
         <span slot="titleName" slot-scope="text,record" :title="text">
-                  {{ text && text.length > 100 ? text.slice(0, 99) + '...' : text }}
+                  {{ text && text.length > 80 ? text.slice(0, 79) + '...' : text }}
         </span>
         <span slot="operation" slot-scope="text,record">
             <a class="text-operation" v-has="'params:template:edit'" @click="edit(record)">{{$t('edit')}}</a>

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

@@ -80,7 +80,7 @@
                               :projectId='this.$route.query.id'></parameter-template-add>
     </a-modal>
     <!--    配置-->
-    <configure ref="configureRef" :url='url' :itemId='itemId'/>
+    <configure ref="configureRef" :url='url' :itemId='itemId' :itemRow='itemRow'/>
     <!--    历史版本-->
     <a-modal v-model="historicalVisible" :title="$t('historicalVersion')" width='750px' :footer="null">
       <historical-version v-if='historicalVisible' :historicalRow='historicalRow'></historical-version>
@@ -188,7 +188,8 @@
         templatetitleId: '',
         rowId: '',
         version: 0,
-        itemId: '',
+        itemId: '', // 配置id
+        itemRow: {}, // 配置一行数据
         historicalVisible: false,
         historicalRow: {}, // 历史版本得数据
         drawerVisible: false,
@@ -239,8 +240,9 @@
       },
       // 配置
       configure(item) {
-        this.itemId = item.id
+          this.itemId = item.id
-        this.$refs.configureRef.addModel(item.id)
+          this.itemRow = item
+          this.$refs.configureRef.addModel(item.id)
       },
       handleCancel(val) {
         this.areaVisible = val

jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue

@@ -40,7 +40,7 @@
                 v-model='form.paramsTemplateName' />
             </a-form-model-item>
           </a-col>
-          <a-col :span='6'>
+          <a-col :span='6' style='margin-top: 5px'>
             <a-button class='box-button' type='primary' @click='searchQuery'>{{ $t('query') }}</a-button>
             <a-button class='box-button' style='margin-left: 8px' @click='searchReset'>{{ $t('reset') }}</a-button>
           </a-col>

jero-web/src/views/projectManagement/dialog/configure.vue

@@ -130,6 +130,11 @@ export default {
       type: Object,
       default: '',
       require: true
+    },
+    itemRow: {
+      type: Object,
+      default: '',
+      require: true
     }
   },
   data() {
@@ -200,14 +205,18 @@ export default {
       })
     },
     addConfiguration(item) {
-      this.paramsConfigEOList.splice(item.displaySeq + 1,0,{
+      if(this.itemRow.configFlag) {
-        id: '',
+        this.paramsConfigEOList.splice(item.displaySeq + 1,0,{
-        configName: '', // 配置名称
+          id: '',
-        version: '', // 版本
+          configName: '', // 配置名称
-        carType: '', // 车型
+          version: '', // 版本
-        battery: '', // 电池
+          carType: '', // 车型
-        motor: '', // 电机
+          battery: '', // 电池
-      })
+          motor: '', // 电机
+        })
+      } else {
+        this.$message.warning(this.$t('Theselectedconfiguration'))
+      }
     },
     deleteConfiguration(displaySeq,index) {
       if(this.paramsConfigEOList.length === 1) {