Commit b345e0b4 authored by wangjinjing's avatar wangjinjing

待推送设备添加根据sbbh 查询

parent 1edfd17c
...@@ -2,12 +2,12 @@ spring.profiles.active=dev ...@@ -2,12 +2,12 @@ spring.profiles.active=dev
server.port=8082 server.port=8082
spring.datasource.username=hzjt #spring.datasource.username=hzjt
spring.datasource.password=hzjt #spring.datasource.password=hzjt
spring.datasource.url=jdbc:oracle:thin:@33.50.1.22:1521:orcl #spring.datasource.url=jdbc:oracle:thin:@33.50.1.22:1521:orcl
#spring.datasource.username=test spring.datasource.username=test
#spring.datasource.password=test spring.datasource.password=test
#spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1523:helowin spring.datasource.url=jdbc:oracle:thin:@192.168.168.212:1523:helowin
spring.datasource.driver-class-name=oracle.jdbc.OracleDriver spring.datasource.driver-class-name=oracle.jdbc.OracleDriver
# \uFFFD\uFFFD\u02BC\uFFFD\uFFFD\uFFFD\uFFFD\u0421\uFFFD\uFFFD\uFFFD\uFFFD\u0421\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD # \uFFFD\uFFFD\u02BC\uFFFD\uFFFD\uFFFD\uFFFD\u0421\uFFFD\uFFFD\uFFFD\uFFFD\u0421\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
......
...@@ -36,6 +36,10 @@ ...@@ -36,6 +36,10 @@
<if test="pushstatus !=null and pushstatus == 9"> <if test="pushstatus !=null and pushstatus == 9">
and (A.pushstatus is null) and (A.pushstatus is null)
</if> </if>
<if test="sbbh !=null and sbbh!= ''">
and A.sbbh #{sbbh}
</if>
</where> </where>
</select> </select>
......
...@@ -70,7 +70,8 @@ let vue_sjcx = new Vue({ ...@@ -70,7 +70,8 @@ let vue_sjcx = new Vue({
xzbh:getCookie("bjpt_deptId"), xzbh:getCookie("bjpt_deptId"),
page: pages, page: pages,
limit: this.fy_select, limit: this.fy_select,
pushstatus: this.clzt_select pushstatus: this.clzt_select,
sbbh:$("#sbbh").val()
}), }),
success: function (result) { success: function (result) {
vue_sjcx.data_table_wfpz = []; vue_sjcx.data_table_wfpz = [];
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div id="sjcx_s" class="div-right"> <div id="sjcx_s" class="div-right">
<div class="div-right-top"> <div class="div-right-top">
<span class="pub-span">设备编号:</span> <span class="pub-span">设备编号:</span>
<input type="text" class="form-control input-pub" v-text=""> <input type="text" id="sbbh" class="form-control input-pub" v-text="">
<span class="pub-span" style="margin-left: 10px;">推送状态</span> <span class="pub-span" style="margin-left: 10px;">推送状态</span>
<select class="form-control selectpicker" v-model="clzt_select" v-on:change="getChange_tszt()"> <select class="form-control selectpicker" v-model="clzt_select" v-on:change="getChange_tszt()">
<option value="9">待推送</option> <option value="9">待推送</option>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment