diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index c454cbd1..e19abc6f 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:sqlserver://localhost:1433;SelectMethod=cursor;DatabaseName=FYATJ + url: jdbc:sqlserver://121.36.58.109:1433;SelectMethod=cursor;DatabaseName=SecondNanjing username: sa - password: 123456 + password: haiwei@123 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html b/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html index 5b1165fb..9b6f5a86 100644 --- a/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html +++ b/ruoyi-admin/src/main/resources/templates/nanjing/StationParaInfo/StationParaInfo.html @@ -66,15 +66,23 @@ success: function (json) { console.log(json); var columnsArray1 = []; - for (var i = 0; i < (Object.keys(json.rows[0])).length; i++) {//Object.keys(obj) 获取key名称 - var property = (Object.keys(json.rows[0]))[i]; - columnsArray1.push({ - "title": property, - "field": property, - switchable: true - }); - } + columnsArray1.push({field : "序号",title : "序号",colspan: 1,rowspan: 1}); + columnsArray1.push({field : "产品码",title : "产品码",colspan: 1,rowspan: 1}); + columnsArray1.push({field : "状态",title : "状态",colspan: 1,rowspan: 1}); + columnsArray1.push({field : "记录时间",title : "记录时间",colspan: 1,rowspan: 1}); + if(json.total>0) { + for (var i = 0; i < (Object.keys(json.rows[0])).length; i++) {//Object.keys(obj) 获取key名称 + var property = (Object.keys(json.rows[0]))[i]; + if(property!='产品码'&&property!='记录时间'&&property!='序号'&&property!='状态') { + columnsArray1.push({ + "title": property, + "field": property, + switchable: true + }); + } + } + } // console.log(json); // var arrlength=[]; // json.rows.forEach(function (value) {