From cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 28 八月 2025 20:14:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
index 95565b7..5b30424 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop.js
@@ -15,6 +15,7 @@
TCompetition.initColumn = function () {
return [
{field: 'selectItem', radio: true},
+ {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '门店类型', field: 'type', visible: role==1?true:false, align: 'center', valign: 'middle',
formatter:function (data) {
return {1:"平台门店",2:"运营商门店"}[data]
@@ -41,6 +42,8 @@
},
];
};
+
+
function currentTime(timestamp){
var time = timestamp + '';
if(time.length != 13){
@@ -87,7 +90,23 @@
return true;
}
};
-
+/**
+ *
+ * 点击门店设置门禁
+ */
+TCompetition.addDevice = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '添加门禁',
+ area: ['50%', '50%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tShop/tShop_addDevice/' +TCompetition.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
/**
* 点击添加车辆管理
*/
@@ -154,6 +173,20 @@
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/tShop/tShop_indexSet/' + TCompetition.seItem.id
+ });
+ this.layerIndex = index;
+ }
+};
+
+TCompetition.platformSet = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: '图文模块设置',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tHomeModule/tHomeModule_platformSet/' + TCompetition.seItem.id
});
this.layerIndex = index;
}
@@ -277,7 +310,6 @@
Feng.success("重置成功!");
TCompetition.table.refresh();
}, function (data) {
- Feng.error("重置失败!" + data.responseJSON.message + "!");
});
ajax.set("id",id);
ajax.start();
--
Gitblit v1.7.1