telephone-clients 3.0.104-74 → 3.0.104-76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.104-74",
+  "version": "3.0.104-76",
   "description": "呼叫模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/android/ImgArea.vue

@@ -1,80 +1,80 @@
-<template>
-  <div>
-    <div class="row">
-      <button type="button" name="button" class="btn btn-primary" @click="takePic()">拍照</button>
-    </div>
-    <div class="row">
-      <div class="col-xs-4 col-sm-3 col-md-2" v-for="img in model" v-if="img.imgpath == sutitle ">
-        <img-self :src="getimgstr(img)" alt="维修照片" :width="150" :height="200"></img-self>
-        <button type="button" name="button" class="btn btn-default" @click="remove(img)">-</button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import Vue from 'vue'
-  import * as Util from '../../components/Util'
-
-  export default {
-  props: {
-    // 存放照片的数组
-    model: {
-      type: Array
-    },
-    sutitle:'维修照片'
-  },
-  data () {
-    return {
-      // 拍照时的文件名
-      fileName: '',
-      is_has_jingweidu: this.$appdata.getSingleValue('照片水印加经纬度') || 'false',
-
-    }
-  },
-  methods: {
-    // 从图片中删除
-    remove (row) {
-      this.$androidUtil.delfile(row.android_file)
-      let pos = this.model.findIndex((value) => {
-        return value === row
-      });
-      this.model.splice(pos, 1)
-    },
-    // fileName: 回传文件名,传入的带安卓路径url
-    // prop: 传入的字段名，没做改动
-    cameraCallBack(prop, fileName) {
-      alert("callback!!!!!!!!!!!!!!!!!!--start")
-      // 当前this只能通过HostApp.__tis__获取
-      let self = this.$androidUtil.getCallBack(this)
-      // 添加新图片
-      self.model.push({
-        android_file: self.fileName,
-        path: fileName,
-        imgpath: this.sutitle
-      })
-      alert("callback!!!!!!!!!!!!!!!!!!--end")
-    },
-    takePic() {
-      const obj = HostApp.getGpsDetailAddress()
-      let jingweidu = ''
-      if (this.is_has_jingweidu == 'true'){
-        jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
-      }
-      let prop = 'repair'
-      let idx = 'aofeng'
-      this.fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
-      this.$androidUtil.takePic(this, this.cameraCallBack, this.fileName,this.sutitle+jingweidu)
-    },
-    getimgstr(val){
-      if(!val){
-        return ''
-      }
-      if(Vue.android){
-        return val.path + '?' + Math.random()
-      }
-      return 'rs/file/getfile/' + val.imgid
-    }
-  },
-}
-</script>
+<template>
+  <div>
+    <div class="row">
+      <button type="button" name="button" class="btn btn-primary" @click="takePic()">拍照</button>
+    </div>
+    <div class="row">
+      <div class="col-xs-4 col-sm-3 col-md-2" v-for="img in model" v-if="img.imgpath == sutitle ">
+        <img-self :src="getimgstr(img)" alt="维修照片" :width="150" :height="200"></img-self>
+        <button type="button" name="button" class="btn btn-default" @click="remove(img)">-</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import * as Util from '../../components/Util'
+
+  export default {
+  props: {
+    // 存放照片的数组
+    model: {
+      type: Array
+    },
+    sutitle:'维修照片'
+  },
+  data () {
+    return {
+      // 拍照时的文件名
+      fileName: '',
+      is_has_jingweidu: this.$appdata.getSingleValue('照片水印加经纬度') || 'false',
+
+    }
+  },
+  methods: {
+    // 从图片中删除
+    remove (row) {
+      this.$androidUtil.delfile(row.android_file)
+      let pos = this.model.findIndex((value) => {
+        return value === row
+      });
+      this.model.splice(pos, 1)
+    },
+    // fileName: 回传文件名,传入的带安卓路径url
+    // prop: 传入的字段名，没做改动
+    cameraCallBack(prop, fileName) {
+      alert("callback!!!!!!!!!!!!!!!!!!--start")
+      // 当前this只能通过HostApp.__tis__获取
+      let self = this.$androidUtil.getCallBack(this)
+      // 添加新图片
+      self.model.push({
+        android_file: self.fileName,
+        path: fileName,
+        imgpath: this.sutitle
+      })
+      alert("callback!!!!!!!!!!!!!!!!!!--end")
+    },
+    takePic() {
+      const obj = HostApp.getGpsDetailAddress()
+      let jingweidu = ''
+      if (this.is_has_jingweidu == 'true'){
+        jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
+      }
+      let prop = 'repair'
+      let idx = 'aofeng'
+      this.fileName = Util.guid() + '-valve-' + idx + '-' + prop + '.jpg'
+      this.$androidUtil.takePic(this, this.cameraCallBack, this.fileName,this.sutitle+jingweidu)
+    },
+    getimgstr(val){
+      if(!val){
+        return ''
+      }
+      if(Vue.android){
+        return val.path + '?' + Math.random()
+      }
+      return 'rs/file/getfile/' + val.imgid
+    }
+  },
+}
+</script>

package/src/components/pc/RoleSelector.vue

@@ -1,145 +1,145 @@
-<template>
-    <div style="width: 100%;height: 100%">
-        <div class="col-sm-6 form-group" style="margin-bottom: 0px">
-            <label class="font_normal_body">公&emsp;&emsp;司</label>
-            <right-tree-safe :width="leftWidth" @re-res="getRes"></right-tree-safe>
-        </div>
-        <div class="col-sm-6 form-group" style="margin-bottom: 0px">
-            <label class="font_normal_body">{{roleLable}}</label>
-            <v-select :value="changeval" v-model='changeval'
-                      :value-single="!valueMultiple"
-                      class="select_list select"
-                      :options='users' :placeholder='roleName'
-                      close-on-select
-                      :multiple="valueMultiple"
-                      :width="rightWidth"
-                      @change="valuechange">
-            </v-select>
-        </div>
-    </div>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-  export default {
-    name: "RoleSelector",
-    props: {
-      valueMultiple: {
-        type: Boolean,
-        default: false
-      },
-      roleName: {
-        type: String,
-        default: '安检员'
-      },
-      roleLable: {
-        type: String,
-        default: '安检员'
-      },
-      leftWidth: {
-        type: String,
-        default: '60%'
-      },
-      rightWidth: {
-        type: String,
-        default: '60%'
-      },
-      value: {
-        default: ''
-      }
-    },
-    data() {
-      return {
-        //source: `tool.getChildrenOfResName($${this.roleName}$)`,
-        source: `tool.getFullTree(this.getRights().where(row.getType() == $user$).where(row.getAttributes().get($rolestr$)!=null).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$)!=-1))`,
-        allUsers: [],
-        users: [],
-        resids: [],
-        changeval: ''
-      }
-    },
-    // watch: {
-    //   'value' (val) {
-    //     if (val) {
-    //       this.changeval = val
-    //     }
-    //   }
-    // },
-    ready () {
-      let http = new HttpResetClass()
-      http.load('POST', '/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
-        .then(res => {
-          //tag)
-          this.allUsers = res.data
-          //this.filterUser(this.resids)
-          this.getUser(this.allUsers,this.resids)
-         })
-    },
-    methods: {
-      valuechange(val){
-
-        if (val instanceof Event){
-          return
-        }
-        if(this.valueMultiple && Array.isArray(val)){
-          if(val&&val.length > 0){
-            var valuesele = `(`
-            for (var i= 0;i<val.length;i++) {
-              valuesele += `'${val[i]}',`
-            }
-            this.value =  valuesele.substring(0,valuesele.length -1 ) + ')'
-          }else{
-            this.value =  ''
-          }
-        }else{
-           this.value = val
-        }
-        if (!this.value instanceof Event) {
-          this.changeval = val
-          this.value = val
-        }
-      },
-      getRes(obj) {
-        this.resids = obj.resids
-        //tag
-        this.users = [{label: '全部', value: ''}]
-        //this.filterUser(this.resids)
-        this.getUser(this.allUsers,this.resids)
-        this.$dispatch('re-res',obj)
-      },
-      filterUser(resids) {
-        // 处理第一次进入页面值异常问题
-        if(resids.length > 0 && typeof resids[0] == "object"){
-          resids = resids[0]
-        }
-        this.users = []
-        this.allUsers.forEach(user => {
-          if (resids.indexOf(user.orgid) != -1) {
-            this.users.push({label: user.name, value: user.name})
-          }
-        })
-        if(this.users.length > 0){
-          this.users = [{label: '全部', value: ''},...this.users]
-        }
-        //tag
-      },
-      getUser(node,resids){
-        if(resids.length==0){return}
-        for(let x in node){
-          //tag
-          if(node[x].resourcetype=='organization' || node[x].resourcetype=='root'){
-            this.getUser(node[x].children,resids)
-          }else if(node[x].resourcetype=='department' && resids.indexOf(node[x].parentid) != -1 ){
-            for(let dep in node[x].children){
-              this.users.push({label: node[x].children[dep].name, value: node[x].children[dep].name})
-            }
-          }
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+    <div style="width: 100%;height: 100%">
+        <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+            <label class="font_normal_body">公&emsp;&emsp;司</label>
+            <right-tree-safe :width="leftWidth" @re-res="getRes"></right-tree-safe>
+        </div>
+        <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+            <label class="font_normal_body">{{roleLable}}</label>
+            <v-select :value="changeval" v-model='changeval'
+                      :value-single="!valueMultiple"
+                      class="select_list select"
+                      :options='users' :placeholder='roleName'
+                      close-on-select
+                      :multiple="valueMultiple"
+                      :width="rightWidth"
+                      @change="valuechange">
+            </v-select>
+        </div>
+    </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+  export default {
+    name: "RoleSelector",
+    props: {
+      valueMultiple: {
+        type: Boolean,
+        default: false
+      },
+      roleName: {
+        type: String,
+        default: '安检员'
+      },
+      roleLable: {
+        type: String,
+        default: '安检员'
+      },
+      leftWidth: {
+        type: String,
+        default: '60%'
+      },
+      rightWidth: {
+        type: String,
+        default: '60%'
+      },
+      value: {
+        default: ''
+      }
+    },
+    data() {
+      return {
+        //source: `tool.getChildrenOfResName($${this.roleName}$)`,
+        source: `tool.getFullTree(this.getRights().where(row.getType() == $user$).where(row.getAttributes().get($rolestr$)!=null).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$)!=-1))`,
+        allUsers: [],
+        users: [],
+        resids: [],
+        changeval: ''
+      }
+    },
+    // watch: {
+    //   'value' (val) {
+    //     if (val) {
+    //       this.changeval = val
+    //     }
+    //   }
+    // },
+    ready () {
+      let http = new HttpResetClass()
+      http.load('POST', '/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
+        .then(res => {
+          //tag)
+          this.allUsers = res.data
+          //this.filterUser(this.resids)
+          this.getUser(this.allUsers,this.resids)
+         })
+    },
+    methods: {
+      valuechange(val){
+
+        if (val instanceof Event){
+          return
+        }
+        if(this.valueMultiple && Array.isArray(val)){
+          if(val&&val.length > 0){
+            var valuesele = `(`
+            for (var i= 0;i<val.length;i++) {
+              valuesele += `'${val[i]}',`
+            }
+            this.value =  valuesele.substring(0,valuesele.length -1 ) + ')'
+          }else{
+            this.value =  ''
+          }
+        }else{
+           this.value = val
+        }
+        if (!this.value instanceof Event) {
+          this.changeval = val
+          this.value = val
+        }
+      },
+      getRes(obj) {
+        this.resids = obj.resids
+        //tag
+        this.users = [{label: '全部', value: ''}]
+        //this.filterUser(this.resids)
+        this.getUser(this.allUsers,this.resids)
+        this.$dispatch('re-res',obj)
+      },
+      filterUser(resids) {
+        // 处理第一次进入页面值异常问题
+        if(resids.length > 0 && typeof resids[0] == "object"){
+          resids = resids[0]
+        }
+        this.users = []
+        this.allUsers.forEach(user => {
+          if (resids.indexOf(user.orgid) != -1) {
+            this.users.push({label: user.name, value: user.name})
+          }
+        })
+        if(this.users.length > 0){
+          this.users = [{label: '全部', value: ''},...this.users]
+        }
+        //tag
+      },
+      getUser(node,resids){
+        if(resids.length==0){return}
+        for(let x in node){
+          //tag
+          if(node[x].resourcetype=='organization' || node[x].resourcetype=='root'){
+            this.getUser(node[x].children,resids)
+          }else if(node[x].resourcetype=='department' && resids.indexOf(node[x].parentid) != -1 ){
+            for(let dep in node[x].children){
+              this.users.push({label: node[x].children[dep].name, value: node[x].children[dep].name})
+            }
+          }
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>