From 686d08eeb8b46a466e56bb523556bd59b9a3ed0d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 30 十月 2018 17:13:46 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/batt-fault-manage-add.html | 252 +++++++++++++++++++++++++++++++
gx_tieta/WebRoot/batt-fault-manage.jsp | 179 ++++++++++++++++++++++
2 files changed, 431 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-fault-manage.jsp b/gx_tieta/WebRoot/batt-fault-manage.jsp
new file mode 100644
index 0000000..2e14351
--- /dev/null
+++ b/gx_tieta/WebRoot/batt-fault-manage.jsp
@@ -0,0 +1,179 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+<%@ taglib uri="/struts-tags" prefix="s"%>
+<!DOCTYPE HTML>
+<html>
+ <head>
+ <!-- 榛樿浣跨敤鏈�楂樺唴鏍� -->
+ <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
+ <base href="<%=basePath%>">
+ <title>闂鍙嶉</title> <!-- 闂鍙嶉 -->
+ <link rel="stylesheet" href="css/basic.css">
+ <link rel="stylesheet" type="text/css" href="css/nocontent.css">
+ <link rel="stylesheet" type="text/css" href="css/loading.css">
+ <link rel="stylesheet" type="text/css" href="css/basic-layout.css"/>
+ <link rel="stylesheet" href="css/sidebar.css" />
+ <link rel="stylesheet" href="css/confirm.css" />
+ <link rel="stylesheet" href="src/css/layui.css" />
+ <link rel="stylesheet" href="pages/css/mylayui.css">
+ <style type="text/css">
+ .b8cfe5 {
+ background-color: #b8cfe5 !important;
+ }
+ .filter-container .filter-content th {
+ text-align: center;
+ }
+ .data-footer{
+ overflow:hidden;
+ margin-top:50px;
+ }
+ </style>
+ </head>
+
+ <body>
+ <!--澶撮儴鍐呭寮�濮�-->
+ <jsp:include page="Top.jsp" flush="true"/>
+ <!--澶撮儴鍐呭缁撴潫-->
+ <!--瀵艰埅寮�濮�-->
+ <jsp:include page="nav.jsp" flush="true"/>
+ <div class="filter-container">
+ <div class="filter-title"><a href="javascript:;">闂鍙嶉</a></div>
+ <div class="filter-content">
+
+ </div>
+ </div>
+
+ <!-- 瀵煎嚭琛ㄦ牸鏁版嵁鐨勮〃鍗� -->
+ <form id="export_excel" action="ExportTable.servlet" method="post">
+ <input type="hidden" name="PageName" value="eleHistoryWarn.jsp"/>
+ <input type="hidden" id="table_th_arr" name="table_th_arr"/>
+ <input type="hidden" id="table_td_arr" name="table_td_arr"/>
+ </form>
+ <div style="width: 100%;overflow:hidden;">
+ <table id="eleInfoTbl" lay-filter="eleInfoTbl"></table>
+ </div>
+
+ <div class="data-footer">
+ <!-- 鍒嗛〉鍐呭 -->
+ <div id="paging">
+ <!-- <a href="javascript:" class="search">娣诲姞</a> 娣诲姞 -->
+ <a class="layui-btn layui-btn-normal addbtn">娣诲姞</a>
+ <script type="text/html" id="toolBar">
+ <a class="layui-btn layui-btn-xs" lay-event="details">娣诲姞</a>
+ </script>
+
+ <a href="javascript:" id="export_table" class="layui-btn layui-btn-normal outbtn"><s:text name="Export"/></a> <!-- 瀵煎嚭 -->
+
+ </div>
+ </div>
+ <div id="details"></div>
+ <div id="detailsOpts"></div>
+ <script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="js/equip-stats-change.jquery.ui.js"></script>
+ <script type="text/javascript" src="js/eleHistWarn1-jquery.ui.js"></script>
+ <script type="text/javascript" src="js/basic-layout.js"></script>
+ <script type="text/javascript" src="js/sidebar.js"></script>
+ <script type="text/javascript" src="js/rightmenu.js"></script>
+ <script type="text/javascript" src="js/myConfirm.js"></script>
+ <script type="text/javascript" src="js/myinterval.js"></script>
+ <script type="text/javascript" src="js/pageUtil.js"></script>
+ <script type="text/javascript" src="src/layui.js"></script>
+
+ <script type="text/javascript">
+ var permits;
+ <% Object obj=session.getAttribute("permits");
+ if(obj!=null){
+ String permits =obj.toString(); %>
+ permits=<%=permits%>;
+ //console.info(json);
+ <% } %>
+ // 搴旂敤layui妗嗘灦
+ layui.use(['layer', 'table', 'form', 'laytpl', 'element','jquery'],function() {
+ var layer = layui.layer // 鑾峰彇layer妯″潡
+ ,table = layui.table // 鑾峰彇table妯″潡
+ ,element = layui.element
+ ,$=layui.jquery
+ ,form = layui.form;
+ // 琛ㄦ牸鏁版嵁閰嶇疆椤�
+ var tOptions = {
+ elem: '#eleInfoTbl'
+ ,toolbar: false
+ ,defaultToolbar: ['exports', 'filter']
+ ,cellMinWidth: 80
+ ,cols: [[
+ {field:'station_name1', title:'鐪�', align:'center'}
+ ,{field:'city', title:'甯�', align:'center'}
+ ,{field:'stationName3', title:'鏈烘埧鍚嶇О', align:'center'}
+ ,{field:'note', title:'鏃堕棿', align:'center'}
+ ,{field:'question',fixed: 'right', title:'鏁呴殰璇︽儏', width: 70}
+ ]]
+ ,data:[]
+ ,page: true
+ ,height: 'full-280'
+ };
+
+ // 鐢熸垚琛ㄦ牸鏁版嵁
+ table.render(tOptions);
+
+
+
+ $(document).ready(function(){
+ console.info(1111);
+ tOptions.data=getData(100,0);
+ var tableObj = table.render(tOptions);
+ tableObj.reload(tOptions);
+ });
+
+
+ function getData(a,b){
+ var arr=[];
+ for(i=0;i<a;i++){
+ arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha鍝堝搱鍗″崱鍗″崱鍗″崱鍗″崱'+i});
+ }
+ return arr
+ }
+
+
+
+
+
+
+
+
+ $(document).on('click','.addbtn',function(){
+ searchStationHistRecord();
+ });
+ function searchStationHistRecord(){
+ // 灏唒aram娣诲姞鍒�#detailsOpts
+ //$('#detailsOpts').data('data', param);
+
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+
+ // 鏄剧ず闈㈡澘
+ layer.open({
+ type: 2,
+ title: '<span style="font-weight:bold">>>闂娣诲姞</span>',
+ area: ['600px', '400px'],
+ fixed: false, //涓嶅浐瀹�
+ maxmin: true,
+ content: 'iframe/batt-fault-manage-add.html'
+ });
+
+ }
+
+
+
+
+
+ });
+
+
+
+
+
+ </script>
+ </body>
+</html>
diff --git a/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html b/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html
new file mode 100644
index 0000000..0c31ac7
--- /dev/null
+++ b/gx_tieta/WebRoot/iframe/batt-fault-manage-add.html
@@ -0,0 +1,252 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>娣诲姞闂</title>
+ <link rel="stylesheet" href="../jqueryui/jquery-ui.min.css">
+ <link rel="stylesheet" href="../src/css/layui.css">
+ <link rel="stylesheet" href="../font-awesome-4.7.0/css/font-awesome.min.css">
+ <link rel="stylesheet" href="../pages/css/mylayui.css">
+ <link rel="stylesheet" href="../pages/css/common.css">
+ <style type="text/css">
+ html, body {
+ height: 100%;
+ }
+ .layui-table-view {
+ margin: 0;
+ }
+ .mt20{
+ margin-top:20px;
+ }
+ .tr{
+ text-align:right;
+ }
+ </style>
+</head>
+<body>
+ <div class="whyc-page-layui-main abs-top0 abs-bottom0">
+ <!-- 鏈�澶栧眰鎺у埗浣嶇疆 -->
+ <div class="whyc-page-layui-content-container">
+ <!-- <div class="whyc-page-layui-siderbar w360"></div> -->
+ <div class="whyc-page-layui-content" style="background-color: pink">
+ <div class="tbl-container">
+ <div class="tbl-filter" lay-filter="tblFilter">
+ <div class="layui-form layui-form-pane" lay-filter="tblFilter">
+ <form class="layui-form" action="">
+ <table>
+ <tbody>
+ <tr>
+ <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>
+ </tr>
+ </tbody>
+ </table>
+ <div class="layui-row">
+ <div class="layui-col-md12 layui-col-md-offset1 mt20">
+ <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>
+ </div>
+ </div>
+
+ <input type="hidden" class="layui-input" id="addtime">
+
+ <div class="layui-form-item">
+
+ <div class="layui-input-block tr" >
+ <a class="layui-btn" lay-submit="" lay-filter="sub">绔嬪嵆鎻愪氦</a>
+ <a type="reset" class="layui-btn layui-btn-primary">閲嶇疆</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ <!-- 琛ㄦ牸鍐呭 -->
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/javascript" src="../js/jquery-1.8.3.js"></script>
+ <script type="text/javascript" src="../jqueryui/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="../src/layui.js"></script>
+ <script type="text/javascript" src="../src/layui.js"></script>
+ <script type="text/javascript" src="../pages/js/mylayui.js"></script>
+ <script type="text/javascript" src="../js/base.js"></script>
+ <script type="text/javascript" src="../pages/js/common.js"></script>
+ <script type="text/javascript" src="../js/createTab.js"></script>
+ <script type = "text/javascript" >
+
+ layui.use(['layer', 'table', 'form', 'laytpl', 'element', 'laydate', 'jquery'],
+function() {
+ var layer = layui.layer // 鑾峰彇layer妯″潡
+ ,
+ table = layui.table // 鑾峰彇table妯″潡
+ ,
+ form = layui.form,
+ $ = layui.jquery,
+ util=layui.util,
+ laydate = layui.laydate;
+
+
+ function getNowFormatDate() {
+ var date = new Date();
+ var seperator1 = "-";
+ var seperator2 = ":";
+ var month = date.getMonth() + 1;
+ var strDate = date.getDate();
+ if (month >= 1 && month <= 9) {
+ month = "0" + month;
+ }
+ if (strDate >= 0 && strDate <= 9) {
+ strDate = "0" + strDate;
+ }
+ var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
+ + " " + date.getHours() + seperator2 + date.getMinutes()
+ + seperator2 + date.getSeconds();
+ return currentdate;
+}
+
+ form.on('submit(sub)',function(data){
+ $('#addtime').val(getNowFormatDate());
+ console.warn(3333);
+ console.info(data);
+ return false;
+});
+
+ function renderForm(){
+ var form = layui.form;//楂樼増鏈缓璁妸鎷彿鍘绘帀锛屾湁鐨勪綆鐗堟湰锛岄渶瑕佸姞()
+ form.render();
+ }
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ $(document).ready(function() {
+
+ //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
+ $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup", null,
+ function(data) {
+ data = data.result;
+ data = eval("(" + data + ")");
+ //console.info(data);
+ if (data.code == 1 && data.data.length > 0) {
+ var $select = $("#station_name1");
+ $select.text('');
+ for (var i = 0; i <= data.data.length; i++) {
+ $option = $("<option></option>");
+ if (i == 0) {
+ $option.html("鍏ㄩ儴(" + data.data.length + ")");
+ $option.attr("value", "");
+ } else {
+ $option.text(data.data[i - 1]);
+ $option.attr("value", data.data[i - 1]);
+ }
+ $select.append($option);
+ renderForm();
+
+ }
+
+ } else {
+ $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
+ renderForm();
+ }
+ findCity();
+ });
+ });
+
+ function findCity() {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async: true,
+ dataType: 'json',
+ data: "json = " + JSON.stringify(data),
+ success: function(data) {
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if (rs.code == 1) {
+ var _data = rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for (var i = 0; i < _data.length; i++) {
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ renderForm();
+ } else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ renderForm();
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
+ $('#station_name1').change(function() {
+ findCity();
+ });
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function() {
+ findStationNamebyStationname1();
+ });
+
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
+ function findStationNamebyStationname1() {
+ var tmp = {
+ StationName1: $("#station_name1").val(),
+ StationName2: $("#city").val()
+ };
+ //var selectvalue=$("#station_name1 option:selected").val();
+ //alert(selectvalue);
+ $.post("BattInfAction!serchStationName3", "json=" + JSON.stringify(tmp),
+ function(data) {
+ var rs = JSON.parse(data.result);
+ if (rs.code == 1) {
+ var _data = rs.data;
+ var $select = $("#station_name3");
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for (var i = 0; i < _data.length; i++) {
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ renderForm();
+ } else {
+ $("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ renderForm();
+ }
+ });
+ }
+
+});
+ </script>
+</body>
+</html>
--
Gitblit v1.9.1