修改清单 高级搜索样式

新增角色中英文切换
ota项目版本悬浮修改
参数收集搜索样式修改

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

@@ -1957,4 +1957,6 @@ module.exports = {
   UserFeedback:'User Feedback',
   Correspondingversion:'Corresponding version',
   Listcreationtime:'List creation time',
+  Chinesecharacters:'The role code cannot enter Chinese characters',
+  alreadyexistssystem:'The role encoding already exists',
 }

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

@@ -3913,4 +3913,6 @@ module.exports = {
   UserFeedback:'用户反馈',
   Correspondingversion:'对应版本',
   Listcreationtime:'清单创建时间',
+  Chinesecharacters:'角色编码不可以输入汉字',
+  alreadyexistssystem:'角色编码已存在',
 }

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

@@ -11,15 +11,15 @@
           <a @click="handleReset">{{$t('empty')}}</a>
         </template>
         <a-button-group>
-          <a-button type="primary" @click="handleOpen" style="height: 38px":style='`marginLeft:${MarginRight?MarginRight:"8px"}`'>
+          <a-button type="primary" @click="handleOpen" style="height: 38px;width: 95%" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }">
 <!--            <a-icon type="appstore" theme="twoTone" spin/>-->
             <a-icon type="filter" theme="filled"/>
-            <span>{{$t('advancedQuery')}}</span>
+            <span>{{long}}{{$t('advancedQuery')}}</span>
           </a-button>
-          <a-button style="margin-left: 8px;height: 38px" v-if="izMobile" type="primary" icon="delete" @click="handleReset"/>
+          <a-button style="margin-left: 3px;height: 38px" v-if="izMobile" type="primary" icon="delete" @click="handleReset"/>
         </a-button-group>
       </a-tooltip>
-      <a-button v-else style="height: 38px" type="primary" icon="filter" @click="handleOpen" :style='`marginLeft:${MarginRight?MarginRight:"8px"}`'>{{$t('advancedQuery')}}</a-button>
+      <a-button v-else style="height: 38px;width: 95%" type="primary" icon="filter" @click="handleOpen" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }">{{$t('advancedQuery')}}</a-button>
     </slot>
   <j-modal
     :title="$t('advancedQuery')"
@@ -358,7 +358,7 @@
           visible: false,
           value: ''
         },
-
+        long: localStorage.getItem('language') || 'zh-cn',
         visible: false,
         queryParamsModel: [],
         treeIcon: <a-icon type="file-text"/>,

jero-web/src/mixins/JeroListMixin.js

@@ -213,12 +213,12 @@ export const JeroListMixin = {
     },
     handleEdit: function (record) {
       this.$refs.modalForm.edit(record);
-      this.$refs.modalForm.title = "编辑";
+      this.$refs.modalForm.title = this.$t('edit');
       this.$refs.modalForm.disableSubmit = false;
     },
     handleAdd: function () {
       this.$refs.modalForm.add();
-      this.$refs.modalForm.title = "新增";
+      this.$refs.modalForm.title = this.$t('newlyAdded');
       this.$refs.modalForm.disableSubmit = false;
     },
     handleTableChange(pagination, filters, sorter) {

jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue

@@ -262,7 +262,7 @@
                              :label='item.versionName'
                              :key="key"
                              :value="item.projectId">
-                  <span style="display: inline-block;width: 100%" :title=" item.attestationEndTime">
+                  <span style="display: inline-block;width: 100%" :title="item.versionName + '\n' + $t('certificationEnd') + ' : ' + item.attestationEndTime ">
                     {{ item.versionName }}
                   </span>
             </a-select-option>

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

@@ -141,7 +141,7 @@
                       </div>
                     </a-col>
                   </template>
-                  <span style="float: right;overflow: hidden;margin-right: 11px"
+                  <span style="float: right;overflow: hidden;margin-right: -2px"
                         class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
 <!--                 v-if="this.$route.query.it === undefined"-->
@@ -1084,6 +1084,24 @@
       getQueryDutyTerritory() {
         getAction('/params/collectManifest/queryDutyTerritory', { id: this.$route.query.id }).then((res) => {
           if (res.success) {
+            // res.result.push(
+            //   {
+            //   value:'aaa',
+            //   key:'aaa'
+            //   },
+            //   {
+            //     value:'bbb',
+            //     key:'bbb'
+            //   },
+            //   {
+            //     value:'ccc',
+            //     key:'ccc'
+            //   },
+            //   {
+            //     value:'ddd',
+            //     key:'ddd'
+            //   },
+            // )
             this.dutyTerritoryList = res.result || []
           } else {
             this.dutyTerritoryList = []

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -81,15 +81,15 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                 <a @click="handleToggleSearch" :style="{ marginLeft: long == 'en-us'?'-6px':'8px' }">
-                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
-                                       @handleSuperQuery="handleSuperQuery"
-                                       :fieldList="fieldList"/>
-                  <a @click="handleToggleSearch" style="margin-left: 8px">
                     {{ !toggleSearchStatus ? $t('open') : $t('away') }}
                     <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
                   </a>
+                  <a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                       @handleSuperQuery="handleSuperQuery"
+                                       :fieldList="fieldList"/>
                </a-col>
             </span>
         </a-row>

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

@@ -15,15 +15,6 @@
                        v-model="queryParam.serialNumber"></j-input>
             </div>
           </a-col>
-          <!--          <a-col :md="6" :sm="8">-->
-          <!--            <div class="box-title-text">-->
-          <!--              <div class="title-text" :title="$t('title')">-->
-          <!--                <span>{{ $t('title') }}</span>-->
-          <!--              </div>-->
-          <!--              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"-->
-          <!--                       v-model="queryParam.title"></j-input>-->
-          <!--            </div>-->
-          <!--          </a-col>-->
           <a-col :md="6" :sm="8">
             <div class="box-title-text">
               <div class="title-text" :title="$t('statisticalNodes')">
@@ -116,17 +107,18 @@
           <!--              </div>-->
           <!--            </a-col>-->
           <!--          </template>-->
-          <span style="float: right;overflow: hidden;margin-right: 11px; " class="table-page-search-submitButtons">
+          <span style="float: right;overflow: hidden;margin-right: 11px;" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                 <a @click="handleToggleSearch" :style="{ marginLeft: long == 'en-us'?'-6px':'8px' }">
-                  <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                                                                {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                  <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                                                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                                       @handleSuperQuery="handleSuperQuery"
+                                                     </a>
-                                       :fieldList="fieldList"/>
+                    <a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" @click="searchReset">{{$t('reset')}}</a-button>
-                                                   <a @click="handleToggleSearch" style="margin-left: 8px">
+                    <a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
-                                                              {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+                    <globalAdvancedQuery ref="globalAdvancedQueryRef"
-                                                              <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+                                         @handleSuperQuery="handleSuperQuery"
-                                                   </a>
+                                         :fieldList="fieldList"/>
+
                </a-col>
             </span>
         </a-row>
@@ -750,6 +742,7 @@
         pageNo: 1,
         pageSize: 50,
         total: 0,
+        long:'',
         roleSwitchingList: [],
         formInlineQuestion: {},
         formInlineReset: {},
@@ -1540,6 +1533,7 @@
         this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibilityList.dutyTerritoryName
         this.queryParam = { ...this.queryParam }
       }
+      this.long = localStorage.getItem('language') || 'zh-cn'
       this.JLoading = true
       this.getHeader()
       this.queryLawEngineerByProjectId()

jero-web/src/views/system/modules/RoleModal.vue

@@ -16,22 +16,22 @@
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="角色名称">
+          :label="$t('roleName')">
-          <a-input placeholder="请输入角色名称" v-decorator="[ 'roleName', validatorRules.roleName]" />
+          <a-input :placeholder="$t('pleaseEnter')+$t('roleName')" v-decorator="[ 'roleName', validatorRules.roleName]" />
         </a-form-item>
 
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="角色编码">
+          :label="$t('RoleCode')">
-          <a-input placeholder="请输入角色编码" :disabled="roleDisabled" v-decorator="[ 'roleCode', validatorRules.roleCode]" />
+          <a-input :placeholder="$t('pleaseEnter')+$t('RoleCode')" :disabled="roleDisabled" v-decorator="[ 'roleCode', validatorRules.roleCode]" />
         </a-form-item>
 
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="描述">
+          :label="$t('describe')">
-          <a-textarea :rows="5" placeholder="请输入描述" v-decorator="[ 'description', validatorRules.description ]" />
+          <a-textarea :rows="5" :placeholder="$t('pleaseEnter')+$t('describe')" v-decorator="[ 'description', validatorRules.description ]" />
         </a-form-item>
 
       </a-form>
@@ -64,18 +64,18 @@
         validatorRules:{
           roleName:{
             rules: [
-              { required: true, message: '请输入角色名称!' },
+              { required: true, message: this.$t('roleName') + this.$t('cannotEmpty')},
-              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
+              { min: 0, max: 30, message: this.$t('cantExeed') + '30' + this.$t('characters'), trigger: 'blur' }
             ]},
           roleCode:{
             rules: [
-              { required: true, message: '请输入角色名称!'},
+              { required: true, message: this.$t('RoleCode') + this.$t('cannotEmpty')},
-              { min: 0, max: 64, message: '长度不超过 64 个字符', trigger: 'blur' },
+              { min: 0, max: 64, message: this.$t('cantExeed') + '64' + this.$t('characters'), trigger: 'blur' },
               { validator: this.validateRoleCode}
             ]},
           description:{
             rules: [
-              { min: 0, max: 126, message: '长度不超过 126 个字符', trigger: 'blur' }
+              { min: 0, max: 126, message: this.$t('cantExeed') + '126' + this.$t('characters'), trigger: 'blur' }
             ]}
         },
       }
@@ -141,7 +141,7 @@
       },
       validateRoleCode(rule, value, callback){
         if(/[\u4E00-\u9FA5]/g.test(value)){
-          callback("角色编码不可输入汉字!");
+          callback(this.$t('Chinesecharacters'));
         }else{
           var params = {
             tableName: "sys_role",
@@ -154,7 +154,7 @@
               callback();
             }else{
               if(res.message == '该值不可用，系统中已存在！') {
-                callback('角色编码已存在！');
+                callback(this.$t('alreadyexistssystem'));
               }
             }
           });