Merge branch 'master' of http://git.tofly.cn/zxw/binzhou_bs

src/widgets/XJBuildingSiteManage/Widget.html

@@ -251,6 +251,10 @@ $$
     </p>
     <p>结案备注：</p>
     <textarea readonly>${notes}</textarea>
+    <div>
+        <span>图片:</span>
+        <div> ${picture}</div>
+    </div>
     <div>
         <span>语音:</span>
         <div> ${audio}</div>

src/widgets/XJBuildingSiteManage/Widget.ts

@@ -577,7 +577,8 @@ class XJBuildingSiteManage extends BaseWidget {
                         //音频
                         var findAudio = rows[i].file_audio;
                         var gzsAudio = rows[i].gaozhishuaudio;
-                        var buildSite = new BuildSite(ID, name, watchingState, buildSiteState, workerName, watchingTime, findUser, creatTime, closeTime, watchTimeSpan, noWatchTime, constructionType, x, y, constructionAdress, managerCompany, manager, managerPhone, spuperManager, spuperManageCompany, notification, reportJournal, checkState, notes, finder, companyId, this.companyDectionary, departmentName, assignTime, findAudio, gzsAudio)
+                        var  findPicture=rows[i].file;                        ;
+                        var buildSite = new BuildSite(ID, name, watchingState, buildSiteState, workerName, watchingTime, findUser, creatTime, closeTime, watchTimeSpan, noWatchTime, constructionType, x, y, constructionAdress, managerCompany, manager, managerPhone, spuperManager, spuperManageCompany, notification, reportJournal, checkState, notes, finder, companyId, this.companyDectionary, departmentName, assignTime, findAudio, gzsAudio,findPicture)
                         this.tableBuildSiteList.push(buildSite);
                     }
 
@@ -632,7 +633,8 @@ class XJBuildingSiteManage extends BaseWidget {
                 "state": data[12],
                 "checkstate": data[13],
                 "notes": data[14],
-                "audio": data[15]
+                "picture":data[15],
+                "audio": data[16]
             });
             this.buildSiteGraphiclayer.add(graphic);
 
@@ -1463,7 +1465,7 @@ class XJBuildingSiteManage extends BaseWidget {
                     toast.Show(config.MSG_success);
                     //更新列表
                     this.requestBuildingSiteInfo(this.requestHeader, this.requestData, this.initBuildingSiteList.bind(this));
-
+                    this.domObj.find(" #toolbar button.toolbar[handletype='refresh']").trigger("click");
                 }
             }.bind(this),
             error: function () {
@@ -1799,6 +1801,7 @@ class BuildSite {
     notification;//告知书
     _finder: string;//工地发现人（巡检人员）
     _findAduio: string;//发现工地 上传的音频
+    _findPicture:string;//发现工地 上传的图片
     _gzsAduio;//上传告知书上传的音频
     //回报日志
     reportJournal;//回报日志
@@ -1812,7 +1815,7 @@ class BuildSite {
     companyDectionary: Array<any>;
     _departmentName: string;//部门名称
 
-    constructor(id, name, watchingState, buildSiteState, watcher, watchingTime, findUser, createTime, finishTime, watchTimeSpan, noWatchTime, buildSiteType, longitued, latitude, address, managerCompany, manager, managerPhone, surperManager, superManagerCompany, notification, reportJournal, checkstate, notes, finder, companyId, companyDectionary, departmentName, assignTime, findAudio, gzsAduio) {
+    constructor(id, name, watchingState, buildSiteState, watcher, watchingTime, findUser, createTime, finishTime, watchTimeSpan, noWatchTime, buildSiteType, longitued, latitude, address, managerCompany, manager, managerPhone, surperManager, superManagerCompany, notification, reportJournal, checkstate, notes, finder, companyId, companyDectionary, departmentName, assignTime, findAudio, gzsAduio,findPicture) {
         this.id = id;
         this.name = name;
         this.watchingState = watchingState;
@@ -1844,6 +1847,7 @@ class BuildSite {
         this._watchingTIme = watchingTime;
         this._watchTimeSpan = watchTimeSpan;
         this._assignTime = assignTime;
+        this._findPicture=findPicture;
         this.getCompanyName();
     }
 
@@ -1866,12 +1870,12 @@ class BuildSite {
             buildsiteState = "施工完成";
         }
         var checkState = "";
-        if (this._checkState = 2) {
+        if (this._checkState == 2) {
             checkState = "待结案";
-        } else if (this._checkState = 1) {
-            checkState = "同意";
-        } else if (this._checkState = 2) {
-            checkState = "不同意";
+        } else if (this._checkState == 1) {
+            checkState = "已结案";
+        } else if (this._checkState == 2) {
+            checkState = "结案不通过";
         }
         //处理语音
         var findAudio = "";
@@ -1884,7 +1888,18 @@ class BuildSite {
         } else {
             findAudio = "无"
         }
-        data = [this.superManagerCompany, this.superManager, this.managerCompany, this.manager, this.managerPhone, this.address, this.buildSiteType, subLlongitude, subLatitude, this.name, this.watcher, this._finder, buildsiteState, checkState, this._checkNotes, findAudio];
+        //处理上报时上传的图片
+        var findPicture = "";
+        if (this._findPicture !== "" && this._findPicture  !== null) {
+            var findPicSrc = this._findPicture .split(",");
+            for (var i = 0; i < findPicSrc.length; i++) {
+                var picSrc = AppX.appConfig.xjapiroot.substr(0, AppX.appConfig.xjapiroot.length - 3) + findPicSrc[i];//回报照片
+                findPicture += "<img src='" + picSrc + "'/>"
+            }
+        } else {
+            findPicture = "无"
+        }
+        data = [this.superManagerCompany, this.superManager, this.managerCompany, this.manager, this.managerPhone, this.address, this.buildSiteType, subLlongitude, subLatitude, this.name, this.watcher, this._finder, buildsiteState, checkState, this._checkNotes, findPicture,findAudio];
         return data;
     }