safecheck-client 4.0.0-10 → 4.0.0-101

package/src/components/android/SafeRightTree.vue

@@ -0,0 +1,217 @@
+<template>
+  <dropdown :model='model' class="auto" id="res-tree" v-if="!islist" v-el:dropdown :style="{width:width}">
+    <button type="button" class="btn btn-default dropdown-toggle select-style" data-toggle="dropdown">
+      <span class='btn-content' :style="{textOverflow:'ellipsis',overflow: 'hidden'}">{{ resname }}</span>
+      <span class="caret"></span>
+    </button>
+    <tree :model='model' :is-click="false" slot="dropdown-menu" class="dropdown-menu auto" role="menu">
+        <span  partial>
+          <span class="glyphicon glyphicon-chevron-down" v-show="row.open&&row.data.children.length>0" style="color:balck;"></span>
+          <span class="glyphicon glyphicon-chevron-right" v-show="!row.open&&row.data.children.length>0" style="color:balck;"></span>
+          <span class="RightTreeCanSelect" v-if="row.data.hasright" @click.stop="$parent.$parent.$parent.selectclick(row.data)">{{row.data.name}}</span>
+          <span class="RightTreeCanNotSelect" v-else>{{row.data.name}}</span>
+          <span class="glyphicon glyphicon-ok " v-if="$parent.$parent.$parent.isSelect(row.data.id)" style="color:balck;"></span>
+        </span>
+    </tree>
+  </dropdown>
+  <v-select v-if="islist"
+            placeholder='热线'
+            :options='childrenOptions'
+            @change="selectclick"
+            :value-single="true"
+            close-on-select></v-select>
+</template>
+<script>
+import * as ldapHelper from '../../utils/LdapHelper'
+import Vue from 'vue'
+export default {
+  title: '资源树',
+  props: {
+    source: {
+      type: String,
+      require: true,
+      default:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`
+    },
+    resid: {
+    },
+    islist: {
+      type: Boolean,
+      default: false
+    },
+    //是否有查看上级的权限
+    Url:{
+      type: String,
+      default:''
+    }
+  },
+  data () {
+    return {
+      width:'100%',
+      resobj:{res:Vue.user.orgs, resids:Vue.user.orgid},
+      userid: Vue.user.id,
+      resname:[Vue.user.orgs],
+      orgnames : [Vue.user.orgs],
+      orgids : [Vue.user.orgid],
+      orgobj:[],
+      model: [
+
+      ],
+      childrenOptions: []
+    }
+  },
+  methods: {
+    selectRes () {
+      let newobj={
+        "res": [this.resname],
+        "resids": [this.orgids],
+      }
+      this.$emit('re-res', newobj)
+    },
+    //点击资源的方法
+    selectclick (row) {
+      if(this.orgids.includes(row.id)){
+        this.orgnames=[]
+        this.orgids=[]
+        this.removeResChild(row)
+        this.orgnames.push(row.name)
+        this.orgids.push(row.id)
+        this.orgobj.push(row)
+      }else{
+        this.orgnames=[]
+        this.orgids=[]
+        this.orgobj=[]
+        this.addResChild(row)
+      }
+      console.log(this.orgnames.join(','))
+      this.resname = this.orgnames.length > 0 ? this.orgnames.join(','):'热线'
+      let newobj={
+        "res": this.orgnames,
+        "resids": this.orgids,
+        "orgobj": this.orgobj,
+      }
+      this.$emit('re-res', newobj)
+    },
+    addResChild(val){
+      // if(this.orgids.includes(val.id)){
+      //   this.orgnames.splice(this.orgnames.indexOf(val.name),1)
+      //   this.orgids.splice(this.orgids.indexOf(val.id),1)
+      // }
+      this.orgnames.push(val.name)
+      this.orgids.push(val.id)
+      this.orgobj.push(val)
+      if(val.children && val.children.length>0){
+        Object.keys(val.children).forEach((key) => {
+          this.addResChild(val.children[key])
+        })
+      }
+    },
+    removeResChild(val){
+      this.orgnames.splice(this.orgnames.indexOf(val.name),1)
+      this.orgids.splice(this.orgids.indexOf(val.id),1)
+      this.orgobj.splice(this.orgids.indexOf(val),1)
+      if(val.children && val.children.length>0){
+        Object.keys(val.children).forEach((key) => {
+          this.removeResChild(val.children[key])
+        })
+      }
+    },
+    //检查是否显示对勾
+    isSelect(val) {
+      if(this.orgids.includes(val)){
+        return true
+      }else{
+        return false
+      }
+    },
+    //树形结构变成list
+    treetoList(val) {
+      for (let value of val) {
+        this.ergodicList(value)
+      }
+    },
+    //找到跟节点
+    ergodicList (val) {
+      val.children.length > 0 ? this.treetoList(val.children) : this.childrenOptions.push({label: val.name, value: val})
+    },
+    //处理显示默认值
+    dealResObj (val) {
+      try{
+        var arr=val.res.split(".")
+        //截取最后一个分公司名字
+        this.resname=arr[arr.length-1].toString()
+        this.resid = val.resids
+      }catch (e){
+        this.resname='热线'
+      }
+    },
+    judgBoundary(){
+      //判断是否超出边界，超出移动
+      if(document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
+        this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
+      }
+    }
+  },
+  events: {
+
+  },
+  ready () {
+    console.log('righttree   ready')
+    if(this.$els.dropdown){
+      console.log('righttree1')
+      this.width = this.$els.dropdown.clientWidth * 0.7 +'px'
+    }
+    console.log('righttree2')
+    this.dealResObj (this.resobj)
+    console.log('righttree3')
+    var data = {
+      source: this.source,
+      userid: this.userid
+    }
+    console.log('向资源服务发送请求')
+    this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/search`, data,{
+      resolveMsg : null ,
+      rejectMsg : null,
+    }).then((ret) => {
+      console.log('向资源服务请求结束')
+      // 去掉前面的两层节点
+      ret.data[0].children[0].children.forEach((item) => {
+        this.model.push(item)
+      })
+      // 给资源添加父关系
+      ldapHelper.procParent(this.model)
+      if (this.islist) {
+        this.treetoList(this.model)
+      }
+      this.selectRes()
+    })
+  },
+  watch: {
+  }
+}
+</script>
+<style lang="less">
+#res-tree {
+  .list-group-item {
+    background-color: #FFF;
+    color: #000;
+    padding: 5px 10px;
+    border:0px;
+    white-space: nowrap;
+  }
+}
+#res-tree .list-group {
+  width: auto;
+  min-width: 100%;
+}
+.hide-text-overflow{
+  overflow: hidden;
+  text-overflow: ellipsis
+}
+.select-style {
+  border: 0px;
+  /*border-bottom: 2px solid #C9CCCF;*/
+  border: 1px solid #93B2D3;
+  border-radius: 0px;
+  color: #555;
+}
+</style>

package/src/components/android/SafecheckDevices.vue

@@ -154,6 +154,9 @@
                           </div>
                           <img v-show="row.f_path" src="../../assets/remove.png" :class="style__"   @click="delfile(idxs, row.f_path)" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
                         </div>
+                        <button v-if="isalbum" style="float: right" type="button" name="button" class="btn btn-primary btn-photo"
+                                @click="takePic2(idxs, row.f_item_name)">相册
+                        </button>
                       </div>
                     </div>
                   </div>
@@ -170,6 +173,9 @@
                           </div>
                           <img v-show="row['f_p' + (itemIndex+1)+'_path']" src="../../assets/remove.png" :class="style__"   @click="delfile(idxs,row['f_p' + (itemIndex+1)+'_path'],'f_p' + (itemIndex+1)+ '_path')" v-if="role!='androidview'" style="width: 40px;height: 40px;position: absolute;left:110px;top:110px"></img>
                         </div >
+                        <button v-if="isalbum" style="float: right" type="button" name="button" class="btn btn-primary btn-photo"
+                                @click="takePic2(idxs, row.f_item_name,'f_p' + (itemIndex+1)+ '_path')">相册
+                        </button>
                       </div>
                     </div>
                   </div>
@@ -302,7 +308,8 @@ export default {
       )(this),
       showElse:false, //控制其他选项是否显示
       showXCImg: false, //  是否显示现场整改拍照选项
-      showZXTime: false //  是否显示自行整改处理时效
+      showZXTime: false, //  是否显示自行整改处理时效
+      isalbum:this.$appdata.getSingleValue('安检使用相册') || false,
     }
   },
   props: ['config','device','idx','operation','role'],
@@ -356,6 +363,7 @@ export default {
     },
     changdeal(val){
       if(val == undefined){
+        this.f_items[this.selectindex].f_deal_dispose = ''
         return
       }
       if(this.selectindex != null) {
@@ -466,6 +474,41 @@ export default {
         param: {file: fileName, requestCode: 111, callback:'javascript:HostApp.__callback__("'+ prop +'","'+ title +'", "%s","'+pathname+'");', watermark: title + '\t时间：'+ Util.toStandardTimeString() + '\t' + Vue.user.name + jingweidu}
       })
     },
+    takePic2(prop, title, pathname='null') {
+      if (this.role == 'androidview') {
+        return
+      }
+      HostApp.__callback__ = this.cameraCallBack
+      HostApp.__this__ = this
+      //tag
+      let fileName
+      if (pathname == 'null') {
+        if (!this.f_items[prop].f_path || this.f_items[prop].f_path.includes("nopic.png")) {
+          fileName = Util.guid() + '-' + 'device' + this.device.n + '-' + this.idx + '-' + 'f_items' + prop + '.jpg'
+        } else {
+          fileName = Util.getFileName(this.f_items[prop].f_path)
+        }
+      } else {
+        if (!this.f_items[prop][pathname] || this.f_items[prop][pathname].includes("nopic.png")) {
+          fileName = Util.guid() + '-' + 'device' + this.device.n + '-' + this.idx + '-' + 'f_items' + prop + '.jpg'
+        } else {
+          fileName = Util.getFileName(this.f_items[prop][pathname])
+        }
+      }
+      let jingweidu = ''
+      if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
+        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',
+        page: 'com.aofeng.hybrid.android.peripheral.ActionPickActivity',
+        param: {file: fileName, requestCode: 111, callback:'javascript:HostApp.__callback__("'+ prop +'","'+ title +'", "%s","'+pathname+'");', watermark: title + '\t时间：'+ Util.toStandardTimeString() + '\t' + Vue.user.name + jingweidu}
+      })
+    },
     cameraCallBack(prop,title, fileName,pathname) {
       //tag
       if (pathname == 'null') {
@@ -625,7 +668,9 @@ export default {
                       if(shImage){
                         this.f_items[n].f_is_defect =true
                         this.f_items[n].f_defect_level = options[i].level
-                        this.f_items[n].f_path = Vue.nopic
+                        if (!multiple){
+                          this.f_items[n].f_path = Vue.nopic
+                        }
                         this.f_items[n].f_live_dispose = '否'
                         this.f_items[n].f_deal_dispose = '未处理'
                         //tag

package/src/components/android/SafecheckOrderV.vue

@@ -472,7 +472,7 @@
           let startOrStopState = HostApp.startOrStopAudioClip(fileName,"开始录音")
           //tag
           if (startOrStopState.code == 200) {
-            this.data.f_recording1_path =  "file:///storage/emulated/0/safecheck/" + fileName
+            this.data.f_recording1_path =  "file:///storage/emulated/0/Download/safecheck/" + fileName
             //tag
             return true;
           }else {
@@ -1433,7 +1433,7 @@
           if(this.item.f_user_type == '非民用'){
             // 非民用
             if (Vue.config.safecheck.DevicesSetConfig != undefined){
-              if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
+              if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined || !Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
                 this.config = this.extend(this.config, Vue.config.safecheck.DevicesSetConfig)
               }else{
                 this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type]])
@@ -1443,7 +1443,7 @@
           }else{
             // 民用户
             if (Vue.config.safecheck.DevicesConfig != undefined){
-              if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined) {
+              if(this.item.f_safecheck_type == undefined || this.item.f_safecheck_type == '' || Vue.config.safecheck.SafecheckType == undefined || !Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]) {
                 this.config = this.extend(this.config, Vue.config.safecheck.DevicesConfig)
               }else{
                 this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_user_type?this.item.f_user_type:'民用']])