正在显示
2 个修改的文件
包含
4 行增加
和
4 行删除
@@ -207,7 +207,7 @@ class AdminLightOrderController extends AdminBaseController | @@ -207,7 +207,7 @@ class AdminLightOrderController extends AdminBaseController | ||
207 | $data = Db::name('light_order') | 207 | $data = Db::name('light_order') |
208 | ->alias('lo') | 208 | ->alias('lo') |
209 | ->join('light l', 'lo.light_id=l.id') | 209 | ->join('light l', 'lo.light_id=l.id') |
210 | - ->where(['l.area_id' => $id, 'lo.status' => 1, 'lo.end_time' => ['>', time()], 'l.id' => ['neq', $lightId]])->field('l.row,l.column')->select()->toArray(); | 210 | + ->where(['l.area_id' => $id, 'lo.status' => 1, 'lo.end_time' => ['>', time()], 'l.id' => ['neq', $lightId]])->field('l.row,l.column,l.id')->select()->toArray(); |
211 | return json_encode($data); | 211 | return json_encode($data); |
212 | } | 212 | } |
213 | } | 213 | } |
@@ -82,7 +82,7 @@ | @@ -82,7 +82,7 @@ | ||
82 | <select name="location" required id="lightLocation"> | 82 | <select name="location" required id="lightLocation"> |
83 | <option value="">请选择设备位置</option> | 83 | <option value="">请选择设备位置</option> |
84 | <foreach name="location" item="vo"> | 84 | <foreach name="location" item="vo"> |
85 | - <option value="{:implode($vo,',')}" <eq name="list.location" value="$vo">selected</eq>>{$vo.0}行{$vo.1}列</option> | 85 | + <option value="{$vo.id}" <eq name="list.light_id" value="$vo.id">selected</eq>>{$vo.row}行{$vo.light}列</option> |
86 | </foreach> | 86 | </foreach> |
87 | </select> | 87 | </select> |
88 | </td> | 88 | </td> |
@@ -253,8 +253,8 @@ | @@ -253,8 +253,8 @@ | ||
253 | var two = JSON.parse(data); | 253 | var two = JSON.parse(data); |
254 | for(var i in two){ | 254 | for(var i in two){ |
255 | var option=$("<option></option>"); | 255 | var option=$("<option></option>"); |
256 | - $(option).val(two[i]); | ||
257 | - $(option).html(two[i]['0']+'行'+two[i]['1']+'列'); | 256 | + $(option).val(two[i]['id']); |
257 | + $(option).html(two[i]['row']+'行'+two[i]['column']+'列'); | ||
258 | $("#lightLocation").append(option); | 258 | $("#lightLocation").append(option); |
259 | } | 259 | } |
260 | } | 260 | } |
-
请 注册 或 登录 后发表评论