From 2736b19570db55be1fc9ab7b65395d9f2097d782 Mon Sep 17 00:00:00 2001
From: luoyisheng <2855143437@qq.com>
Date: 星期四, 05 十月 2023 14:54:53 +0800
Subject: [PATCH] 9.26。15
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html | 355 ++++++++++++++++++++++++++------------------------
.idea/workspace.xml | 20 ++
2 files changed, 196 insertions(+), 179 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e16caed..9742157 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,10 +25,9 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。14">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。15">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/HttpRequestUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/HttpRequestUtil.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -303,7 +302,7 @@
<workItem from="1696427897814" duration="1362000" />
<workItem from="1696433675086" duration="2211000" />
<workItem from="1696462020097" duration="481000" />
- <workItem from="1696465598653" duration="12128000" />
+ <workItem from="1696465598653" duration="13586000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -572,7 +571,15 @@
<option name="project" value="LOCAL" />
<updated>1695886217811</updated>
</task>
- <option name="localTasksCounter" value="36" />
+ <task id="LOCAL-00036" summary="9.26。15">
+ <option name="closed" value="true" />
+ <created>1696485767075</created>
+ <option name="number" value="00036" />
+ <option name="presentableId" value="LOCAL-00036" />
+ <option name="project" value="LOCAL" />
+ <updated>1696485767076</updated>
+ </task>
+ <option name="localTasksCounter" value="37" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -612,7 +619,8 @@
<MESSAGE value="9.26。12" />
<MESSAGE value="9.26。13" />
<MESSAGE value="9.26。14" />
- <option name="LAST_COMMIT_MESSAGE" value="9.26。14" />
+ <MESSAGE value="9.26。15" />
+ <option name="LAST_COMMIT_MESSAGE" value="9.26。15" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
index 7cd6aa1..f84ddbc 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
@@ -36,193 +36,202 @@
let amis = amisRequire('amis/embed');
// 通过替换下面这个配置来生成不同页面
let amisJSON = {
- "type": "form",
- "title": "测试页面2",
- "regions": [
- "body",
- "toolbar",
- "header"
- ],
+ "type": "page",
+ "id": "u:8c028a595aa6",
"body": [
{
- "type": "select",
- "label": "所属运营商：",
- "name": "operator",
- "id": "u:970f68a2c4ee",
- "mode": "horizontal",
- "size": "lg",
- "multiple": false,
- "source": {
- "url": "/api/v1/rep/cus/",
- "method": "get",
- "messages": {
- }
- },
- "labelField": "customerName",
- "valueField": "id",
- "required": true,
- "showInvalidMatch": false,
- "searchable": true,
- "clearable": true,
- "horizontal": {
- "leftFixed": "lg"
- }
- },
- {
- "type": "input-city",
- "label": "所在省：",
- "name": "province",
- "id": "u:091b190331f6",
- "mode": "horizontal",
- "allowCity": false,
- "allowDistrict": false,
- "onEvent": {
- "change": {
- "weight": 0,
- "actions": [
- {
- "componentId": "u:63c85c19f3aa",
- "actionType": "reload",
- "dataMergeMode": "merge"
+ "type": "form",
+ "id": "u:24af29be25d2",
+ "title": "表单",
+ "body": [
+ {
+ "label": "所属运营商：",
+ "type": "select",
+ "name": "operator",
+ "id": "u:970f68a2c4ee",
+ "mode": "horizontal",
+ "size": "lg",
+ "multiple": false,
+ "source": {
+ "url": "/api/v1/rep/cus/",
+ "method": "get",
+ "messages": {
}
- ]
- }
- }
- },
- {
- "type": "select",
- "label": "所在市：",
- "name": "city",
- "id": "u:63c85c19f3aa",
- "multiple": false,
- "mode": "horizontal",
- "size": "md",
- "horizontal": {
- "leftFixed": "lg"
- },
- "source": {
- "url": "/coursePackage/queryCity1/$province",
- "method": "post",
- "messages": {
+ },
+ "labelField": "customerName",
+ "valueField": "id",
+ "showInvalidMatch": false,
+ "searchable": true,
+ "clearable": true,
+ "horizontal": {
+ "leftFixed": "lg"
+ }
},
- "sendOn": "this.province != null &&this.province != ' '"
- },
- "onEvent": {
- "change": {
- "weight": 0,
- "actions": [
- {
- "componentId": "u:576899b1b531",
- "actionType": "reload",
- "dataMergeMode": "merge"
+ {
+ "type": "input-city",
+ "label": "所在省：",
+ "name": "province",
+ "id": "u:091b190331f6",
+ "mode": "horizontal",
+ "allowCity": false,
+ "allowDistrict": false,
+ "onEvent": {
+ "change": {
+ "weight": 0,
+ "actions": [
+ {
+ "componentId": "u:63c85c19f3aa",
+ "actionType": "reload",
+ "dataMergeMode": "merge"
+ }
+ ]
}
- ]
- }
- },
- "labelField": "name",
- "valueField": "code"
- },
- {
- "type": "select",
- "label": "所属门店：",
- "name": "store",
- "id": "u:576899b1b531",
- "multiple": false,
- "mode": "horizontal",
- "size": "md",
- "horizontal": {
- "leftFixed": "lg"
- },
- "source": {
- "method": "post",
- "url": "/coursePackage/queryStore1/$city",
- "messages": {
+ }
},
- "sendOn": "this.city != null &&this.city != ' '"
- },
- "labelField": "name",
- "valueField": "id",
- "onEvent": {
- "change": {
- "weight": 0,
- "actions": [
- {
- "componentId": "u:0d288f4bdd8e",
- "actionType": "reload",
- "dataMergeMode": "merge"
+ {
+ "type": "select",
+ "label": "所在市：",
+ "name": "city",
+ "id": "u:63c85c19f3aa",
+ "multiple": false,
+ "mode": "horizontal",
+ "size": "md",
+ "horizontal": {
+ "leftFixed": "lg"
+ },
+ "source": {
+ "url": "/coursePackage/queryCity1/$province",
+ "method": "post",
+ "messages": {
},
- {
- "componentId": "u:0d288f4bdd8e",
- "args": {
- "value": " "
- },
- "actionType": "setValue"
+ "sendOn": "this.province != null &&this.province != ' '"
+ },
+ "onEvent": {
+ "change": {
+ "weight": 0,
+ "actions": [
+ {
+ "componentId": "u:576899b1b531",
+ "actionType": "reload",
+ "dataMergeMode": "merge"
+ }
+ ]
}
- ]
+ },
+ "labelField": "name",
+ "valueField": "code"
+ },
+ {
+ "type": "select",
+ "label": "所属门店：",
+ "name": "store",
+ "id": "u:576899b1b531",
+ "multiple": false,
+ "mode": "horizontal",
+ "size": "md",
+ "horizontal": {
+ "leftFixed": "lg"
+ },
+ "source": {
+ "method": "post",
+ "url": "/coursePackage/queryStore1/$city",
+ "messages": {
+ },
+ "sendOn": "this.city != null &&this.city != ' '"
+ },
+ "labelField": "name",
+ "valueField": "id",
+ "onEvent": {
+ "change": {
+ "weight": 0,
+ "actions": [
+ {
+ "componentId": "u:0d288f4bdd8e",
+ "actionType": "reload",
+ "dataMergeMode": "merge"
+ },
+ {
+ "componentId": "u:0d288f4bdd8e",
+ "args": {
+ "value": " "
+ },
+ "actionType": "setValue"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "type": "select",
+ "label": "所属场地：",
+ "name": "site",
+ "id": "u:0d288f4bdd8e",
+ "multiple": false,
+ "mode": "horizontal",
+ "size": "md",
+ "horizontal": {
+ "leftFixed": "lg"
+ },
+ "source": {
+ "url": "/coursePackage/querySite",
+ "method": "post",
+ "messages": {
+ },
+ "data": {
+ "storeId": "$store"
+ },
+ "dataType": "form"
+ },
+ "labelField": "name",
+ "valueField": "id"
+ },
+ {
+ "type": "tpl",
+ "tpl": "设备ID：",
+ "inline": true,
+ "wrapperComponent": "",
+ "id": "u:587781d5d181",
+ "style": {
+ "marginLeft": "0"
+ }
+ },
+ {
+ "type": "input-text",
+ "label": "蓝色方",
+ "name": "blue",
+ "id": "u:a4dbdeb9165e",
+ "mode": "inline"
+ },
+ {
+ "type": "input-text",
+ "label": "红色方",
+ "name": "red",
+ "id": "u:b0544634a698",
+ "mode": "inline"
+ },
+ {
+ "type": "button",
+ "label": "按钮",
+ "onEvent": {
+ "click": {
+ "actions": [
+ {
+ "componentId": "u:24af29be25d2",
+ "actionType": "submit"
+ }
+ ]
+ }
+ },
+ "id": "u:b96a47957f17"
}
- }
- },
- {
- "type": "select",
- "label": "所属场地：",
- "name": "site",
- "id": "u:0d288f4bdd8e",
- "multiple": false,
- "mode": "horizontal",
- "size": "md",
- "horizontal": {
- "leftFixed": "lg"
- },
- "source": {
- "url": "/coursePackage/querySite",
+ ],
+ "api": {
+ "url": "/ball/save",
"method": "post",
"messages": {
- },
- "data": {
- "storeId": "$store"
},
"dataType": "form"
- },
- "labelField": "name",
- "valueField": "id"
- },
- {
- "type": "tpl",
- "tpl": "设备ID：",
- "inline": true,
- "wrapperComponent": "",
- "id": "u:587781d5d181",
- "style": {
- "marginLeft": "0"
}
- },
- {
- "type": "input-text",
- "label": "蓝色方",
- "name": "blue",
- "id": "u:a4dbdeb9165e",
- "mode": "inline"
- },
- {
- "type": "input-text",
- "label": "红色方",
- "name": "red",
- "id": "u:b0544634a698",
- "mode": "inline"
- }
- ],
- "id": "u:44bc9a4182ef",
- "toolbar": [
- {
- "type": "button",
- "label": "按钮",
- "onEvent": {
- "click": {
- "actions": [
- ]
- }
- },
- "id": "u:e54b81466b5e"
}
]
};
--
Gitblit v1.7.1