safecheck-client 3.0.33-11 → 3.0.33-111

package/index.html

@@ -6,10 +6,14 @@
     <title>安检系统</title>
     <link rel="stylesheet" href="http://cache.amap.com/lbs/static/main1119.css"/>
     <!--引入高德地图组件-->
-    <script src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
+    <script type="text/javascript">
+      window._AMapSecurityConfig = {
+        securityJsCode: '082dcb22ce9f242500fd6db3a2da5f44'
+      }
+    </script>
+    <script src="https://webapi.amap.com/maps?v=1.4.2&key=a511f5f7695b395a4eebf72b20e0f6e9"></script>
     <!--引入UI组件库（1.1版本） -->
     <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
-    <script type="text/javascript" src="http://cache.amap.com/lbs/static/addToolbar.js"></script>
     <style media="screen">
       /*url(./static/newmainbg.jpg)*/
       body{width: 100%;background:#7f8eaf  no-repeat center bottom; background-size: cover;}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.33-11",
+  "version": "3.0.33-111",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",
@@ -103,13 +103,13 @@
     "sketch-vue3": "^1.0.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "system-clients": "3.2.1-10",
+    "system-clients": "3.2.83",
     "system-phone": "1.2.100",
     "telephone-clients": "1.1.27",
     "terser-webpack-plugin-legacy": "^1.2.5",
     "url-loader": "^0.5.7",
     "vue-amap": "0.5.10",
-    "vue-client": "1.24.93",
+    "vue-client": "1.24.76",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/Util/ImgSelfSafePlus.vue

@@ -3,7 +3,7 @@
     <img :src="src" :alt="alt" @click.stop="open()" :width="width" :height="height" title="点击查看图片"
          :id="'vc-imgself-img-'+attach">
     <div class="full-img" v-show="show" @contextmenu.prevent.stop="clearStyle">
-      <img :src="src" alt="" class="img-state" :alt="alt || ''" @mousewheel="bigimg(this)" id="image" draggable="false"
+      <img :src="src2" alt="" class="img-state" :alt="alt || ''" @mousewheel="bigimg(this)" id="image" draggable="false"
            @mousedown.prevent="dropImage" style="position:fixed">
       <div class="btns row">
         <button type="button" name="button" class="btn btn-primary" @click.stop="leftRevolve()">向左旋转</button>
@@ -51,7 +51,8 @@
         container:null,
         positionX: null,
         positionY: null,
-        powerh: 1.0
+        powerh: 1.0,
+        src2:""
       }
     },
     ready(){
@@ -64,6 +65,7 @@
       }
       // 将新创建的 div 挂载到 body 上
       document.body.appendChild(this.container);
+      this.src2=this.src
     },
     beforeDestroy(){
       // 销毁挂载的
@@ -75,12 +77,12 @@
       nextPage() {
         console.log(this.list)
         //当前图片，是最后一张图片
-        if (this.src=== this.list[this.list.length - 1].f_overall_path) {
-            this.src= this.list[0].f_overall_path
+        if (this.src2=== this.list[this.list.length - 1].f_overall_path) {
+            this.src2= this.list[0].f_overall_path
           } else {
           for (let i = 0; i < this.list.length; i++) {
-            if (this.src=== this.list[i].f_overall_path) {
-              this.src= this.list[i + 1].f_overall_path
+            if (this.src2=== this.list[i].f_overall_path) {
+              this.src2= this.list[i + 1].f_overall_path
               break
             }
           }
@@ -90,12 +92,12 @@
       previousPage() {
         console.log(this.list)
         //当前图片，是第一张图片
-        if (this.src === this.list[0].f_overall_path) {
-          this.src= this.list[this.list.length - 1].f_overall_path
+        if (this.src2 === this.list[0].f_overall_path) {
+          this.src2= this.list[this.list.length - 1].f_overall_path
         } else {
           for (let i = 0; i < this.list.length; i++) {
-            if (this.src=== this.list[i].f_overall_path) {
-              this.src= this.list[i - 1].f_overall_path
+            if (this.src2=== this.list[i].f_overall_path) {
+              this.src2= this.list[i - 1].f_overall_path
               break
             }
           }

package/src/components/android/CurrentCreate.vue

@@ -985,7 +985,7 @@
         criteria = {
           items: 'count(id) count',
           tablename: 't_check_plan_item',
-          condition: `(f_complete = '' or f_complete = null or f_complete = '未完成') AND f_state = '已检'`,
+          condition: `(f_complete = '' or f_complete is null or f_complete = '未完成') AND f_state = '已检'`,
           groupitem: 'f_state'
         }
         result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})

package/src/components/android/SafecheckDevices.vue

@@ -457,6 +457,8 @@ export default {
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
+      this.f_items[prop].f_longitude = obj.longitude
+      this.f_items[prop].f_latitude = obj.latitude
       //tag
       //tag
       HostApp._open_a_page({type: 'boomerang',

package/src/components/android/SafecheckOrderV.vue

@@ -269,7 +269,7 @@
               "气量异常差值":{"index":10,"type":"number","readonly": true},
               "金额异常差值":{"index":10,"type":"number","readonly": true},
               "系统余额":{"index":10,"type":"number","readonly": true},
-              "表箱号":{"index":11,"type":"string","readonly": true},
+              "表封号":{"index":11,"type":"string","readonly": true},
               "燃气表照片":{"index":12,"type":"picture","checkmust": false}
             }
             // 注意，配置项的index必须与上面的固定配置保持'顺序'
@@ -2072,7 +2072,7 @@
                         f_defect_level: null,
                         f_device_id: "",
                         f_is_defect: "",
-                        f_item_name: "表箱号",
+                        f_item_name: "表封号",
                         f_item_value: this.item.f_plan_meters[i].f_metertitles,
                         f_path: "",
                         type: "string"
@@ -2134,7 +2134,7 @@
                         f_defect_level: null,
                         f_device_id: "",
                         f_is_defect: "",
-                        f_item_name: "表箱号",
+                        f_item_name: "表封号",
                         f_item_value: this.item.f_plan_meters[i].f_metertitles,
                         f_path: "",
                         type: "string"
@@ -2435,13 +2435,17 @@
           //tag
           if (this.role == 'inspect') {
             //tag
-            if (this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {
-              value = this.$androidUtil.path({
-                alias: 'getUserinfomation',
-                data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan in ('无计划安检','复检')"}
-              })
-            } else {
-              value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
+            if(this.item.f_no_checkplan != '无计划安检' ){
+              if (this.item.f_no_checkplan == '复检') {
+                value = this.$androidUtil.path({
+                  alias: 'getUserinfomation',
+                  data: {condition: "f_check_item_id = '" + this.item.id + "' and f_no_checkplan in ('无计划安检','复检')"}
+                })
+              } else {
+                value = this.$androidUtil.bzLogic('FetchCheckPaper', {id: this.item.id})
+              }
+            }else {
+              value.data =[]
             }
           } else {
             value = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/path/getUserinfomation`, {data: {condition: `id = '${this.item.f_paper_id}'`}})
@@ -2618,7 +2622,7 @@
             })
         }
       }else{
-        if(this.parentPage && this.parentPage=='CurrentCreate'){
+        if(this.parentPage && this.parentPage=='AddPlanItem'){
           //tag
           let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
           if (isRecodr) {

package/src/components/android/SwitchValve.vue

@@ -259,7 +259,7 @@ export default {
       // let condition =  ` uf.f_filialeid = '${this.filialeid}'`
       let condition =  ` 1=1 `
       condition += this.condition
-      condition += this.f_meternumber ? ` and f_meternumber = '${this.f_meternumber}'` : ""
+      condition += this.f_meternumber ? ` and uf.f_meternumber = '${this.f_meternumber}'` : ""
       condition += this.f_userinfo_code ? ` and f_userinfo_code = '${this.f_userinfo_code}'` : ""
       condition += this.f_meter_type != '' && this.f_meter_type != [] ? ` and f_meter_type = '${this.f_meter_type}'` : ""
       console.log(condition)

package/src/components/map/checkScreen.vue

@@ -445,13 +445,15 @@ export default {
 
 
       let a3=[]
-      for(let i=0;i<this.level2.length;i++){
-        a3.push({
-          lnglat: [this.level2[i].f_longitude,this.level2[i].f_latitude], //点标记位置
-          name: '二级隐患',
-          id:i,
-          rowstr:this.level2[i]
-        })
+      for(let o=0;o<this.level2.length;o++){
+        if (this.level2[o].f_longitude && this.level2[o].f_latitude){
+          a3.push({
+            lnglat: [this.level2[o].f_longitude,this.level2[o].f_latitude], //点标记位置
+            name: '二级隐患',
+            id:o,
+            rowstr:this.level2[o]
+          })
+        }
       }
       // 将数组设置到 massMarks 图层
       this.level2Mulchs.setData(a3);
@@ -459,13 +461,15 @@ export default {
       this.level2Mulchs.setMap(this.map);
 
       let a4=[]
-      for(let i=0;i<this.level3.length;i++){
-        a4.push({
-          lnglat: [this.level3[i].f_longitude, this.level3[i].f_latitude], //点标记位置
-          name: '三级隐患',
-          id:i,
-          rowstr:this.level3[i]
-        })
+      for(let p=0;p<this.level3.length;p++){
+        if (this.level3[p].f_longitude&&this.level3[p].f_latitude){
+          a4.push({
+            lnglat: [this.level3[p].f_longitude, this.level3[p].f_latitude], //点标记位置
+            name: '三级隐患',
+            id:p,
+            rowstr:this.level3[p]
+          })
+        }
       }
       // 将数组设置到 massMarks 图层
       this.level3Mulchs.setData(a4);
@@ -474,13 +478,15 @@ export default {
 
 
       let a5=[]
-      for(let i=0;i<this.problems.length;i++){
-        a5.push({
-          lnglat: [this.problems[i].f_longitude, this.problems[i].f_latitude], //点标记位置
-          name: '普通问题',
-          id:i,
-          rowstr:this.problems[i]
-        })
+      for(let l=0;l<this.problems.length;l++){
+        if (this.problems[l].f_longitude&&this.problems[l].f_latitude){
+          a5.push({
+            lnglat: [this.problems[l].f_longitude, this.problems[l].f_latitude], //点标记位置
+            name: '普通问题',
+            id:l,
+            rowstr:this.problems[l]
+          })
+        }
       }
       // 将数组设置到 massMarks 图层
       this.problemsMulchs.setData(a5);

package/src/components/paper/PaperList.vue

@@ -416,6 +416,7 @@
   import getNowDate from "../../utils/getNowDate";
   import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
   import BenzAMRRecorder from 'benz-amr-recorder'
+  import {toEndDateString, toStartDateString} from "../Util";
 
   //获取json配置文件
   let asyncReady = async function (self) {
@@ -650,11 +651,11 @@ export default {
         asyncReady(this).then(() => {
           if (row.f_safe_type == '已挂表未办卡安检'){
             row.f_upload_state = '已传'
-            this.$goto('new-check-paper-temp', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self',()=>this.search())
+            this.$goto('new-check-paper-temp', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
             return
           }
             row.f_upload_state = '已传'
-            this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self',()=>this.search())
+            this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
         }).catch(
           (respanse) => {
             alert('获取配置文件失败')
@@ -742,15 +743,15 @@ export default {
       }
       this.excelHeaders = Object.assign({}, this.excelHeaders, oa)
     }
-      ////tag
       this.function = this.f
-      ////tag
       //获取气表品牌
       this.getTableBrands()
       let gen = select(this)
       //this.pianqu()
       this.Mreadibook(`('${this.$login.f.orgid}')`)
       co(gen)
+      this.$refs.paged.$refs.criteria.model.f_check_start = Util.toStartDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.f_check_end = Util.toEndDateString() + ' 23:59:59'
     },
     watch: {
       'model.f_no_checkplan'(val) {

package/src/components/paper/PlanChooser.vue

@@ -79,8 +79,10 @@
   let selectnew = function * (self) {
     let http = new HttpResetClass()
     http.load('POST', '/rs/search', {
-      source: `root.getResourceById($${self.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
-      userid: self.$login.f.id
+        data:{
+          source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
+          userid: self.$login.f.orgid
+        }
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
       self.checkers = []
       let arr = []

package/src/components/planmanage/PlanManage.vue

@@ -16,7 +16,7 @@
                       close-on-select value-single >
             </v-select>
           </div>
-          <div class="row auto safe-div-p"><!--<span style="margin-right: 5px" @click="refresh()" style="cursor:default">测试</span>--><span style="margin-right: 5px" @click="delCheckPlan()" style="cursor:default">删除</span> <span @click="sendCheckPlan()" style="cursor:default">下发</span></div>
+          <div class="row auto safe-div-p"><!--<span style="margin-right: 5px" @click="refresh()" style="cursor:default">测试</span>--><span style="margin-right: 5px" @click="delCheckPlan()" style="cursor:default" v-if="isdelete">删除</span> <span @click="sendCheckPlan()" style="cursor:default">下发</span></div>
         </div>
         <div class="leftplan-center safe_plan_list">
           <div class="row safe-leftplan safe_list_li" :class="{'safe-selectplan':selectPlan.id==row.id}" v-for="row in checkplan.list.data" @click="selectPlanChange(row)">
@@ -399,6 +399,7 @@
             a:'1',
             opt:[{label:"按时间降序",value:"按时间降序"},{label:"按时间升序",value:"按时间升序"}],
             currentorder:'按时间降序',
+            isdelete:this.$login.r ? this.$login.r.includes("安检计划删除"):false,
             checkplan : new SearchList(true),
             selectPlan:{id:''},
             upCheckPlan:{
@@ -575,8 +576,10 @@
         //查询安检员selectChanged
         async searchChecker(id){
           let res=await new HttpResetClass().load('POST', '/rs/search', {
-            source: `root.getResourceById($${this.userlogin.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
-            userid: this.$login.f.id
+            data:{
+              source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
+              userid: this.userlogin.orgid
+            }
           }, {resolveMsg: null, rejectMsg: null})
           let arr = []
           res.data.forEach((resRow) => {
@@ -727,7 +730,7 @@
           this.isSend=true
           let res=await new HttpResetClass().load("POST", "/rs/logic/deleteCheckPlan", {
             data:{
-              f_operator:this.userlogin.orgstr,//global.login.name,
+              f_operator:this.userlogin.name,//global.login.name,
               condition:"",
               switchCheckAll:true,
               checkAll:false,

package/src/components/planmanage/checkPlanList.vue

@@ -50,7 +50,7 @@
             </div>
             <div class="form-group col-sm-2" style="float: right">
               <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.showplanModal()">计划调整</button>
-              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.delPlanItem()">移出计划</button>
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.delPlanItem()" v-show="$parent.$parent.isdelete">移出计划</button>
             </div>
             <modal :show.sync="$parent.$parent.showCondtion" v-ref:modal :width="'50%'" :backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -178,6 +178,7 @@
     data() {
       return {
         model:new PagedList('/rs/sql/planItem', 100, {}),
+        isdelete:this.$login.r ? this.$login.r.includes("安检计划删除"):false,
         a:'1',
         opt:[{label:"测试",value:"测试"}],
         showCondtion:false,

package/src/components/planmanage/checkUserList.vue

@@ -371,6 +371,7 @@
             <th><nobr>抄表册</nobr></th>
             <th title="当前所在的安检计划名称"><nobr>所属计划</nobr></th>
             <th title="最后一次安检日期"><nobr>安检日期</nobr></th>
+            <th><nobr>首次通气时间</nobr></th>
             <th><nobr>详细地址</nobr></th>
           </tr>
         </template>
@@ -386,6 +387,7 @@
           <td style="text-align: center"><nobr>{{row.f_book_name}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_plan_name}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_last_check_date}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_uservent_date}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
         </template>
       </data-grid>

package/src/components/report/CheckPlanCountChartArea.vue

@@ -14,6 +14,11 @@
                 condition="f_checker_name = '{}'">
               </role-selector-safe>
             </div>
+            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">小区名称</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_residential_area" placeholder='小区名称'
+                     condition="f_residential_area like '%{}%'" v-next-el="cx" v-el:qjmc>
+            </div>
             <div class="col-sm-2 form-group">
               <label for="startDate" class="font_normal_body">开始日期:</label>
               <datepicker id="startDate" placeholder="开始日期"

package/src/components/report/HiddenSituation.vue

@@ -51,9 +51,9 @@
                 v-model='model.userType'
                 :value.sync="model.userType"
                 :options='$parent.$parent.userTypes'
-                condition="tuf.f_gasproperties = '{}'"
-                :value-single="true"
-                close-on-select clear-button></v-select>
+                condition="tuf.f_gasproperties in {} "
+                :multiple="true"
+               ></v-select>
             </div>
             <div class="col-sm-2 form-group" >
               <label class="font_normal_body">气表类型</label>

package/src/components/rongcheng/AspiratedPaperFeedbackm.vue

@@ -31,6 +31,9 @@
                           <img-self :src="img.f_overall_path" alt="总体送气照片" :width="150" :height="200"></img-self>
                           <!--<img src="../../assets/remove.png" @click="delfile('f_overall_path', img.f_overall_path,index)" class="imgs" style="width: 30px;" alt="">-->
                         </div>
+                        <div class="img" v-for="row in fileInfoData">
+                          <img :src="row.f_downloadURL">
+                        </div>
                       </div>
                     </div>
                     <div class="row text-right div-photo">
@@ -362,6 +365,7 @@
     title: '用户反馈',
     data() {
       return {
+        fileInfoData:[],
         paper:this.$parent.data,
         printContent:[],
         radios:[
@@ -432,12 +436,34 @@
         Url:this.$androidUtil.getProxyUrl()
       }
     },
-    props: ['idx'],
+    props: ['idx','item'],
     components: {
       RadioGroup,
       Radio
     },
     methods: {
+      //获取pc上传的送气全景照片
+      getGaspic() {
+        let data = {
+          tablename: 't_files',
+          condition: `f_blobid = '${this.item.id}'  order by f_uploaddate desc `
+        }
+        let http = new HttpResetClass()
+        http.load('post', 'rs/sql/singleTable', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).then(getFile=> {
+          for (var i = 0; i < getFile.data.length; i++) {
+            let temp = getFile.data[i].f_downloadpath
+            if (temp) {
+              let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+              getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
+            }
+          }
+          this.fileInfoData = []
+          this.fileInfoData = getFile.data
+        })
+      },
       check(index) {
         //tag
         // 先取消所有选中项
@@ -948,6 +974,7 @@
       }
       //tag
       //tag
+      this.getGaspic()
     },
     watch:{
       '$parent.isUpload'(val){

package/src/components/rongcheng/AspiratedPaperMessage.vue

@@ -38,7 +38,7 @@
         <devicesm> </devicesm>
       </div>
       <div style="width: 95%;height: 900px;margin-left: 20px;float: left;">
-        <asp-paper-feedbackm v-bind:paper="this.data" ></asp-paper-feedbackm>
+        <asp-paper-feedbackm v-bind:paper="this.data"  :item="item" ></asp-paper-feedbackm>
       </div>
     </div>
   </div>

package/src/components/rongcheng/DefectPaper.vue

@@ -407,7 +407,7 @@
         defectType:[],
         userTypes:[{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
         defectLeave:'',
-        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'},{label: '其他隐患'}],
+        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'},{label: '其他隐患',value:'其他隐患'}],
         thead: '',
         headData: ['入户状态','用户名','用户电话','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','一级隐患数','一级隐患','二级隐患数','二级隐患','三级隐患数','三级隐患','其他隐患','隐患内容'],
         bodyData: ['f_entry_status','f_user_name','f_user_phone','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_fist_count','f_fist_content','f_second_count','f_second_content','f_third_count','f_third_content','f_other_count','f_defect_content'],

package/src/components/rongcheng/PaperListNPSQ.vue

@@ -158,6 +158,7 @@
           <td style="text-align: center">{{row.f_checker_name}}</td>
           <td style="text-align: center">
             <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
+            <button class="button_spacing button_search-1"  @click="$parent.$parent.$parent.addpic(row)">添加照片</button>
             <!--<button type="button" class="button_new-1 button_spacing" data-toggle="dropdown"
                     @click="$parent.$parent.$parent.print(row)">
               打印
@@ -168,6 +169,27 @@
     </criteria-paged>
     <check-msg v-if="showcheckmsg" :show="showcheckmsg" :data="checkInfo"></check-msg>
   </div>
+    <modal :show.sync="pic" v-ref:modal backdrop="true">
+      <header slot="modal-header" class="modal-header">
+        上传照片22
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="from-group">
+          <safecheck-file-upload
+            :blodid="bolbid"
+            :isupload="true"
+            :isdelete="true"
+            :isusetype="true"
+            :isremark="true"
+            :takeimg="false"
+            isusetype="送气照片"
+          ></safecheck-file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='piclose'>关闭</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -179,6 +201,7 @@
     import * as Util from '../Util'
     import getNowDate from "../../utils/getNowDate";
     import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+    import safecheckUpload   from "../Util/SafecheckUpload.vue";
 
     //获取json配置文件
     let asyncReady = async function (self) {
@@ -209,6 +232,9 @@
 
     export default {
         title: '非民用送气结果查看',
+        components: {
+            safecheckUpload
+        },
         data() {
             let model = new PagedList('rs/sql/查找安检单', 20, {
                 f_plan_id: 'this.f_plan_id',
@@ -274,10 +300,18 @@
                 orderFields: {
                   f_offsite_time: 'no'
                 },
+              bolbid:null,
+              pic:false,
             }
         },
         methods: {
-
+          piclose(){
+            this.pic=false
+          },
+          addpic(row){
+            this.bolbid=row.id
+            this.pic=true
+          },
             change(row) {
                 //Vue.$login = {jwt: row.f_checker_id}
                 asyncReady(this).then(() => {