Skip to content

S
SuperMan
Commit ba95392f authored by 黄奎's avatar 黄奎
Browse files
Options

组件调整

parent b151e310
Show whitespace changes
Inline Side-by-side
Showing with 161 additions and 116 deletions
src/assets/common/lang/EN/fill.js
View file @ ba95392f
......@@ -969,6 +969,7 @@ export const obj = {
chanpingbj: 'Product quote',
chanpinglx: 'Product type',
fubiaoti: 'Subtitle',
dibudaohang:"Bottom navigation",
suozaichengshi: 'City in',
tiqianquxiaosj: 'Advance cancellation time',
jichanghzl: 'Airport terminal',
......@@ -2381,6 +2382,7 @@ export const obj = {
xiugaiqxcd: 'Modify permissions menu',
caidan: 'Menu',
caidantubiao: 'Menu ICONS',
daohangshezhi:"Navigation settings",
caidanbjpz: 'Menu background Configuration',
xitongcd: 'System Menu',
zicancd: 'Asset Menu',
......
src/assets/common/lang/Japan/fill.js
View file @ ba95392f
......@@ -969,6 +969,7 @@ export const obj = {
chanpingbj: '製品オファー',
chanpinglx: '製品の種類',
fubiaoti: '副題',
dibudaohang:"下へ移動",
suozaichengshi: '所在都市',
tiqianquxiaosj: '早めにキャンセルします',
jichanghzl: '空港ターミナル',
......@@ -2381,6 +2382,7 @@ export const obj = {
xiugaiqxcd: '修正権限メニュー',
caidan: 'メニュー',
caidantubiao: 'メニューアイコン',
daohangshezhi:"ナビゲーション設定",
caidanbjpz: 'メニュー背景配置',
xitongcd: 'システムメニュー',
zicancd: '資産メニュー',
......
src/assets/common/lang/zhCN/fill.js
View file @ ba95392f
......@@ -969,6 +969,7 @@ export const obj = {
chanpingbj: '产品报价',
chanpinglx: '产品类型',
fubiaoti: '副标题',
dibudaohang:"底部导航",
suozaichengshi: '所在城市',
tiqianquxiaosj: '提前取消时间',
jichanghzl: '机场航站楼',
......@@ -2381,6 +2382,7 @@ export const obj = {
xiugaiqxcd: '修改权限菜单',
caidan: '菜单',
caidantubiao: '菜单图标',
daohangshezhi:"导航设置",
caidanbjpz: '菜单背景配置',
xitongcd: '系统菜单',
zicancd: '资产菜单',
......
src/assets/common/lang/zhTW/fill.js
View file @ ba95392f
......@@ -969,6 +969,7 @@ export const obj = {
chanpingbj: '産品報價',
chanpinglx: '産品類型',
fubiaoti: '副標題',
dibudaohang:"底部導航",
suozaichengshi: '所在城市',
tiqianquxiaosj: '提前取消時間',
jichanghzl: '機場航站樓',
......@@ -2381,6 +2382,7 @@ export const obj = {
xiugaiqxcd: '修改權限菜單',
caidan: '菜單',
caidantubiao: '菜單圖標',
daohangshezhi:"導航設置",
caidanbjpz: '菜單背景配置',
xitongcd: '系統菜單',
zicancd: '資產菜單',
......
src/components/WebSet/WebSiteEdit.vue
View file @ ba95392f
......@@ -216,10 +216,6 @@
</div>
</div>
<div class="WebSite_Left">
<!-- <el-select v-model="countryId" @change="changeCountry" style="margin-bottom:12px;">
<el-option v-for="x in tempCountry" :label="x.name" :value="x.val" :key="x.val">
</el-option>
</el-select> -->
<el-select v-model="templateId" @change="getTemplateDetails()">
<el-option :label="$t('pub.pleaseSel')" :value="0" :key="0">
</el-option>
......
src/components/WebSet/home/indexNav.vue
View file @ ba95392f
......@@ -76,9 +76,27 @@
<template>
<div class="WebSite_slider">
<el-form label-width="100px">
<el-row class="rowSbAc" style="margin-bottom: ;">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item :label="$t('objFill.v101.zhubiaoti')">
<el-input type="text" v-model="plugData.Title"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('objFill.fubiaoti')">
<el-input type="text" v-model="plugData.SubTitle"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('objFill.v101.beijinse')">
<el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="Web LOGO" style="margin-bottom: 0;">
<div class="webSliderDiv" style="width: 100px;height: 100px;">
<div class="webSliderDiv" style="width:100px;height:100px;">
<el-upload :http-request="UploadAttachmentLogo" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="plugData.Logo" :src="plugData.Logo" class="web_imgUrl" alt="" />
......@@ -90,8 +108,10 @@
</el-upload>
</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="Mobile LOGO" style="margin-bottom: 0;">
<div class="webSliderDiv" style="width: 100px;height: 100px;">
<div class="webSliderDiv" style="width: 100px;height:100px;">
<el-upload :http-request="UploadAttachmentMBgColor" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="plugData.MBgColor" :src="plugData.MBgColor" class="web_imgUrl" alt="" />
......@@ -103,28 +123,20 @@
</el-upload>
</div>
</el-form-item>
<el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex: 1;flex-shrink: 0;">
<el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
</el-form-item>
</el-row>
<el-row class="rowSbAc">
<el-form-item :label="$t('objFill.v101.zhubiaoti')" style="margin-bottom: 0;flex: 1;flex-shrink: 0;">
<el-input type="text" v-model="plugData.Title"></el-input>
</el-form-item>
<el-form-item :label="$t('objFill.fubiaoti')" style="margin-bottom: 0;flex: 1;flex-shrink: 0;">
<el-input type="text" v-model="plugData.SubTitle"></el-input>
</el-form-item>
</el-col>
<el-col :span="8"></el-col>
</el-row>
<!--导航菜单-->
<el-tabs v-model="activeName" type="border-card" :before-leave="beforeLeave">
<el-tabs v-model="activeName" type="border-card" :before-leave="beforeLeave" style="margin-top:10px;"
@tab-remove="removeTab">
<el-tab-pane :key="index" v-for="(item,index) in plugData.MenuList" :label="$t('objFill.caidan')+(index+1)"
:name="index.toString()">
:name="index.toString()" :closable="true">
<table>
<tr>
<td>
<el-form-item :label="$t('objFill.v101.fengmian')+$t('system.query_type')+(index+1)"
style="margin-bottom: 0;">
<el-select v-model="item.FileType" style="width: 100%;">
<el-select v-model="item.FileType" style="width:150px;">
<el-option v-for="item in typeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
......@@ -132,7 +144,7 @@
</td>
<td>
<el-form-item :label="$t('objFill.v101.zhubiaoti')+(index+1)">
<el-input type="text" v-model="item.MenuName" style="width:210px;"></el-input>
<el-input type="text" v-model="item.MenuName" style="width:227px;"></el-input>
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(1,index)">
</el-button>
</el-form-item>
......@@ -140,7 +152,7 @@
</tr>
<tr>
<td rowspan="2">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
<el-form-item :label="$t('objFill.v101.fengmian')+(index+1)" style="margin-bottom: 0;">
<div class="webSliderDiv" @click="menuIndex=index">
<el-upload :http-request="UploadAttachment" :multiple="false" :accept="getAccept(item.FileType)"
:show-file-list="false" action="">
......@@ -187,17 +199,18 @@
style="border-radius:5px; border:1px solid #ccc;margin-bottom:5px;margin-top:5px;">
<tr>
<td>
<el-form-item :label="$t('objFill.v101.fengmian')+$t('system.query_type')+(subIndex+1)"
<el-form-item :label="$t('objFill.v101.fengmian')+$t('system.query_type')+(index+1)+`-`+(subIndex+1)"
style="margin-bottom: 0;">
<el-select v-model="sub.FileType" style="width: 100%;">
<el-select v-model="sub.FileType" style="width: 150px;">
<el-option v-for="item in typeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('objFill.v101.zhubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="sub.MenuName" style="width:210px;"></el-input>
<el-form-item :label="$t('objFill.v101.zhubiaoti')+(index+1)+`-`+(subIndex+1)"
style="margin-bottom: 0;">
<el-input type="text" v-model="sub.MenuName" style="width:227px;"></el-input>
<el-button v-show="subIndex!=0" type="danger" icon="el-icon-minus" size="mini" circle
@click="delMenu(2,index,i)">
</el-button>
......@@ -206,7 +219,7 @@
</tr>
<tr>
<td rowspan="2">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
<el-form-item :label="$t('objFill.v101.fengmian')+(index+1)+`-`+(subIndex+1)" style="margin-bottom: 0;">
<div class="webSliderDiv" @click="menuIndex=index,subMenuIndex=subIndex">
<el-upload :http-request="UploadAttachment2" :multiple="true" :accept="getAccept(sub.FileType)"
:show-file-list="false" action="">
......@@ -224,14 +237,15 @@
</el-form-item>
</td>
<td>
<el-form-item :label="$t('objFill.fubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-form-item :label="$t('objFill.fubiaoti')+(index+1)+`-`+(subIndex+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="sub.MenuSubName"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('objFill.v101.lianjie')+(index+1)" style="margin-bottom: 0;">
<el-form-item :label="$t('objFill.v101.lianjie')+(index+1)+`-`+(subIndex+1)"
style="margin-bottom: 0;">
<el-input type="text" v-model="sub.LinkUrl">
<el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(sub)"></el-button>
</el-input>
......@@ -251,11 +265,10 @@
<tbody>
<tr>
<td class="caidantext">
{{$t('objFill.v101.activity.lianjie')}}
{{$t('objFill.dibudaohang')}}
</td>
<td></td>
<td class="rowEnd">
&nbsp;
<div>
<el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.v101.activity.lianjie')"
placement="top">
......@@ -362,6 +375,11 @@
}
return '*/*';
},
//删除选项卡
removeTab(targetName) {
var newIndex = targetName - 1;
this.delMenu(1, newIndex);
},
/* 点击添加选项卡时 */
beforeLeave(currentName, oldName) {
var self = this;
......
src/components/WebSet/home/indexRoll1.vue
View file @ ba95392f
......@@ -115,24 +115,24 @@
<tbody v-for="(item,index) in plugData.NavList" :key="index">
<tr>
<td class="caidantext">
{{$t('objFill.caidan')}}{{index+1}}:
{{$t('objFill.daohangshezhi')}}{{index+1}}:
</td>
<td></td>
<td class="rowEnd">
<div>
<el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.caidan')" placement="top">
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu(1)"></el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button>
</el-tooltip>
<el-tooltip v-show="plugData.NavList.length>1" class="item" effect="dark"
:content="'- '+$t('objFill.caidan')" placement="top">
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(1,index)">
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
</el-button>
</el-tooltip>
</div>
</td>
</tr>
<tr>
<td class="w350">
<td class="w350" rowspan="3">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
<div class="webSliderDiv" @click="clickIndex=index">
<el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
......@@ -166,24 +166,33 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('objFill.v101.activity.lianjie')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.LinkUrl">
<el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
</el-input>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
<el-input type="textarea" :rows="2" v-model="item.SubDescribe"></el-input>
</el-form-item>
</td>
<td class="colAs">
<el-form-item :label="$t('objFill.v101.zhubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.SubName"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('objFill.fubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.SubEnName"></el-input>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('objFill.v101.activity.lianjie')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.LinkUrl">
<el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
</el-input>
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
<el-input type="textarea" :rows="2" v-model="item.SubDescribe"></el-input>
</el-form-item>
</td>
</tr>
</tbody>
</table>
......@@ -217,7 +226,6 @@
Id: 2
},
],
clickType: 0, //1主菜单 2二级菜单
MenuList: {
FileType: 1,
FileUrl: '',
......@@ -233,15 +241,14 @@
},
methods: {
addMenu(type, index) {
this.clickType = type
addMenu() {
this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
},
delMenu(type, index, i) {
this.clickType = type
if (type == 1) {
this.plugData.NavList.splice(index, 1)
}
delMenu(index) {
var that = this;
that.Confirm(this.$t('tips.shifoushanchu'), function () {
that.plugData.NavList.splice(index, 1)
});
},
//上传图片
UploadAttachment(file) {
......
src/components/WebSet/home/indexRoll2.vue
View file @ ba95392f
......@@ -113,24 +113,24 @@
<tbody v-for="(item,index) in plugData.NavList" :key="index">
<tr>
<td class="caidantext">
{{$t('objFill.caidan')}}{{index+1}}:
{{$t('objFill.daohangshezhi')}}{{index+1}}:
</td>
<td></td>
<td class="rowEnd">
<div>
<el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.caidan')" placement="top">
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu(1)"></el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button>
</el-tooltip>
<el-tooltip v-show="plugData.NavList.length>1" class="item" effect="dark"
:content="'- '+$t('objFill.caidan')" placement="top">
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(1,index)">
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
</el-button>
</el-tooltip>
</div>
</td>
</tr>
<tr>
<td class="w350">
<td class="w350" rowspan="3">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
<div class="webSliderDiv" @click="clickIndex=index">
<el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
......@@ -164,23 +164,33 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('objFill.v101.activity.lianjie')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.LinkUrl">
<el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
</el-input>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
<el-input type="textarea" :rows="2" v-model="item.SubDescribe"></el-input>
</el-form-item>
</td>
<td class="colAs">
<el-form-item :label="$t('objFill.v101.zhubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.SubName"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('objFill.fubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.SubEnName"></el-input>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('objFill.v101.activity.lianjie')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.LinkUrl">
<el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
</el-input>
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
<el-input type="textarea" :rows="2" v-model="item.SubDescribe"></el-input>
</el-form-item>
</td>
</tr>
</tbody>
</table>
......@@ -214,7 +224,6 @@
Id: 2
},
],
clickType: 0, //1主菜单 2二级菜单
MenuList: {
FileType: 1,
FileUrl: '',
......@@ -230,15 +239,14 @@
},
methods: {
addMenu(type, index) {
this.clickType = type
addMenu() {
this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
},
delMenu(type, index, i) {
this.clickType = type
if (type == 1) {
this.plugData.NavList.splice(index, 1)
}
delMenu(index) {
var that = this;
that.Confirm(this.$t('tips.shifoushanchu'), function () {
that.plugData.NavList.splice(index, 1)
});
},
//上传图片
UploadAttachment(file) {
......
src/components/WebSet/home/indexSlider1.vue
View file @ ba95392f
......@@ -114,24 +114,24 @@
<tbody v-for="(item,index) in plugData.NavList" :key="index">
<tr>
<td class="caidantext">
{{$t('objFill.caidan')}}{{index+1}}:
{{$t('objFill.daohangshezhi')}}{{index+1}}:
</td>
<td></td>
<td class="rowEnd">
<div>
<el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.caidan')" placement="top">
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu(1)"></el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu()"></el-button>
</el-tooltip>
<el-tooltip v-show="plugData.NavList.length>1" class="item" effect="dark"
:content="'- '+$t('objFill.caidan')" placement="top">
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(1,index)">
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(index)">
</el-button>
</el-tooltip>
</div>
</td>
</tr>
<tr>
<td class="w350">
<td class="w350" rowspan="3">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
<div class="webSliderDiv" @click="clickIndex=index">
<el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
......@@ -165,23 +165,33 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('objFill.v101.activity.lianjie')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.LinkUrl">
<el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
</el-input>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
<el-input type="textarea" :rows="2" v-model="item.SubDescribe"></el-input>
</el-form-item>
</td>
<td class="colAs">
<el-form-item :label="$t('objFill.v101.zhubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.SubName"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('objFill.fubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.SubEnName"></el-input>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('objFill.v101.activity.lianjie')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.LinkUrl">
<el-button slot="append" icon="el-icon-search" @click="ShowMenuDialog(item)"></el-button>
</el-input>
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
<el-input type="textarea" :rows="2" v-model="item.SubDescribe"></el-input>
</el-form-item>
</td>
</tr>
</tbody>
</table>
......@@ -215,7 +225,6 @@
Id: 2
},
],
clickType: 0, //1主菜单 2二级菜单
MenuList: {
FileType: 1,
FileUrl: '',
......@@ -231,15 +240,14 @@
},
methods: {
addMenu(type, index) {
this.clickType = type
addMenu() {
this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
},
delMenu(type, index, i) {
this.clickType = type
if (type == 1) {
this.plugData.NavList.splice(index, 1)
}
delMenu(index) {
var that = this;
that.Confirm(this.$t('tips.shifoushanchu'), function () {
that.plugData.NavList.splice(index, 1)
});
},
//上传图片
UploadAttachment(file) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment