fix:修复elementSet插件切换语言显示bug

This commit is contained in:
wangwenrui
2020-01-16 15:48:49 +08:00
parent e8bdc59b74
commit 405c9ab66b
8 changed files with 50 additions and 21 deletions

View File

@@ -45,17 +45,32 @@
<script> <script>
export default { export default {
props: ["dropCol"], props: ["dropCol","tableTitle"],
data() { data() {
return { return {
other: this.$t("overall.other"), other: this.$t("overall.other"),
event_positiony: 0, event_positiony: 0,
event_positionx: 0, event_positionx: 0,
eventfixedVal: {}, eventfixedVal: {},
dropColRes: JSON.parse(JSON.stringify(this.dropCol)) dropColRes: JSON.parse(JSON.stringify(this.dropCol)),
titles: JSON.parse(JSON.stringify(this.tableTitle))
}; };
}, },
mounted() {}, mounted() {},
created() {
let localStorageTitle=JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path));
if(localStorageTitle){
for(let title of this.titles){
for(let lsTitle of localStorageTitle){
if(lsTitle.prop === title.prop){
lsTitle.label=title.label;
}
}
}
localStorage.setItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path,JSON.stringify(localStorageTitle))
}
},
watch: { watch: {
dropCol: { dropCol: {
immediate: true, immediate: true,

View File

@@ -83,6 +83,7 @@
<asset-edit-unit :edit-unit-show='viewAsset' @refreshData="getTableData" @sendStateData="tabControl" ref="assetEditUnit"></asset-edit-unit> <asset-edit-unit :edit-unit-show='viewAsset' @refreshData="getTableData" @sendStateData="tabControl" ref="assetEditUnit"></asset-edit-unit>
<element-set <element-set
v-clickoutside="elementsetHide" v-clickoutside="elementsetHide"
:table-title="tableTitle"
:dropCol="dropCol" :dropCol="dropCol"
@tablelable="tablelabelEmit" @tablelable="tablelabelEmit"
ref="elementset" ref="elementset"

View File

@@ -78,6 +78,7 @@
<asset-edit-unit :edit-unit-show='viewAssetState' @refreshData="getAlertList" @sendStateData="tabControl" ref="assetEditUnit"></asset-edit-unit> <asset-edit-unit :edit-unit-show='viewAssetState' @refreshData="getAlertList" @sendStateData="tabControl" ref="assetEditUnit"></asset-edit-unit>
<element-set <element-set
v-clickoutside="elementsetHide" v-clickoutside="elementsetHide"
:table-title="tableTitle"
:dropCol="dropCol" :dropCol="dropCol"
@tablelable="tablelabelEmit" @tablelable="tablelabelEmit"
ref="elementset" ref="elementset"

View File

@@ -104,7 +104,7 @@ export default {
{ validator: validataUser, trigger: 'blur'} { validator: validataUser, trigger: 'blur'}
], ],
port:[ port:[
{ validator: validatePort, trigger: 'change'} { validator: validatePort, trigger: 'change',required:true}
], ],
file:[ file:[
{ validator: validateFile, trigger: 'change'} { validator: validateFile, trigger: 'change'}

View File

@@ -63,7 +63,7 @@
<div v-if="item.prop=='ID'"> <div v-if="item.prop=='ID'">
<span>{{scope.row.id}}</span> <span>{{scope.row.id}}</span>
</div> </div>
<div v-if="item.prop=='资产类型'"> <div v-if="item.prop=='assetType'">
<span>{{scope.row.model.type.value}}</span> <span>{{scope.row.model.type.value}}</span>
</div> </div>
<div v-if="item.prop=='SN'"> <div v-if="item.prop=='SN'">
@@ -110,7 +110,7 @@
<div v-if="item.prop=='vendor'"> <div v-if="item.prop=='vendor'">
<span>{{scope.row.model.vendor.value}}</span> <span>{{scope.row.model.vendor.value}}</span>
</div> </div>
<div v-if="item.prop=='购买日期'"> <div v-if="item.prop=='purchaseDate'">
<span>{{scope.row.purchaseDate}}</span> <span>{{scope.row.purchaseDate}}</span>
</div> </div>
<div v-if="item.prop=='principal'"> <div v-if="item.prop=='principal'">
@@ -145,7 +145,8 @@
ref="assetEditUnit"></asset-edit-unit> ref="assetEditUnit"></asset-edit-unit>
<element-set <element-set
v-clickoutside="elementsetHide" v-clickoutside="elementsetHide"
:dropCol="dropCol" :drop-col="dropCol"
:table-title="tableTitle"
@tablelable="tablelabelEmit" @tablelable="tablelabelEmit"
ref="elementset" ref="elementset"
></element-set> ></element-set>
@@ -198,7 +199,7 @@
width: 90 width: 90
}, { }, {
label: this.$t("asset.tableTitle.assetType"), label: this.$t("asset.tableTitle.assetType"),
prop: '资产类型', prop: 'assetType',
show: true, show: true,
}, { }, {
label: this.$t("asset.tableTitle.device"), label: this.$t("asset.tableTitle.device"),
@@ -239,7 +240,7 @@
show: true, show: true,
}, { }, {
label: this.$t("asset.tableTitle.procurementDate"), label: this.$t("asset.tableTitle.procurementDate"),
prop: '购买日期', prop: 'purchaseDate',
show: true, show: true,
}, { }, {
label: this.$t("asset.tableTitle.principal"), label: this.$t("asset.tableTitle.principal"),
@@ -648,12 +649,9 @@
this.getUserData(); this.getUserData();
this.getIDCOptionData(); this.getIDCOptionData();
this.tablelable = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path) let localStorageTitle=localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path);
? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)) this.tablelable = localStorageTitle ? JSON.parse(localStorageTitle) : this.tableTitle;
: this.tableTitle; this.dropCol = localStorageTitle ? JSON.parse(localStorageTitle) : this.tableTitle;
this.dropCol = localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path)
? JSON.parse(localStorage.getItem("nz-tableTitle-" + localStorage.getItem("nz-username") + "-" + this.$route.path))
: this.tableTitle;
} }
} }
</script> </script>

View File

@@ -141,6 +141,7 @@
<element-set <element-set
v-clickoutside="elementsetHide" v-clickoutside="elementsetHide"
:dropCol="dropCol" :dropCol="dropCol"
:table-title="tableTitle"
@tablelable="tablelabelEmit" @tablelable="tablelabelEmit"
ref="elementset" ref="elementset"
></element-set> ></element-set>
@@ -337,6 +338,17 @@ export default {
this.rightBox.title = this.$t("config.account.createAccount"); this.rightBox.title = this.$t("config.account.createAccount");
this.rightBox.show = true; this.rightBox.show = true;
}, },
tabSave:function(){
this.$put('sys/user/update', this.user).then(response => {
if (response.code === 200) {
this.rightBox.show = false;
this.$message({duration: 1000, type: 'success', message: this.$t("tip.saveSuccess")});
} else {
this.$message.error(response.msg);
}
this.getTableData();
});
},
save: function() { save: function() {
this.$refs.accountForm.validate((valid) => { this.$refs.accountForm.validate((valid) => {
if(valid){ if(valid){
@@ -376,7 +388,7 @@ export default {
}, },
statusChange: function(user) { statusChange: function(user) {
this.user = user; this.user = user;
this.save(); this.tabSave();
}, },
jumpTo(data,id) { jumpTo(data,id) {
this.$store.state.assetData.moduleData = data; this.$store.state.assetData.moduleData = data;

View File

@@ -136,6 +136,7 @@
</transition> </transition>
<element-set <element-set
v-clickoutside="elementsetHide" v-clickoutside="elementsetHide"
:table-title="tableTitle"
:dropCol="dropCol" :dropCol="dropCol"
@tablelable="tablelabelEmit" @tablelable="tablelabelEmit"
ref="elementset" ref="elementset"
@@ -178,7 +179,7 @@ export default {
{required:true,message:this.$t('validate.required'),trigger:'change'} {required:true,message:this.$t('validate.required'),trigger:'change'}
], ],
host:[ host:[
{ validator: checkHost, trigger: 'blur'} { validator: checkHost, trigger: 'blur',required:true}
], ],
port:[ port:[
{required:true,message:this.$t('validate.required'),trigger:'blur'}, {required:true,message:this.$t('validate.required'),trigger:'blur'},

View File

@@ -116,6 +116,7 @@
<asset-edit-unit :edit-unit-show='viewAssetState' @refreshData="getEndpointTableData" @sendStateData="tabControl" ref="assetEditUnit"></asset-edit-unit> <asset-edit-unit :edit-unit-show='viewAssetState' @refreshData="getEndpointTableData" @sendStateData="tabControl" ref="assetEditUnit"></asset-edit-unit>
<element-set <element-set
v-clickoutside="elementsetHide" v-clickoutside="elementsetHide"
:table-title="endpointTableTitle"
:dropCol="dropCol" :dropCol="dropCol"
@tablelable="tablelabelEmit" @tablelable="tablelabelEmit"
ref="elementset" ref="elementset"