From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js b/cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js
index 7bc3f66..3ba40bc 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/ball/ball.js
@@ -29,9 +29,18 @@
{title: '市', field: 'city', visible: true, align: 'center', valign: 'middle'},
{ title: '门店名称', field: 'store', visible: true, align: 'center', valign: 'middle'},
{ title: '所属场地', field: 'site', visible: true, align: 'center', valign: 'middle'},
- { title: '设备ID', field: 'blue', visible: true, align: 'center', valign: 'middle'},
- { title: '设备类型', field: 'red', visible: true, align: 'center', valign: 'middle'},
- { title: '设备类型', field: 'red', visible: true, align: 'center', valign: 'middle'},
+ { title: '蓝方设备ID', field: 'blue', visible: true, align: 'center', valign: 'middle'},
+ { title: '红方设备ID', field: 'red', visible: true, align: 'center', valign: 'middle'},
+ {
+ title: '设备类型',
+ field: 'deviceType',
+ visible: true,
+ align: 'center',
+ valign: 'middle',
+ formatter: function(value, row, index) {
+ return '智慧球场';
+ }
+ },
{
title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',
formatter: function(value, row, index) {
@@ -211,8 +220,8 @@
};
TStudent.resetSearch = function () {
- $("#provinceCode").val("");
- $("#cityCode").val("");
+ $("#pCode").val("");
+ $("#cCode").val("");
$("#store").val("");
$("#site").val("");
TStudent.search();
--
Gitblit v1.7.1