From 3641f36bb41e0fe07cfff00752cd0e691536b87a Mon Sep 17 00:00:00 2001 From: liaozetao <1107136310@qq.com> Date: Tue, 9 Apr 2024 19:05:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E5=8C=BA=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/partition/partitionInfo.js | 9 ++ src/views/car/CarGoodsAdminView.vue | 71 +++++++- src/views/chatbubble/ChatbubbleManageView.vue | 81 +++++++++- src/views/dressShop/DressShopAdminView.vue | 12 +- .../firstpage/FirstPageActivityBannerView.vue | 130 +++++++++++---- src/views/firstpage/FirstPageBannerView.vue | 131 +++++++++++---- src/views/headwear/HeadwearAdminView.vue | 54 ++++++- src/views/infocard/InfocardManageView.vue | 77 ++++++++- src/views/luckybag/LuckyBagRecordView.vue | 28 +++- src/views/luckybag/LuckyBagStatsView.vue | 36 ++++- src/views/nameplate/NameplateInfoView.vue | 77 ++++++++- src/views/newLuckyBag/LuckyBagManageView.vue | 49 +++++- src/views/room/RoomSearchAdminView.vue | 32 +++- src/views/room/RoomSerialView.vue | 1 + src/views/room/RoomTabHomeView.vue | 27 +++- src/views/room/RoomTabMapView.vue | 28 +++- src/views/room/RoomTabView.vue | 42 ++++- src/views/room/RoomtagAdminView.vue | 113 +++++++++++-- src/views/users/GiftManageView.vue | 130 ++++++++++++++- src/views/world/WorldAdminView.vue | 151 ++++++++++++++++-- src/views/world/community/DynamicDataView.vue | 1 + 21 files changed, 1120 insertions(+), 160 deletions(-) create mode 100644 src/api/partition/partitionInfo.js diff --git a/src/api/partition/partitionInfo.js b/src/api/partition/partitionInfo.js new file mode 100644 index 0000000..0b5b5f6 --- /dev/null +++ b/src/api/partition/partitionInfo.js @@ -0,0 +1,9 @@ +import request from '@/utils/request'; + +export const getPartitionInfoList = query => { + return request({ + url: '/partition/listPartitionInfo', + method: 'get', + params: query + }); +}; \ No newline at end of file diff --git a/src/views/car/CarGoodsAdminView.vue b/src/views/car/CarGoodsAdminView.vue index 960aef2..5cd37cb 100644 --- a/src/views/car/CarGoodsAdminView.vue +++ b/src/views/car/CarGoodsAdminView.vue @@ -76,6 +76,18 @@ +
+ +
+ +
+
+
+ +
+ +
+
@@ -407,7 +419,9 @@ export default { columns: [ { field: 'tmp', title: 'id', align: 'center', checkbox: true, width: '5%' }, { field: 'id', title: '座驾ID', align: 'center', width: '5%' }, - { field: 'name', title: '座驾名称', align: 'center', width: '20%' }, + {field: 'name.zh', title: '座驾名称', align: 'center', width: '20%'}, + {field: 'name.ar', title: '阿语座驾名称', align: 'center', width: '20%'}, + {field: 'name.en', title: '英语座驾名称', align: 'center', width: '20%'}, { field: 'carGoodsType', title: '座驾类型', align: 'center', width: '20%', formatter: function (val) { @@ -527,8 +541,29 @@ export default { }; return param; }, + ajax:function(request){ //使用ajax请求 + $.ajax({ + type:"GET", + url:'/admin/car/goods.action?enable=' + ComboboxHelper.getSelected("#condition_type"), + contentType:'application/json;charset=utf-8', + dataType:'json', + data: request.data, + success:function (res) { + console.log(res); + request.success({ + "rows": res.rows.map(i=>{ + i.name = JSON.parse(i.name); + return i; + }), + "total": res.total + }); + }, + error:function(error){ + console.log(error); + } + }) + }, toolbar: '#toolbar', - url: '/admin/car/goods.action', onLoadSuccess: function () { //加载成功时执行 console.log("load success"); }, @@ -581,7 +616,12 @@ export default { $("#viewFileInfo").html(''); $("#id").val(''); + $('#name').val(''); + $('#ar_name').val(''); + $('#en_name').val(''); $("#name").attr('readonly', false); + $("#ar_name").attr('readonly', false); + $("#en_name").attr('readonly', false); // $("#price").attr('readonly', false); // $("#renewPrice").attr('readonly', false); $("#seq").val(''); @@ -770,7 +810,11 @@ export default { // $("#price").val(json.entity.price); // $("#renewPrice").val(json.entity.renewPrice); $("#days").val(json.entity.days); - $("#name").val(json.entity.name); + console.log(json.entity.name) + var jsonName = JSON.parse(json.entity.name); + $("#name").val(jsonName.zh); + $("#ar_name").val(jsonName.ar); + $("#en_name").val(jsonName.en); $("#price").val(json.entity.price); $("#renewPrice").val(json.entity.renewPrice); $("#seq").val(json.entity.seq); @@ -949,10 +993,29 @@ export default { $("#tipModal").modal('show'); return; } + // 获取序列化字符串并转换为对象 + let formData = $('#carGoodsForm').serializeArray().reduce(function(obj, item) { + obj[item.name] = item.value; + return obj; + }, {}); + + var name = $("#name").val(); + // 阿语名称 + var ar_name = $("#ar_name").val(); + // 英语名称 + var en_name = $("#en_name").val(); + // 国际化字段 + var jsonName = {"zh":name,"ar":ar_name,"en":en_name} + const nameValue = JSON.stringify(jsonName); + // 修改属性值 + formData.name = nameValue; // 将giftName修改为"newGiftName" + + // 将修改后的对象转换回序列化字符串 + let newSerializeStr = $.param(formData); $.ajax({ type: "post", url: "/admin/car/goods.action", - data: $('#carGoodsForm').serialize(), + data: newSerializeStr, dataType: "json", success: function (json) { if (json.success == 'true') { diff --git a/src/views/chatbubble/ChatbubbleManageView.vue b/src/views/chatbubble/ChatbubbleManageView.vue index 0e2aa2f..a9fdc8d 100644 --- a/src/views/chatbubble/ChatbubbleManageView.vue +++ b/src/views/chatbubble/ChatbubbleManageView.vue @@ -69,6 +69,18 @@ placeholder="请输入气泡名称">
+
+ +
+ +
+
+
+ +
+ +
+
@@ -173,7 +185,9 @@ export default { $('#table').bootstrapTable({ columns: [ { field: 'id', title: '装扮id', align: 'middle', width: '5%' }, - { field: 'name', title: '装扮名称', align: 'middle', width: '5%' }, + {field: 'name.zh', title: '装扮名称', align: 'middle', width: '5%'}, + {field: 'name.ar', title: '阿语装扮名称', align: 'middle', width: '5%'}, + {field: 'name.en', title: '英语装扮名称', align: 'middle', width: '5%'}, { field: 'iosUrl', title: '装扮图片', @@ -264,8 +278,30 @@ export default { }; return param; }, + ajax:function(request){ //使用ajax请求 + $.ajax({ + type:"GET", + url:'/admin/chatbubble/listByPage', + contentType:'application/json;charset=utf-8', + dataType:'json', + data: request.data, + success:function (res) { + console.log(res); + request.success({ + "rows": res.rows.map(i=>{ + i.name = JSON.parse(i.name); + return i; + }), + "total": res.total + }); + }, + error:function(error){ + console.log(error); + } + }) + }, toolbar: '#toolbar', - url: '/admin/chatbubble/listByPage', + // url: '/admin/chatbubble/listByPage', onLoadSuccess: function () { //加载成功时执行 console.log("load success"); }, @@ -286,7 +322,12 @@ export default { // 赋值 $("#addForm #modal_id").val(row.id); $("#addForm #modal_type").val(row.type); - $("#addForm #modal_name").val(row.name); + console.log(row.name) + $("#modal_name").val(row.name.zh); + // 阿语名称 + $("#ar_modal_name").val(row.name.ar); + // 英语名称 + $("#en_modal_name").val(row.name.en); $('#addAndroidIconPicUrl').attr("src", row.androidUrl); $("#addForm #androidUrl").val(row.androidUrl); $('#addIosIconPicUrl').attr("src", row.iosUrl); @@ -332,13 +373,41 @@ export default { $('#button-save').on('click', function () { var androidUrl = $('#androidUrl').val(); var iosUrl = $('#iosUrl').val(); - var name = $('#modal_name').val(); + // 获取序列化字符串并转换为对象 + let formData = $('#addForm').serializeArray().reduce(function(obj, item) { + obj[item.name] = item.value; + return obj; + }, {}); + + var name = $("#modal_name").val(); + // 阿语名称 + var ar_name = $("#ar_modal_name").val(); + // 英语名称 + var en_name = $("#en_modal_name").val(); + // 国际化字段 + var jsonName = {"zh":name,"ar":ar_name,"en":en_name} + const nameValue = JSON.stringify(jsonName); + // 修改属性值 + formData.name = nameValue; // 将giftName修改为"newGiftName" + + // 将修改后的对象转换回序列化字符串 + let newSerializeStr = $.param(formData); //做下数据校验 if (isEmpty(name)) { $("#tipMsg").text("装扮名字不能为空"); $("#tipModal").modal('show'); return; } + if (isEmpty(ar_name)) { + $("#tipMsg").text("阿语装扮名字不能为空"); + $("#tipModal").modal('show'); + return; + } + if (isEmpty(en_name)) { + $("#tipMsg").text("英语装扮名字不能为空"); + $("#tipModal").modal('show'); + return; + } if (isEmpty(androidUrl) || isEmpty(iosUrl)) { $("#tipMsg").text("图片不能为空"); $("#tipModal").modal('show'); @@ -349,7 +418,7 @@ export default { $.ajax({ type: "post", url: "/admin/chatbubble/saveOrUpdate", - data: $("#addForm").serialize(), + data: newSerializeStr, dataType: "json", success: function (json) { if (json.code === 200) { @@ -378,6 +447,8 @@ export default { $('#status').val(''); $('#modal_type').val(''); $('#modal_name').val(''); + $('#ar_modal_name').val(''); + $('#en_modal_name').val(''); } //判断空值 function isEmpty(data) { diff --git a/src/views/dressShop/DressShopAdminView.vue b/src/views/dressShop/DressShopAdminView.vue index b8b9867..7d111ae 100644 --- a/src/views/dressShop/DressShopAdminView.vue +++ b/src/views/dressShop/DressShopAdminView.vue @@ -119,7 +119,9 @@ export default { columns: [ { field: 'id', title: 'ID', align: 'center', valign: 'middle', width: '10%' }, { field: 'dressId', title: '装扮id', align: 'center', valign: 'middle', width: '10%' }, - { field: 'name', title: '装扮名称', align: 'left', valign: 'middle', width: '10%' }, + {field: 'name.zh', title: '装扮名称', align: 'left', valign: 'middle', width: '10%'}, + {field: 'name.ar', title: '阿语装扮名称', align: 'left', valign: 'middle', width: '10%'}, + {field: 'name.en', title: '英语装扮名称', align: 'left', valign: 'middle', width: '10%'}, { field: 'pic', title: '装扮图片', align: 'left', valign: 'middle', width: '10%', formatter: function (val, row, index) { @@ -212,9 +214,13 @@ export default { data: request.data, success: function (res) { apiResult(res); + console.log(res) request.success({ - rows: res.data.rows, - total: res.data.total, + "rows": res.data.rows.map(i=>{ + i.name = JSON.parse(i.name); + return i; + }), + "total": res.total }); }, error: function (req) { diff --git a/src/views/firstpage/FirstPageActivityBannerView.vue b/src/views/firstpage/FirstPageActivityBannerView.vue index c81d31b..1111c9d 100644 --- a/src/views/firstpage/FirstPageActivityBannerView.vue +++ b/src/views/firstpage/FirstPageActivityBannerView.vue @@ -50,6 +50,14 @@
+
+
+ +
+ +
+
+
@@ -205,6 +213,14 @@
+
+
+ +
+ +
+
+
@@ -437,6 +453,7 @@ export default { $('#table').bootstrapTable({ columns: [ { field: 'sel', title: 'ID', align: 'center', valign: 'middle', checkbox: true, width: '1%' }, + {field: 'partitionDesc', title: '地区', align: 'center', valign: 'middle', width: '5%'}, { field: 'bannerId', title: 'bannerID', align: 'center', valign: 'middle', width: '5%' }, { field: 'bannerName', title: '名称', align: 'center', valign: 'middle', width: '10%' }, { @@ -646,39 +663,66 @@ export default { $('.titleListDev').addClass("hidden"); var bannerId = parseInt($(this).data('id')); isEdit = true; - debugger $.ajax({ - type: "get", - url: "/admin/banner/get.action", - data: { bannerId: bannerId }, - dataType: "json", + type: 'get', + url: '/partition/listPartitionInfo.action', + dataType: 'json', success: function (json) { if (json.code == 200) { - var date = json.data.endTime ? new Date(json.data.endTime).format("yyyy-MM-dd hh:mm:ss") : ''; - var startDate = json.data.startTime ? new Date(json.data.startTime).format("yyyy-MM-dd hh:mm:ss") : ''; - $('#name').val(json.data.bannerName); - $('#imgUrl').attr('src', json.data.bannerPic); - $('#bannerPic').val(json.data.bannerPic); - $('#skipUrlSort').val(json.data.skipType); - $('#skipUrlContent').val(json.data.skipUri); - $("#bannerType").val(json.data.bannerType); - $('#seqNo').val(json.data.seqNo); - //$("#appId").val(json.data.appId); - $('#iosVersion').val(json.data.iosVersion); - $('#androidVersion').val(json.data.androidVersion); - $('#noShowChannels').val(json.data.noShowChannels); - $('#bannerStatus').val(json.data.bannerStatus); - $('#startDate').val(startDate); - $('#endDate').val(date); - $('#bannerId').val(json.data.bannerId); - $('#platform').val(json.data.platform); - $('#limitLevelExper').val(json.data.limitLevelExper); - $('#showType').val(json.data.showType); - $('#showRule').val(json.data.showRule); - window.selectOnChange(json.data.bannerType, json.data.titleId); - $('#titleList').val(json.data.titleId); - $('#bannerModal').modal('show'); - // picker1.datetimepicker('setStartDate', startDate); + var length = json.data.length; + var partitionCheck = $("#partitionCheck"); + partitionCheck.empty(); + // 分区 + for (var i = 0; i < length; i++) { + var checkbox = $("", {type: "checkbox", id: "checkbox" + json.data[i].id, name: "partitionIds", value: json.data[i].id}); + var label = $("
+
+
+ +
+ +
+
+
@@ -215,6 +223,14 @@
+
+
+ +
+ +
+
+
@@ -453,6 +469,7 @@ export default { columns: [ { field: 'sel', title: 'ID', align: 'center', valign: 'middle', checkbox: true, width: '1%' }, { field: 'bannerId', title: 'bannerID', align: 'center', valign: 'middle', width: '5%' }, + {field: 'partitionDesc', title: '地区', align: 'center', valign: 'middle', width: '5%'}, { field: 'bannerName', title: '名称', align: 'center', valign: 'middle', width: '10%' }, { field: 'bannerType', title: 'banner位置', align: 'center', valign: 'middle', width: '10%', @@ -665,36 +682,64 @@ export default { // } $.ajax({ type: 'get', - url: '/admin/banner/get.action', - data: { 'bannerId': id }, + url: '/partition/listPartitionInfo.action', dataType: 'json', success: function (json) { if (json.code == 200) { - var date = json.data.endTime ? new Date(json.data.endTime).format("yyyy-MM-dd hh:mm:ss") : ''; - var startDate = json.data.startTime ? new Date(json.data.startTime).format("yyyy-MM-dd hh:mm:ss") : ''; - $('#name').val(json.data.bannerName); - $('#imgUrl').attr('src', json.data.bannerPic); - $('#bannerPic').val(json.data.bannerPic); - $('#skipUrlSort').val(json.data.skipType); - $('#skipUrlContent').val(json.data.skipUri); - $("#bannerType").val(json.data.bannerType); - $('#seqNo').val(json.data.seqNo); - //$("#appId").val(json.data.appId); - $('#iosVersion').val(json.data.iosVersion); - $('#androidVersion').val(json.data.androidVersion); - $('#noShowChannels').val(json.data.noShowChannels); - $('#bannerStatus').val(json.data.bannerStatus); - $('#startDate').val(startDate); - $('#endDate').val(date); - $('#bannerId').val(json.data.bannerId); - $('#platform').val(json.data.platform); - $('#limitLevelExper').val(json.data.limitLevelExper); - $('#showType').val(json.data.showType); - $('#showRule').val(json.data.showRule); - window.selectOnChange(json.data.bannerType, json.data.titleId); - $('#titleList').val(json.data.titleId); - $('#bannerModal').modal('show'); - // picker1.datetimepicker('setStartDate', startDate); + var length = json.data.length; + var partitionCheck = $("#partitionCheck"); + partitionCheck.empty(); + // 分区 + for (var i = 0; i < length; i++) { + var checkbox = $("", {type: "checkbox", id: "checkbox" + json.data[i].id, name: "partitionIds", value: json.data[i].id}); + var label = $("
+
+ +
+ +
+
+
+ +
+ +
+
@@ -346,7 +358,9 @@ export default { //{field: 'id', title: 'id', align: 'center', width: '5%'}, { field: 'tmp', title: 'headwearId', align: 'center', checkbox: true, width: '5%' }, { field: 'headwearId', title: '头饰ID', align: 'center', width: '5%' }, - { field: 'name', title: '头饰名称', align: 'center', width: '5%' }, + {field: 'name.zh', title: '头饰名称', align: 'center', width: '5%'}, + {field: 'name.ar', title: '阿语头饰名称', align: 'center', width: '5%'}, + {field: 'name.en', title: '英语头饰名称', align: 'center', width: '5%'}, { field: 'goldSale', title: '金币购买', @@ -533,8 +547,30 @@ export default { }; return param; }, + ajax:function(request){ //使用ajax请求 + $.ajax({ + type:"GET", + url:'/admin/headwear/list.action', + contentType:'application/json;charset=utf-8', + dataType:'json', + data: request.data, + success:function (res) { + console.log(res); + request.success({ + "rows": res.rows.map(i=>{ + i.name = JSON.parse(i.name); + return i; + }), + "total": res.total + }); + }, + error:function(error){ + console.log(error); + } + }) + }, toolbar: '#toolbar', - url: '/admin/headwear/list.action', + // url: '/admin/headwear/list.action', onLoadSuccess: function () { //加载成功时执行 console.log("load success"); }, @@ -552,6 +588,8 @@ export default { $("#btnAdd").click(function () { $("#headwearId").val(""); $("#headwearName").val(""); + $("#headwearArName").val(""); + $("#headwearEnName").val(""); $("#price").val(""); $("#renewPrice").val(""); $("#originalPrice").val(""); @@ -591,6 +629,11 @@ export default { $("#add").click(function () { var headwearId = $("#headwearId").val(); var headwearName = $("#headwearName").val(); + var headwearArName = $("#headwearArName").val(); + var headwearEnName = $("#headwearEnName").val(); + // 国际化字段 + var jsonName = {"zh":headwearName,"ar":headwearArName,"en":headwearEnName} + const nameValue = JSON.stringify(jsonName); var price = $("#price").val(); var renewPrice = $("#renewPrice").val(); var days = $("#days").val(); @@ -652,7 +695,7 @@ export default { url: "/admin/headwear/save.action", data: { headwearId: headwearId, - name: headwearName, + name: nameValue, price: price, renewPrice: renewPrice, days: days, @@ -708,7 +751,10 @@ export default { //$("#price").attr('readonly', true); //$("#renewPrice").attr('readonly', true); - $("#headwearName").val(json.name); + var jsonName = JSON.parse(json.name); + $("#headwearName").val(jsonName.zh); + $("#headwearArName").val(jsonName.ar); + $("#headwearEnName").val(jsonName.en); $("#price").val(json.price); $("#renewPrice").val(json.renewPrice); $("#limitDesc").val(json.limitDesc); diff --git a/src/views/infocard/InfocardManageView.vue b/src/views/infocard/InfocardManageView.vue index 4f18234..9ef6b41 100644 --- a/src/views/infocard/InfocardManageView.vue +++ b/src/views/infocard/InfocardManageView.vue @@ -65,8 +65,19 @@
- + +
+
+
+ +
+ +
+
+
+ +
+
@@ -163,7 +174,9 @@ export default { $('#table').bootstrapTable({ columns: [ { field: 'id', title: '装扮id', align: 'middle', width: '5%' }, - { field: 'name', title: '装扮名称', align: 'middle', width: '5%' }, + {field: 'name.zh', title: '装扮名称', align: 'middle', width: '5%'}, + {field: 'name.ar', title: '阿语装扮名称', align: 'middle', width: '5%'}, + {field: 'name.en', title: '英语装扮名称', align: 'middle', width: '5%'}, { field: 'pic', title: '装扮图片', @@ -254,8 +267,30 @@ export default { }; return param; }, + ajax:function(request){ //使用ajax请求 + $.ajax({ + type:"GET", + url:'/admin/infocard/listByPage', + contentType:'application/json;charset=utf-8', + dataType:'json', + data: request.data, + success:function (res) { + console.log(res); + request.success({ + "rows": res.rows.map(i=>{ + i.name = JSON.parse(i.name); + return i; + }), + "total": res.total + }); + }, + error:function(error){ + console.log(error); + } + }) + }, toolbar: '#toolbar', - url: '/admin/infocard/listByPage', + // url: '/admin/infocard/listByPage', onLoadSuccess: function () { //加载成功时执行 console.log("load success"); }, @@ -276,7 +311,11 @@ export default { // 赋值 $("#addForm #modal_id").val(row.id); $("#addForm #modal_type").val(row.type); - $("#addForm #modal_name").val(row.name); + $("#addForm #modal_name").val(row.name.zh); + // 阿语 + $("#addForm #ar_modal_name").val(row.name.ar); + // 英语 + $("#addForm #en_modal_name").val(row.name.en); $('#addIconPicUrl').attr("src", row.pic); $("#addForm #pic").val(row.pic); $("#addForm #status").val(row.status); @@ -320,12 +359,24 @@ export default { $('#button-save').on('click', function () { var pic = $('#pic').val(); var name = $('#modal_name').val(); + var arName = $('#ar_modal_name').val(); + var enName = $('#en_modal_name').val(); //做下数据校验 if (isEmpty(name)) { $("#tipMsg").text("装扮名字不能为空"); $("#tipModal").modal('show'); return; } + if (isEmpty(arName)) { + $("#tipMsg").text("阿语装扮名字不能为空"); + $("#tipModal").modal('show'); + return; + } + if (isEmpty(enName)) { + $("#tipMsg").text("英语装扮名字不能为空"); + $("#tipModal").modal('show'); + return; + } if (isEmpty(pic)) { $("#tipMsg").text("图片不能为空"); $("#tipModal").modal('show'); @@ -333,10 +384,24 @@ export default { } if ($("#addForm").validationEngine('validate')) { console.log('$("#addForm").serialize()', $("#addForm").serialize()) + // 获取序列化字符串并转换为对象 + let formData = $('#addForm').serializeArray().reduce(function(obj, item) { + obj[item.name] = item.value; + return obj; + }, {}); + + // 国际化字段 + var jsonName = {"zh":name,"ar":arName,"en":enName} + const nameValue = JSON.stringify(jsonName); + // 修改属性值 + formData.name = nameValue; // 将giftName修改为"newGiftName" + + // 将修改后的对象转换回序列化字符串 + let newSerializeStr = $.param(formData); $.ajax({ type: "post", url: "/admin/infocard/saveOrUpdate", - data: $("#addForm").serialize(), + data: newSerializeStr, dataType: "json", success: function (json) { if (json.code === 200) { diff --git a/src/views/luckybag/LuckyBagRecordView.vue b/src/views/luckybag/LuckyBagRecordView.vue index a7a77e7..2c5367e 100644 --- a/src/views/luckybag/LuckyBagRecordView.vue +++ b/src/views/luckybag/LuckyBagRecordView.vue @@ -10,12 +10,23 @@
- 福袋： - 购买人平台号： - 开出礼物名称： - 日期： - - + 送礼人地区： + + 收礼人地区： + + 购买人平台号： + + 开出礼物名称： + + 日期： + + - +
@@ -35,6 +46,8 @@ diff --git a/src/views/room/RoomTabMapView.vue b/src/views/room/RoomTabMapView.vue index 682d81c..325c3be 100644 --- a/src/views/room/RoomTabMapView.vue +++ b/src/views/room/RoomTabMapView.vue @@ -14,6 +14,9 @@ onchange="selectOnTabChange(this)">
+
+ +
@@ -129,6 +132,8 @@ diff --git a/src/views/room/RoomTabView.vue b/src/views/room/RoomTabView.vue index eee23c0..2d8224d 100644 --- a/src/views/room/RoomTabView.vue +++ b/src/views/room/RoomTabView.vue @@ -51,6 +51,18 @@
+
+ +
+ +
+
+
+ +
+ +
+
@@ -105,7 +117,9 @@ export default { $('#table').bootstrapTable({ columns: [ { field: 'seq', title: '排序', align: 'center', width: '5%' }, - { field: 'name', title: 'Tab名称', align: 'center', width: '10%' }, + {field: 'name.zh', title: 'Tab名称', align: 'center', width: '10%'}, + {field: 'name.ar', title: '阿语Tab名称', align: 'center', width: '10%'}, + {field: 'name.en', title: '英语Tab名称', align: 'center', width: '10%'}, { field: 'status', title: '显示状态', align: 'center', valign: 'middle', width: '5%', formatter: function (val, row, index) { @@ -134,7 +148,6 @@ export default { align: 'center', width: '10%', formatter: function (val, row, index) { - var pageNum = $("#currentPageNum").val(); return '' + '  
+
+ +
+ +
+
@@ -165,6 +184,8 @@