From 2b1cc50486f58cf787b286beba3fdaba9125a8f5 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 23 Nov 2020 17:42:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3pc=E7=AB=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/templates/accesstrouble.html | 11 ++++-------
 safesite/templates/troubledetail.html |  5 ++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/safesite/templates/accesstrouble.html b/safesite/templates/accesstrouble.html
index 21a857b9..09ce1f6c 100644
--- a/safesite/templates/accesstrouble.html
+++ b/safesite/templates/accesstrouble.html
@@ -38,11 +38,8 @@
                         style="width:480px" data-options="label:'发现时间',currentText:'今天',closeText:'关闭'" required=true>
                 </div>
                 <div style="margin-bottom:5px">
-                    <input editable="false" name="yhqy" id="yhqy" style="width:480px" data-options="
-                    label:'发现区域',
-                    method: 'get',
-                    valueField:'id',
-                    textField:'name',
+                    <input editable="false" class="easyui-textbox" name="yhqy" id="yhqy" style="width:480px" data-options="
+                    label:'发现区域'
                     " />
                 </div>
                 <div style="margin-bottom:5px">
@@ -207,12 +204,12 @@
             $("#yhdd").textbox('setValue', data.yhdd).textbox('disable');
             $("#fxbm").textbox('setValue', data.fxbm__partname).textbox('disable');
             $("#fxr").textbox('setValue', data.fxr__name).textbox('disable');
+            $("#yhqy").textbox('setValue', data.yhqy__name).textbox('disable');
             $("#yhms").textbox('setValue', data.yhms);
             $("#zgms").textbox('setValue', data.zgms);
             $("#yyfx").textbox('setValue', data.yyfx);
             $("#zgcs").textbox('setValue', data.zgcs);
-            console.log(data.yhqy__name)
-            // $("#yhqy").textbox('setValue', data.yhqy__name);
+            
             var yhtp = data.yhtp;
             for (var i = 0; i < yhtp.length; i++) {
                 $("#addImage").append('<li ><img title="点击放大" style="display:block;" onclick="bigger(this)"  class = "yhtpimg" width="120" height="120" filepath="' + yhtp[i] + '"  src="http://' + window.location.host + '/' + yhtp[i] + '"/></li>');
diff --git a/safesite/templates/troubledetail.html b/safesite/templates/troubledetail.html
index febab8dd..2a3a45f0 100644
--- a/safesite/templates/troubledetail.html
+++ b/safesite/templates/troubledetail.html
@@ -19,7 +19,10 @@
                 <td>检查类型：{{jclx__dickeyname}}</td>
             </tr>
             <tr>
-                <td>发现时间：{{fxsj| dateFormat 'yyyy-MM-dd hh:mm:ss'}}</td>
+                <td colspan="2">发现时间：{{fxsj| dateFormat 'yyyy-MM-dd hh:mm:ss'}}</td>
+            </tr>
+            <tr>
+                <td>发现区域：{{yhqy__name}}</td>
                 <td>隐患地点：{{yhdd}}</td>
             </tr>
             <tr>