From 398be7e48387b49ac209dd5ed5fe7a135f268e5c Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 28 十二月 2018 17:38:35 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-fault-manage-add.html | 132 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 111 insertions(+), 21 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html
index 0c31ac7..60b1953 100644
--- a/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html
@@ -11,7 +11,9 @@
<style type="text/css">
html, body {
height: 100%;
+ min-width:auto;
}
+
.layui-table-view {
margin: 0;
}
@@ -36,21 +38,24 @@
<table>
<tbody>
<tr>
- <th>鐪�</th>
- <!-- 鐪� -->
- <th>甯�</th>
- <!-- 甯� -->
- <th>鏈烘埧鍚嶇О</th>
- <!-- 鏈烘埧绔欑偣 -->
+ <th>鐪�</th> <!-- 鐪� -->
+ <th>甯�</th> <!-- 甯� -->
+ <th>鍖�/鍘�</th> <!-- 鍖�/鍘� -->
+ <th>鏈烘埧鍚嶇О</th> <!-- 鏈烘埧绔欑偣 -->
</tr>
<tr>
- <td><select name="station_name1" id="station_name1" lay-verify="">
-
- </select></td>
- <td><select name="" id="city" lay-verify="">
- </select></td>
- <td><select name="" id="station_name3" lay-verify="">
- </select></td>
+ <td>
+ <select name="station_name1" id="station_name1"></select>銆�
+ </td>
+ <td>
+ <select name="" id="city"></select>
+ </td>
+ <td>
+ <select name="" id="county"></select>
+ </td>
+ <td>
+ <select name="" id="station_name3" ></select>
+ </td>
</tr>
</tbody>
</table>
@@ -59,7 +64,7 @@
<div class="layui-form-item layui-form-text">
<label class="layui-form-label" style="text-align:center;">闂鎻忚堪</label>
<div class="layui-input-block">
- <textarea placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+ <textarea placeholder="璇疯緭鍏ュ唴瀹�" id="faultcontex" class="layui-textarea"></textarea>
</div>
</div>
@@ -68,7 +73,7 @@
<div class="layui-form-item">
<div class="layui-input-block tr" >
- <a class="layui-btn" lay-submit="" lay-filter="sub">绔嬪嵆鎻愪氦</a>
+ <a class="layui-btn" id="falutsubmit" lay-submit="" lay-filter="sub">绔嬪嵆鎻愪氦</a>
<a type="reset" class="layui-btn layui-btn-primary">閲嶇疆</a>
</div>
</div>
@@ -125,11 +130,12 @@
form.on('submit(sub)',function(data){
$('#addtime').val(getNowFormatDate());
- console.warn(3333);
- console.info(data);
+ //console.warn(3333);
+ //console.info(data);
return false;
});
-
+
+
function renderForm(){
var form = layui.form;//楂樼増鏈缓璁妸鎷彿鍘绘帀锛屾湁鐨勪綆鐗堟湰锛岄渶瑕佸姞()
form.render();
@@ -198,18 +204,64 @@
$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
renderForm();
}
- findStationNamebyStationname1();
+ searchCounty();
}
});
}
+
+ // 鏌ヨ鍖�/鍘�
+ function searchCounty() {
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1: $("#province").val(),
+ StationName2: $("#city").val()
+ };
+ // 鏍规嵁鏋勯�犳潯浠舵煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'BattInfAction!serchStationName5',
+ dataType: 'json',
+ data: "json = "+JSON.stringify(tmp),
+ success: function(result) {
+ var rs = JSON.parse(result.result);
+ var list = []; // option缁撴灉闆�
+ var ele = $('#county'); // 鐩爣select
+ if(rs.code == 1) {
+ var data = rs.data;
+ list.push(getLayuiSelect('璇烽�夋嫨鍖�/鍘�', '', {}, undefined));
+ // 閬嶅巻鏌ヨ缁撴灉
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var _tmp = getLayuiSelect(_data.StationName5, _data.StationName5, {}, _data);
+ list.push(_tmp);
+ }
+ }else {
+ list.push(getLayuiSelect('鏆傛棤鍖�/鍘�', '', {}, undefined));
+ }
+
+ // 鏍规嵁瀵硅薄鏁扮粍鐢熸垚涓嬫媺鍒楄〃
+ createLayuiSelect(ele, list);
+ form.render('select', 'countyFilter');
+
+ // 鏌ヨ鏈烘埧
+ findCity();
+ }
+ });
+ }
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function() {
findCity();
});
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function() {
- findStationNamebyStationname1();
+ searchCounty();
});
+ // 鍒囨崲鍖�/鍘�-鏈烘埧
+ form.on('select(county)', function(data) {
+ // 鏌ヨ鏈烘埧
+ findCity(true);
+ });
//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
function findStationNamebyStationname1() {
@@ -245,7 +297,45 @@
}
});
}
-
+
+ function creatAddFaultAdd(){
+ var date = new Date().format('yyyy-MM-dd');
+ var id = 42000570;
+ var temp = {
+ stationId:id,
+ record_time:date,
+ error_descript:$('#faultcontex').val(),
+ }
+ console.info(temp);
+ return temp;
+ }
+
+ function searchFaultAdd(){
+ var temp = creatAddFaultAdd();
+ var loading = layer.load();
+ // 鏍规嵁鏌ヨ鏉′欢锛屾煡璇㈠唴瀹�
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: 'Deverror_recordAction!add',
+ data: "json="+JSON.stringify(temp),
+ dataType: 'json',
+ success: function(result) {
+ layer.close(loading);
+ console.info(result);
+ var data = JSON.parse(result);
+ if(data.code==1){
+ layer.msg('娣诲姞鎴愬姛锛�', {icon:0, shade: 0.1,shadeClose:true});
+ }else{
+ layer.msg('娣诲姞澶辫触锛�', {icon:0, shade: 0.1,shadeClose:true});
+ }
+ }
+ });
+ }
+
+ $('#falutsubmit').click(function(){
+ searchFaultAdd();
+ });
});
</script>
</body>
--
Gitblit v1.9.1