From 41ecad7e49a93c493832282b5ecd6c69f464b648 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期一, 23 五月 2022 01:07:51 +0800
Subject: [PATCH] 日志文件合并处理
---
web/web/GwProduct.aspx | 142 +++++++++++++++--------------------------------
1 files changed, 46 insertions(+), 96 deletions(-)
diff --git a/web/web/GwProduct.aspx b/web/web/GwProduct.aspx
index b6ecd5b..fa56267 100644
--- a/web/web/GwProduct.aspx
+++ b/web/web/GwProduct.aspx
@@ -12,7 +12,8 @@
function loadPageList() {
var name = $("#Name").val();
- var classes = $("#Classes").val();
+ //var classes = $("#Classes").val();
+ var classes = 1;
$.ajax({
url: "GwProduct.ashx",
type: "POST",
@@ -31,16 +32,16 @@
}
$(document).on("click", ".action-modal-add", function() {
- $("#productDialog .modal-title").text("娣诲姞浜у搧鎴栦骇鍝佸垎绫�");
+ $("#productDialog .modal-title").text("娣诲姞浜у搧");
$("#productDialog #action").val("add");
$("#productDialog #id").val("").attr("readonly", false);
$("#productDialog #name").val("");
$("#productDialog #icon").val("");
$("#productDialog #instructions").val("");
- $("#productDialog #classes").val("");
+ //$("#productDialog #classes").val("");
$("#productDialog #parentId").val("");
//$("#productDialog #path").val("");
- $("#productDialog #isDefault").val("");
+ //$("#productDialog #isDefault").val("");
$("#productDialog #isDnable").val(1);
$("#productDialog #sort").val(1);
$("#productDialog #routerType").val(1);
@@ -73,6 +74,16 @@
}
});
+ //閫夋嫨鍥炬爣涓嬫媺妗�
+ $("#icon").on("change", function () {
+ console.log("icon:" + $(this).val());
+ if ($(this).val() != "") {
+ document.getElementById('showImg').src = "../static/images/productIcon/" + $(this).val();
+ }
+ });
+
+ $("#icon").trigger("change");
+
//閫夋嫨绫诲埆涓嬫媺妗嗭紝鎺у埗鐩稿叧杈撳叆椤规樉绀�
$("#classes").on("change", function () {
$(".classes-span").hide();
@@ -91,7 +102,7 @@
$(document).on("click", ".action-modal-edit", function() {
var id = $(this).data("id");
- $("#productDialog .modal-title").text("缂栬緫浜у搧鎴栦骇鍝佸垎绫�");
+ $("#productDialog .modal-title").text("缂栬緫浜у搧");
$("#productDialog #id").val(id).attr("readonly", true);
$.get("gwProduct.ashx", { "action": "get", id: id }, function(r) {
@@ -133,7 +144,11 @@
}
+ //璁剧疆绫诲埆
$("#classes").trigger("change");
+
+ //璁剧疆鍥炬爣
+ $("#icon").trigger("change");
$("#productDialog").modal("show");
}
@@ -168,36 +183,6 @@
});
});
- //涓婁紶鍥炬爣鏂囦欢
- $(document).on("click", ".action-upLoad", function () {
- //var id = $(this).data("id");
- var name = "涓婁紶鍥炬爣鏂囦欢" ;
- //$("#ablackpool").val(id);
- $("#upLoad_form .modal-title").text(name);
- $("#stopwatchTime").text('');
- $("#upLoad").modal("show");
- });
-
- $("#upLoad_form").ajaxForm({
- beforeSend: function () {
- $('#upLoad_form .action-save').attr('disabled', "true");
- $('#upLoad_form .action-save').text('姝ｅ湪涓婁紶...');
- },
- success: function (result) {
- if (result.OK) {
- mytek.alert(result.Message.Message);
- $("#stopwatchTime").text(result.Message.Msg);
- $('#upLoad_form .action-save').removeAttr("disabled");
- $("#certPath").val('');
- $('#upLoad_form .action-save').text('涓婁紶');
- } else {
- mytek.alert(result.Message, result.False);
- $('#upLoad_form .action-save').removeAttr("disabled");
- $('#upLoad_form .action-save').text('涓婁紶');
- }
- }
- });
-
$(document).on("click", ".action-btn-GwProductQuery", function() {
pagination.setPageIndex(1);
loadPageList();
@@ -214,7 +199,7 @@
});
</script>
</asp:Content>
-<asp:Content runat="server" ID="Content2" ContentPlaceHolderID="title">浜у搧鎴栦骇鍝佸垎绫荤鐞�</asp:Content>
+<asp:Content runat="server" ID="Content2" ContentPlaceHolderID="title">浜у搧绠＄悊</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="content" runat="Server">
<form name="queryForm" method="get" action="GwProduct.aspx" id="queryForm" class="form-inline"
@@ -226,6 +211,7 @@
<input type="text" name="Name" id="Name" class="form-control" />
</div>
</div>
+ <!--
<div class="form-group">
<div class="input-group">
<select name="Classes" id="Classes" class="form-control">
@@ -235,6 +221,7 @@
</select>
</div>
</div>
+ -->
<div class="form-group">
<div class="input-group">
<input type="button" value="鏌ヨ" class="btn btn-primary action-btn-GwProductQuery" />
@@ -247,27 +234,31 @@
<tr class="header">
<th>鍥炬爣
</th>
+ <th>浜у搧绫诲埆
+ </th>
<th>鍚嶇О
</th>
- <th>浣跨敤璇存槑
- </th>
+ <!--
<th>绫诲埆
</th>
+ -->
<th>閫氶亾
- </th>
- <th>鐖剁骇浜у搧鍒嗙被ID
</th>
<th>鏄惁榛樿
</th>
<th>鏄惁鍚敤
</th>
+ <!--
<th>鎺掑簭
</th>
+ -->
<th>璧犻�佹潯鏁�
</th>
<th>鍙傝�冨崟浠�
</th>
<th>鍒涘缓鏃堕棿
+ </th>
+ <th>浣跨敤璇存槑
</th>
<th class="text-right">鎿嶄綔
</th>
@@ -295,7 +286,7 @@
<h4 class="modal-title">缂栬緫浜у搧璧勬枡</h4>
</div>
<div class="modal-body">
- <div class="form-group">
+ <div class="form-group" style="display: none">
<label class="col-sm-2 control-label">
绫诲埆</label>
<div class="col-sm-4 ">
@@ -310,7 +301,7 @@
<label class="col-sm-2 control-label">
鐖剁骇鍒嗙被ID</label>
<div class="col-sm-4 ">
- <select name="parentId" id="parentId">
+ <select name="parentId" id="parentId" class="form-control">
<%=GetProductClassOptions("0")%>
</select>
</div>
@@ -319,20 +310,21 @@
<label class="col-sm-2 control-label">
鍥炬爣</label>
<div class="col-sm-4 ">
- <a class="action-upLoad btn btn-info btn-xs " href="javascript:; ">閫夋嫨涓婁紶鏂囦欢</a>
- <!--
- <input type="file" id="certPath" name="certPath" />
- <span id="stopwatchTime" style="- word-wrap: break-word; word-break: break-all;"></span>
-
- <input type="text" class="form-control" name="icon" id="icon" value="" />
- -->
+ <div><img id="showImg" name="showImg" src=""></div>
+ <select id="icon" name="icon" class="form-control" >
+ <option value="">--璇烽�夋嫨鍥炬爣--</option>
+ <option value="marketingSMS-32.png" >marketingSMS-32.png</option>
+ <option value="noticeSMS-32.png" >noticeSMS-32.png</option>
+ <option value="VerificationCodeSMS-32.png" >VerificationCodeSMS-32.png</option>
+ </select>
</div>
- <span class="help-block m-b-none">绫诲埆涓轰骇鍝佹椂锛屼骇鍝佺殑鍥炬爣鏍囪瘑锛涗笂浼犳枃浠舵牸寮忎负BMP锛堜綅鍥撅級銆丣PG銆丣PEG銆丳NG銆丟IF鏂囦欢锛堟枃浠跺ぇ灏忎笉鑳借秴杩�5M锛夈��
- </span>
+ <span class="help-block m-b-none">绫诲埆涓轰骇鍝佹椂锛屼骇鍝佺殑鍥炬爣鏍囪瘑銆�
+ </span>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 鍚嶇О</label>
+ 鍚嶇О <span style="color:red">*</span>
+ </label>
<div class="col-sm-4 ">
<input type="text" class="form-control" name="name" id="name" value="" />
</div>
@@ -352,7 +344,6 @@
<input type="text" class="form-control" name="path" id="path" value="" />
</div>
</div>
- -->
<div class="form-group classes-span classes-span-1">
<label class="col-sm-2 control-label">
鎺ㄥ箍鏂瑰紡</label>
@@ -364,6 +355,8 @@
</div>
<span class="help-block m-b-none">涓�у寲瀹㈡埛鏄寚鐗规畩鎺ㄩ�佺粰瀹㈡埛锛涚郴缁熼粯璁ゆ槸鎸囩郴缁熼粯璁ゅ彲鎺ㄩ�佹墍鏈夊鎴枫��</span>
</div>
+ -->
+ <input type="hidden" class="form-control" name="isDefault" id="isDefault" value="1" />
<div class="form-group">
<label class="col-sm-2 control-label">
鏄惁鍚敤</label>
@@ -483,50 +476,7 @@
</form>
</div>
</div>
-
- <div class="modal inmodal fade" id="upLoad" tabindex="-1" role="dialog"
- aria-hidden="true">
- <form name="upLoad_form" method="post" action="GwProduct.ashx?action=upLoad"
- id="upLoad_form" class="form-horizontal">
- <div class="modal-dialog form-horizontal">
- <div class="modal-content ">
- <input type="hidden" id="ablackpool" value="" name="ablackpool" />
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal">
- <span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
- <h4 class="modal-title">
- 涓婁紶鏂囦欢
- </h4>
- </div>
- <div class="modal-body">
- <div class="form-group">
- <label class="control-label col-sm-3">
- 璇烽�夋嫨瑕佷笂浼犵殑鍥炬爣鏂囦欢</label>
- <input type="file" id="certPath" name="certPath" />
-
- <span id="stopwatchTime" style="word-wrap: break-word; word-break: break-all;"></span>
- </div>
- <div>
- <h3>
- 璇存槑</h3>
- <ul>
- <li class="text-info">涓婁紶鏂囦欢鏍煎紡涓築MP锛堜綅鍥撅級銆丣PG銆丣PEG銆丳NG銆丟IF鏂囦欢锛堟枃浠跺ぇ灏忎笉鑳借秴杩�5M锛夛紱</li>
-
- </ul>
- </div>
- </div>
- <div class="modal-footer">
- <button class="btn btn-default " data-dismiss="modal" aria-hidden="true">
- 鍙栨秷</button>
- <button class="btn btn-primary action-save">
- 涓婁紶</button>
- </div>
- </div>
- </div>
- </form>
- </div>
-
<!-- footBar -->
<div id="mask" class="mask">
<span></span>
--
Gitblit v1.9.1