diff --git a/cyx-admin/src/main/resources/templates/base/trade/add.html b/cyx-admin/src/main/resources/templates/base/trade/add.html index eaab011..749a3d3 100644 --- a/cyx-admin/src/main/resources/templates/base/trade/add.html +++ b/cyx-admin/src/main/resources/templates/base/trade/add.html @@ -10,7 +10,7 @@
- @@ -21,29 +21,6 @@
@@ -78,6 +55,17 @@ $("#form-trade-add").validate({ focusCleanup: true }); + $("#tradeType").append('' + + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''); layui.use('laydate', function() { var laydate = layui.laydate; @@ -92,6 +80,45 @@ $.operate.save(prefix + "/add", $('#form-trade-add').serialize()); } } + $("#type_all").on("change",function () { + let type = $(this).val(); + let _strHtml = ''; + $("#tradeType").empty(); + switch (type) { + case "工程建设项目": + _strHtml = '' + + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''; + break; + case "政府采购": + _strHtml = '' + + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''; + break; + case "国有产权交易": + _strHtml = '' + + ''+ + ''+ + ''+ + ''+ + ''; + break; + } + $("#tradeType").append(_strHtml); + }) // $("input[name='monthOf']").datetimepicker({ // format: "yyyy-mm-dd", diff --git a/cyx-admin/src/main/resources/templates/base/trade/edit.html b/cyx-admin/src/main/resources/templates/base/trade/edit.html index eac9c7e..2e777c6 100644 --- a/cyx-admin/src/main/resources/templates/base/trade/edit.html +++ b/cyx-admin/src/main/resources/templates/base/trade/edit.html @@ -22,29 +22,6 @@
@@ -75,6 +52,45 @@ $("#form-trade-edit").validate({ focusCleanup: true }); + let _appendStr = { + a:'' + + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + '', + b:'' + + ''+ + ''+ + ''+ + ''+ + ''+ + ''+ + '', + c:'' + + ''+ + ''+ + ''+ + ''+ + '' + } + switch ($("#type").val()) { + case "工程建设项目": + $("#tradeType").append(_appendStr.a); + break; + case "政府采购": + $("#tradeType").append(_appendStr.b); + break; + case "国有产权交易": + $("#tradeType").append(_appendStr.c); + break; + } + layui.use('laydate', function() { var laydate = layui.laydate; diff --git a/cyx-admin/src/main/resources/templates/main.html b/cyx-admin/src/main/resources/templates/main.html index 4cfe67e..9b3f80c 100644 --- a/cyx-admin/src/main/resources/templates/main.html +++ b/cyx-admin/src/main/resources/templates/main.html @@ -714,9 +714,9 @@ let _yData = _data.type,_sData = []; let _allNumData = _data.data; $('.trade_month_num').text('当月累计交易数:'+_data.monthCount); - $('.trade_month_money').text('当月累计交易额:'+_data.monthMoney.toFixed(2)+'万元'); + $('.trade_month_money').text('当月累计交易额:'+_data.monthMoney.toFixed(4)+'万元'); $('.trade_all_num').text('全年累计交易数:'+_data.yearCount); - $('.trade_all_money').text('全年累计交易额:'+_data.yearMoney.toFixed(2)+'万元'); + $('.trade_all_money').text('全年累计交易额:'+_data.yearMoney.toFixed(4)+'万元'); _data.data.forEach(item => { _sData.push({ name: item.name, @@ -734,7 +734,7 @@ tooltip: { trigger: 'item', formatter:function(params){ - let _retTips = params.marker+' '+params.seriesName+'
交易额:'+params.value.toFixed(2)+'万元
'; + let _retTips = params.marker+' '+params.seriesName+'
交易额:'+params.value.toFixed(4)+'万元
'; _allNumData.forEach(item => { if(item.name === params.seriesName){ Object.keys(item.obj1).forEach(key => {