safecheck-client 3.0.33-15 → 3.0.33-152

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/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/pc/NewCheckpaper.vue

@@ -894,6 +894,7 @@ import Vue from 'vue'
 import * as Util from '../Util'
 import {jsonSort} from '../../utils/LdapHelper'
 import {HttpResetClass} from "vue-client";
+import {forEach} from "mocha/lib/utils";
 
 let asyncReady = async function (self) {
   // 获取配置信息
@@ -1293,6 +1294,9 @@ export default {
       if (this.deviceCollects.length > 0) {
         this.hasDevice = true
       }
+      this.deviceconfig2 = this.deviceconfig2.filter(row => {
+        return !(row.checkname == '$configProp' || row.checkname == '$globalProp');
+      })
       this.ajresult = JSON.parse(this.data.f_defect_content).result
       this.showimg3 = this.data.f_noanswer_path
       this.showimg5 = this.data.f_noanswer1_path
@@ -1873,18 +1877,17 @@ export default {
               //tag
               //tag)
               console.log('Vue.config.safecheck.DevicesConfig', Vue.config.safecheck.DevicesConfig)
-              if (this.data.f_check_type == '民用') {
-                this.deviceconfig = Vue.config.safecheck.DevicesConfig
-                if (typeof this.deviceconfig === 'string') {
-                  this.deviceconfig = JSON.parse(this.deviceconfig)
-                }
-                //tag)
-              } else if (this.data.f_check_type == '非民用') {
+              // 如果没有用户类型 默认按民用配置走
+              if (this.data.f_check_type == '非民用') {
                 this.deviceconfig = Vue.config.safecheck.DevicesSetConfig
                 if (typeof this.deviceconfig === 'string') {
                   this.deviceconfig = JSON.parse(this.deviceconfig)
                 }
-                //tag)
+              }else{
+                  this.deviceconfig = Vue.config.safecheck.DevicesConfig
+                  if (typeof this.deviceconfig === 'string') {
+                    this.deviceconfig = JSON.parse(this.deviceconfig)
+                  }
               }
               if (this.data.f_collection_type == '按金额') {
                 if (this.deviceconfig["燃气表"]){

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:{
@@ -451,6 +452,13 @@
         },
       async ready(){
         await this.loadpage()
+        if (!this.userlogin.orgid){
+          if (this.$login.f.f_orgids){
+            this.userlogin.orgid = this.$login.f.f_orgids.endsWith('.')?this.$login.f.f_orgids.substring(0,this.$login.f.f_orgids.length-1):this.$login.f.f_orgids
+          }else {
+            this.userlogin.orgid = ''
+          }
+        }
       },
    computed: {
         ntoway() {
@@ -575,8 +583,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 +737,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/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

@@ -29,7 +29,9 @@
                       <div class="row">
                         <div class="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 10px;margin-right: 75px" v-for="(index,img) in paper.f_overall_imgs">
                           <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="col-xs-4 col-sm-3 col-md-2" style="margin-bottom: 10px;margin-right: 75px" v-for="(index,img) in fileInfoData">
+                          <img-self :src="img.f_downloadURL" alt="总体送气照片" :width="150" :height="200"></img-self>
                         </div>
                       </div>
                     </div>
@@ -362,6 +364,7 @@
     title: '用户反馈',
     data() {
       return {
+        fileInfoData:[],
         paper:this.$parent.data,
         printContent:[],
         radios:[
@@ -432,12 +435,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 +973,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"   v-if="pic">
+      <header slot="modal-header" class="modal-header">
+        上传照片
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="from-group">
+          <safecheck-file-upload
+            :blodid="blodid"
+            :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,19 @@
                 orderFields: {
                   f_offsite_time: 'no'
                 },
+              blodid:null,
+              pic:false,
             }
         },
         methods: {
-
+          piclose(){
+            this.pic=false
+          },
+          addpic(row){
+            this.blodid=row.id
+            this.pic=true
+            debugger
+          },
             change(row) {
                 //Vue.$login = {jwt: row.f_checker_id}
                 asyncReady(this).then(() => {

package/src/components/rongcheng/PaperListSQ.vue

@@ -163,6 +163,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)">
               打印
@@ -173,6 +174,26 @@
     </criteria-paged>
     <check-msg v-if="showcheckmsg" :show="showcheckmsg" :data="checkInfo"></check-msg>
   </div>
+    <modal :show.sync="pic" v-ref:modal backdrop="true" v-if="pic">
+      <header slot="modal-header" class="modal-header">
+        上传照片
+      </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"
+            ></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>
 
@@ -184,6 +205,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) {
@@ -214,6 +236,7 @@
 
     export default {
         title: '民用送气结果查看',
+        components: {safecheckUpload},
         data() {
             let model = new PagedList('rs/sql/查找安检单', 20, {
                 f_plan_id: 'this.f_plan_id',
@@ -230,16 +253,6 @@
             model.f_no_checkplan = ''
             model.f_filialeid = this.$login.f.orgid
             model.f_check_type='民用'
-          // let searchData={
-          //     f_plan_id: this.model.f_checker_id==undefined?"":this.model.f_checker_id,
-          //     f_approved: this.model.f_approved,
-          //     f_entry_status: this.model.f_entry,
-          //     f_no_checkplan:this.model.f_no_checkplan[0],
-          //     f_filialeid: this.model.f_filialeid,
-          //     //orderitem: this.model.f_offsite_time,
-          //     //condition:this.model.condition
-          // }
-            // model.f_subcompany = this.$login.f.f_fengongsi
             return {
               searchData: {
                 condition:"1=1",
@@ -276,10 +289,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(() => {