WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改中英文切换

Browse Source
This commit is contained in:
qq787203167
2022-02-28 17:25:08 +08:00
parent 43f5950aa4
commit cf2e6400b3
11 changed files with 175 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/assets/less/common.less
+1 -1
View File
@@ -1,6 +1,6 @@
/*列表上方操作按钮区域*/ /*列表上方操作按钮区域*/
.ant-card-body .table-operator { .ant-card-body .table-operator {
margin-bottom: 18px; margin-bottom: 29px;
text-align: right; text-align: right;
} }
jero-web/src/common/lang/en-us.js
+6
View File
@@ -343,4 +343,10 @@ module.exports = {
ModificationTime:'Modification time', ModificationTime:'Modification time',
ModificationContent:'Modification content', ModificationContent:'Modification content',
personnel:'personnel', personnel:'personnel',
dataExport:'Data export',
exportWithFile:'Export with file',
Push:'Push',
templateDownload:'Template download',
textInformation:'Text information',
relatedInformation:'Related information'
} }
jero-web/src/common/lang/zh-cn.js
+6
View File
@@ -347,4 +347,10 @@ module.exports = {
ModificationTime:'修改时间', ModificationTime:'修改时间',
ModificationContent:'修改内容', ModificationContent:'修改内容',
personnel:'人员', personnel:'人员',
dataExport:'数据导出',
exportWithFile:'带文件导出',
Push:'推送',
templateDownload:'模板下载',
textInformation:'文本信息',
relatedInformation:'关联信息'
} }
jero-web/src/components/ImportFile/index.vue
+8 -3
View File
@@ -1,12 +1,13 @@
<template> <template>
<div> <div>
<a-upload name="file" :showUploadList="false" <a-upload name="file" :showUploadList="false"
class="upload-text"
:multiple="false" :headers="tokenHeader" :multiple="false" :headers="tokenHeader"
:action="url.importZipUrl" :action="url.importZipUrl"
@change="handleImportZip" @change="handleImportZip"
accept=".zip"> accept=".zip">
<a-icon type="import" :rotate="270"/> <a-icon type="import" :rotate="270"/>
导入 {{$t('import')}}
</a-upload> </a-upload>
</div> </div>
</template> </template>
@@ -93,6 +94,10 @@
} }
</script> </script>
<style scoped> <style>
.upload-text .ant-upload{
font-size: 14px!important;
font-weight: 400!important;
color: #040B29!important;
}
</style> </style>
jero-web/src/components/addForm/index.vue
+16 -15
View File
@@ -7,7 +7,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-input class="box-input" <a-input class="box-input"
@@ -22,7 +22,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-input-number class="box-input" <a-input-number class="box-input"
@@ -37,7 +37,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]" <j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]"
@@ -54,7 +54,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]" <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
@@ -69,7 +69,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-date-picker class="box-input" <a-date-picker class="box-input"
@@ -86,7 +86,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-range-picker class="box-input" v-model="formInline[item.db_field_name]" <a-range-picker class="box-input" v-model="formInline[item.db_field_name]"
@@ -101,7 +101,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-button type="primary" class="button-text" <a-button type="primary" class="button-text"
@@ -118,7 +118,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-textarea <a-textarea
@@ -133,7 +133,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<PersonnelSelection :query="item" <PersonnelSelection :query="item"
@@ -147,7 +147,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<StandardSelection :query="item" <StandardSelection :query="item"
@@ -161,7 +161,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<j-dict-select-tag v-model="formInline[item.db_field_name]" <j-dict-select-tag v-model="formInline[item.db_field_name]"
@@ -177,7 +177,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-tree-select <a-tree-select
@@ -196,7 +196,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]" <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
@@ -453,6 +453,8 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
height: 42px;
line-height: 42px;
} }
.box-input { .box-input {
@@ -473,8 +475,7 @@
} }
.title-text-text { .title-text-text {
margin-top: 11px; margin-top: 9px;
display: inline-block;
} }
.formAdd { .formAdd {
jero-web/src/components/libraryAddForm/index.vue
+19 -18
View File
@@ -12,7 +12,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-input class="box-input" <a-input class="box-input"
@@ -27,7 +27,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-input-number class="box-input" <a-input-number class="box-input"
@@ -42,7 +42,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]" <j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]"
@@ -59,7 +59,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]" <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
@@ -74,7 +74,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-date-picker class="box-input" <a-date-picker class="box-input"
@@ -91,7 +91,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-range-picker class="box-input" v-model="formInline[item.db_field_name]" <a-range-picker class="box-input" v-model="formInline[item.db_field_name]"
@@ -106,7 +106,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-button type="primary" class="button-text" <a-button type="primary" class="button-text"
@@ -123,7 +123,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<a-textarea <a-textarea
@@ -138,7 +138,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<PersonnelSelection :query="item" <PersonnelSelection :query="item"
@@ -152,7 +152,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<Standardselection :query="item" <Standardselection :query="item"
@@ -166,7 +166,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<j-dict-select-tag v-model="formInline[item.db_field_name]" <j-dict-select-tag v-model="formInline[item.db_field_name]"
@@ -179,7 +179,7 @@
</a-col> </a-col>
<a-col :span="12" v-else-if="item.field_show_type === 'treeSelect'"> <a-col :span="12" v-else-if="item.field_show_type === 'treeSelect'">
<div class="box-title-text"> <div class="box-title-text" :title="item.db_field_txt">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text">{{item.db_field_txt}}</span>
@@ -201,7 +201,7 @@
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<span class="Required" v-if="item.field_must_input == 0">*</span> <span class="Required" v-if="item.field_must_input == 0">*</span>
<span class="title-text-text">{{item.db_field_txt}}</span> <span class="title-text-text" :title="item.db_field_txt">{{item.db_field_txt}}</span>
</div> </div>
<a-form-model-item class="itemModel" :prop="item.db_field_name"> <a-form-model-item class="itemModel" :prop="item.db_field_name">
<j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]" <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
@@ -268,15 +268,15 @@
uploadName: '', uploadName: '',
headerText: [ headerText: [
{ {
text: '基本信息', text: this.$t('essentialInformation'),
content: [] content: []
}, },
{ {
text: '文本信息', text: this.$t('textInformation'),
content: [] content: []
}, },
{ {
text: '关联信息', text: this.$t('relatedInformation'),
content: [] content: []
} }
], ],
@@ -545,6 +545,8 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
height: 42px;
line-height: 42px;
} }
.box-input { .box-input {
@@ -565,8 +567,7 @@
} }
.title-text-text { .title-text-text {
margin-top: 11px; margin-top: 9px;
display: inline-block;
} }
.header-text { .header-text {
jero-web/src/components/page/GlobalLayout.vue
+1 -1
View File
@@ -690,7 +690,7 @@
.content { .content {
.table-operator { .table-operator {
margin-bottom: 18px; margin-bottom: 29px;
button { button {
margin-right: 8px; margin-right: 8px;
jero-web/src/components/search/index.vue
+10 -6
View File
@@ -4,21 +4,21 @@
<a-col :md="6" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px"> <a-col :md="6" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
<template> <template>
<div class="box-title-text" v-if="item.field_show_type == '1'"> <div class="box-title-text" v-if="item.field_show_type == '1'">
<div class="title-text"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
</div> </div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt" <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
v-model="queryParam[item.db_field_name]"></a-input> v-model="queryParam[item.db_field_name]"></a-input>
</div> </div>
<div class="box-title-text" v-if="item.field_show_type == '2'"> <div class="box-title-text" v-if="item.field_show_type == '2'">
<div class="title-text"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
</div> </div>
<a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt" <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/> v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
</div> </div>
<div class="box-title-text" v-else-if="item.field_show_type == '4'"> <div class="box-title-text" v-else-if="item.field_show_type == '4'">
<div class="title-text"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
</div> </div>
<j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]" <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
@@ -26,7 +26,7 @@
:triggerChange="false" :dictCode="item.dict_field"/> :triggerChange="false" :dictCode="item.dict_field"/>
</div> </div>
<div class="box-title-text" v-else-if="item.field_show_type == '6'"> <div class="box-title-text" v-else-if="item.field_show_type == '6'">
<div class="title-text"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
</div> </div>
<a-range-picker class="box-input" v-model="queryParam[item.db_field_name]" <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
@@ -34,7 +34,7 @@
@change="onChange(item.db_field_name)"></a-range-picker> @change="onChange(item.db_field_name)"></a-range-picker>
</div> </div>
<div class="box-title-text" v-else-if="item.field_show_type == '5'"> <div class="box-title-text" v-else-if="item.field_show_type == '5'">
<div class="title-text"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
</div> </div>
<a-date-picker class="box-input" <a-date-picker class="box-input"
@@ -43,7 +43,7 @@
v-model="queryParam[item.db_field_name]"/> v-model="queryParam[item.db_field_name]"/>
</div> </div>
<div class="box-title-text" v-else-if="item.field_show_type == '3'"> <div class="box-title-text" v-else-if="item.field_show_type == '3'">
<div class="title-text"> <div class="title-text" :title="item.db_field_txt">
<span>{{item.db_field_txt}}</span> <span>{{item.db_field_txt}}</span>
</div> </div>
<j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]" <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
@@ -135,12 +135,16 @@
.title-text { .title-text {
width: 20%; width: 20%;
min-width: 90px; min-width: 90px;
color: #000F16;
display: inline-block; display: inline-block;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
margin-right: 16px; margin-right: 16px;
margin-top: 3px; margin-top: 3px;
text-align: right; text-align: right;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.box-input { .box-input {
jero-web/src/components/tableDate/index.vue
+33 -16
View File
@@ -5,30 +5,36 @@
class="table" class="table"
rowKey="id" rowKey="id"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
:pagination="false" :pagination="false"
:scroll="{x: 1600}" :scroll="{x: true}"
:data-source="dataSource" :data-source="dataSource"
:loading="loading" :loading="loading"
:columns="columns"
@change="tableOnChange" @change="tableOnChange"
> >
<span slot="operation" slot-scope="record"> <span slot="operation" slot-scope="record">
<a class="text" v-for="(ol,index) in OperationList" <a class="text" v-for="(ol,index) in OperationList"
@click="OperationClick(ol,record)"> @click="OperationClick(ol,record)">
<span v-if="ol.text == '取消收藏'"> <span v-if="ol.text == '取消收藏'">
{{!record.collectFlag || record.collectFlag == 0 ? '收藏' :'取消收藏'}} {{!record.collectFlag || record.collectFlag == 0 ? '收藏' :'取消收藏'}}
</span> </span>
<span v-else-if="ol.text == '取消订阅'"> <span v-else-if="ol.text == '取消订阅'">
{{!record.subscribeFlag || record.subscribeFlag == 0 ? '订阅' :'取消订阅'}} {{!record.subscribeFlag || record.subscribeFlag == 0 ? '订阅' :'取消订阅'}}
</span> </span>
<span v-else> <span v-else>
{{ol.text}} {{ol.text}}
</span> </span>
</a> </a>
</span> </span>
<span slot="detailClick" slot-scope="text,record"> <span slot="detailClick" slot-scope="text,record">
<a class="text" :title="text" @click="detailClick(record)">{{text}}</a> <a class="text" :title="text" @click="detailClick(record)">{{text}}</a>
</span> </span>
<span slot="detailText" slot-scope="text,record">
<span class="text" :title="text">
{{text.length > 18?text.slice(0,17)+'...':text}}
</span>
</span>
</a-table> </a-table>
</div> </div>
<div class="page" v-if="dataSource.length > 0"> <div class="page" v-if="dataSource.length > 0">
@@ -138,6 +144,10 @@
this.columns[index].scopedSlots = { this.columns[index].scopedSlots = {
customRender: 'detailClick' customRender: 'detailClick'
} }
} else {
this.columns[index].scopedSlots = {
customRender: 'detailText'
}
} }
}) })
let width = 0 let width = 0
@@ -177,6 +187,9 @@
postAction(this.url.tableList, params).then((res) => { postAction(this.url.tableList, params).then((res) => {
if (res.success) { if (res.success) {
this.dataSource = res.result.records this.dataSource = res.result.records
this.dataSource.forEach((val) => {
val.function_territory = val.function_territory + 'dsfsdfs 收到付款了山东黄搞定；分两个地方骨科大夫的咖啡馆里的法国金弗兰克是的积分流口水的房间的斯洛伐克第三方'
})
this.total = res.result.total this.total = res.result.total
this.loading = false this.loading = false
} else { } else {
@@ -209,6 +222,10 @@
.table .ant-table-column-title { .table .ant-table-column-title {
font-weight: bold; font-weight: bold;
} }
.ant-table td {
white-space: nowrap;
}
</style> </style>
<style scoped> <style scoped>
.box { .box {
jero-web/src/views/documentManage/library/index.vue
+16 -14
View File
@@ -6,23 +6,23 @@
<div class="table-operator"> <div class="table-operator">
<div @click="handleDel" class="operator-text"> <div @click="handleDel" class="operator-text">
<a-icon type="delete"/> <a-icon type="delete"/>
批量删除 {{$t('BatchDelete')}}
</div> </div>
<div @click="handleExport" class="operator-text"> <div @click="handleExport" class="operator-text">
<a-icon type="export" :rotate="-90"/> <a-icon type="export" :rotate="-90"/>
数据导出 {{$t('dataExport')}}
</div> </div>
<div @click="handleFileExport" class="operator-text"> <div @click="handleFileExport" class="operator-text">
<a-icon type="mail"/> <a-icon type="mail"/>
带文件导出 {{$t('exportWithFile')}}
</div> </div>
<div @click="handleCompare" class="operator-text"> <div @click="handleCompare" class="operator-text">
<a-icon type="rocket" :rotate="45"/> <a-icon type="rocket" :rotate="45"/>
推送 {{$t('Push')}}
</div> </div>
<div @click="handleModule" class="operator-text"> <div @click="handleModule" class="operator-text">
<a-icon type="download"/> <a-icon type="download"/>
模板下载 {{$t('templateDownload')}}
</div> </div>
<div class="operator-text"> <div class="operator-text">
<ImportFile :url="url"/> <ImportFile :url="url"/>
@@ -73,9 +73,10 @@
import libraryPush from '@/components/libraryPush/index' import libraryPush from '@/components/libraryPush/index'
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import eventBUs from '../../../common/event' import eventBUs from '../../../common/event'
import { ACCESS_TOKEN } from "@/store/mutation-types" import { ACCESS_TOKEN } from '@/store/mutation-types'
import ImportFile from '@/components/ImportFile/index' import ImportFile from '@/components/ImportFile/index'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
name: 'docLibrary', name: 'docLibrary',
components: { components: {
@@ -103,11 +104,11 @@
{ {
text: '删除', text: '删除',
ClickEvent: 'deleteTable' ClickEvent: 'deleteTable'
}, }
], ],
selectedRowKeys: [], selectedRowKeys: [],
loading: false, loading: false,
tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)}, tokenHeader: { 'X-Access-Token': Vue.ls.get(ACCESS_TOKEN) },
//url传参严格按照当前命名 //url传参严格按照当前命名
url: { url: {
tableHeader: 'document/bussDocumentLibraryEO/getHeader', //表格头部字段 tableHeader: 'document/bussDocumentLibraryEO/getHeader', //表格头部字段
@@ -118,9 +119,9 @@
updateInfo: 'document/bussDocumentLibraryEO/updateInfo', //编辑 updateInfo: 'document/bussDocumentLibraryEO/updateInfo', //编辑
getDocumentInfo: 'document/bussDocumentLibraryEO/getDocumentInfoById', //查看 getDocumentInfo: 'document/bussDocumentLibraryEO/getDocumentInfoById', //查看
deleteBatch: 'document/bussDocumentLibraryEO/deleteBatch', //删除 deleteBatch: 'document/bussDocumentLibraryEO/deleteBatch', //删除
pullMessage:'document/bussDocumentLibraryEO/pullMessage',//推送 pullMessage: 'document/bussDocumentLibraryEO/pullMessage',//推送
importZipUrl:'document/bussDocumentLibraryEO/importZip',//导入 importZipUrl: 'document/bussDocumentLibraryEO/importZip'//导入
}, },
idList: [] idList: []
} }
}, },
@@ -134,7 +135,7 @@
...this.$refs.searchRef.queryParam, ...this.$refs.searchRef.queryParam,
id: this.idList.join(',') id: this.idList.join(',')
} }
downloadFile('document/bussDocumentLibraryEO/exportExcel', '文档库.xls', query,this.Deselect) downloadFile('document/bussDocumentLibraryEO/exportExcel', '文档库.xls', query, this.Deselect)
}, },
Deselect() { Deselect() {
this.$refs.tableDataRef.selectedRowKeys = [] this.$refs.tableDataRef.selectedRowKeys = []
@@ -146,7 +147,7 @@
...this.$refs.searchRef.queryParam, ...this.$refs.searchRef.queryParam,
id: this.idList.join(',') id: this.idList.join(',')
} }
downloadFile('document/bussDocumentLibraryEO/exportZip', '文档库.zip', query,this.Deselect) downloadFile('document/bussDocumentLibraryEO/exportZip', '文档库.zip', query, this.Deselect)
}, },
//新增 //新增
handleAdd() { handleAdd() {
@@ -272,7 +273,8 @@
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
ddd{
ddd {
background: #fff; background: #fff;
} }
</style> </style>
jero-web/src/views/documentTools/searchCenter/index.vue
+59 -30
View File
@@ -71,7 +71,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="text-right"> <div class="text-right" :class="{'text-right-right':searchShow}">
<div class="search-text-title"> <div class="search-text-title">
<span>检索范围：</span> <span>检索范围：</span>
<span>纯电动</span> <span>纯电动</span>
@@ -101,11 +101,9 @@
</a-table> </a-table>
<ul v-if="!searchShow"> <ul v-if="!searchShow">
<a-checkbox-group v-model="checkboxText" style="margin-top: 20px;"> <a-checkbox-group v-model="checkboxText">
<li v-for="item in conList" :key="item.id"> <li v-for="item in conList" :key="item.id">
<div style="margin-top: -67px; <div style="margin-bottom: 10px;position: relative">
margin-bottom: 10px;
padding: 24px 24px 24px 0;position: relative">
<a-checkbox :value="item.id" class="checkbox-left"></a-checkbox> <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>
<div class="text-text-right" <div class="text-text-right"
@click="checkedClick(item)" @click="checkedClick(item)"
@@ -384,13 +382,13 @@
}, },
methods: { methods: {
checkedClick(item) { checkedClick(item) {
if (item.checked){ if (item.checked) {
this.checkboxText = this.checkboxText.filter(res=>{ this.checkboxText = this.checkboxText.filter(res => {
return res !== item.id return res !== item.id
}) })
}else{ } else {
this.checkboxText.push(item.id) this.checkboxText.push(item.id)
} }
console.log(this.checkboxText) console.log(this.checkboxText)
}, },
selectModel(value) { selectModel(value) {
@@ -441,7 +439,13 @@
} }
} }
</script> </script>
<style>
.search-center .ant-tabs-nav-container {
font-size: 18px !important;
font-weight: 400 !important;
color: #040B29 !important;
}
</style>
<style lang="less" scoped> <style lang="less" scoped>
.search-center { .search-center {
/*background-color: #ffffff;*/ /*background-color: #ffffff;*/
@@ -528,26 +532,27 @@
justify-content: flex-start; justify-content: flex-start;
.text-left { .text-left {
border-right: 1px solid #e8e8e8; width: 358px;
min-width: 310px; padding: 24px 24px 24px 0;
padding: 0 10px;
box-sizing: border-box; box-sizing: border-box;
.text-left-wrap { .text-left-wrap {
padding: 5px;
.text-left-select { .text-left-select {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin: 23px 0; margin-bottom: 24px;
line-height: 32px; line-height: 32px;
.text-sel { .text-sel {
//span{ //span{
// float: right; // float: right;
//} //}
font-size: 14px;
font-weight: 400;
color: #000F16;
text-align: right; text-align: right;
margin-right: 27px; margin-right: 14px;
min-width: 83px; min-width: 83px;
} }
@@ -565,8 +570,11 @@
span.data-fb { span.data-fb {
text-align: right; text-align: right;
margin-right: 26px; margin-right: 14px;
min-width: 84px; min-width: 84px;
font-size: 14px;
font-weight: 400;
color: #000F16;
} }
} }
} }
@@ -575,10 +583,16 @@
.text-right { .text-right {
width: 100%; width: 100%;
position: relative; position: relative;
margin-left: 16px; padding: 26px 0 22px 0;
box-sizing: border-box;
.search-text-title { .search-text-title {
padding: 16px 5px; padding: 0 0 22px 0;
span {
font-size: 14px;
font-weight: 400;
color: #040B29;
}
.search-header-right { .search-header-right {
float: right; float: right;
@@ -621,7 +635,7 @@
.search-text-list { .search-text-list {
ul { ul {
padding: 10px; padding:0 0 0 18px;
margin: 0; margin: 0;
li { li {
@@ -629,15 +643,25 @@
//background: #f6f6f6; //background: #f6f6f6;
//border: 1px solid #000000; //border: 1px solid #000000;
//border-radius: 10px; //border-radius: 10px;
padding: 10px; /*padding: 10px;*/
.text-header { .text-header {
margin-bottom: 11px;
span { span {
margin-right: 20px; margin-right: 52px;
font-size: 18px; font-size: 16px;
font-weight: 600; font-weight: bold;
color: #040B29;
} }
} }
.text-content {
font-size: 14px;
font-weight: 400;
color: #040B29;
opacity: 0.8;
}
} }
} }
@@ -667,8 +691,13 @@
} }
.text-text-right { .text-text-right {
padding: 12px 20px; padding: 19px 28px;
box-sizing: border-box;
margin-left: 38px;
}
.text-right-right{
border-left: 2px solid #E6E7EC;
padding: 24px 0 24px 24px!important;
box-sizing: border-box; box-sizing: border-box;
margin-left: 35px;
} }
</style> </style>