From 645834e1c3efb3a8c50dcbda98d87caba04bd421 Mon Sep 17 00:00:00 2001 From: fei.wang <wf18701153496@163.com> Date: 星期三, 13 八月 2025 14:34:02 +0800 Subject: [PATCH] v1.2.8 --- pages/index/tag.vue | 431 +++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 335 insertions(+), 96 deletions(-) diff --git a/pages/index/tag.vue b/pages/index/tag.vue index cce16fb..f215cb6 100644 --- a/pages/index/tag.vue +++ b/pages/index/tag.vue @@ -9,8 +9,8 @@ <!-- <text class='tn-icon add'></text> --> </view> <!-- <text class="title_linespan" @click="goAchor">鍩虹珯</text> --> - <text v-if="isAchor==false" class="title_linespan" style="margin-left: 10px;" @click="goAchor">鏍囩绠$悊</text> - <text v-else class="title_linespan" style="margin-left: 10px;" @click="goTag">鏍囩绠$悊</text> + <text v-if="isAchor==false" class="title_linespan" style="margin-left: 10px;" @click="goAchor">缁堢绠$悊</text> + <text v-else class="title_linespan" style="margin-left: 10px;" @click="goTag">缁堢绠$悊</text> </tn-nav-bar> <view v-show="lock==false" class="page-wrap u-skeleton"> @@ -21,12 +21,12 @@ <view style="color: #00aaff;margin-left: 20px;">绂荤嚎锛歿{offline}}</view> </view> <data-list :width="width" class="data-list" ref="list" @load="handleLoad" @refresh="handleRefresh" - style="margin-top: 100px;"> + style="margin-top: 90px;"> <view v-for="(item, index) in list" :key="index"> <tn-button shape="icon" class="tn-icon-edit" style="position: absolute;left: 85%;" size="lg" @click="editClick(item,index)"></tn-button> - <view style="display: flex;margin-bottom: 10px;" class="flex flex-direction"> + <view style="display: flex;margin-top: 12px;" class="flex flex-direction"> <u-badge v-if="item.online==1" style="margin-top: 8px;margin-right: 8px;" :isDot="true" type="success"></u-badge> <u-badge v-else style="margin-top: 8px;margin-right: 8px;" :isDot="true" type="info"></u-badge> @@ -39,22 +39,52 @@ <!-- <view style="margin-left: 20px;">鐢甸噺:{{item.ppower}}%</view> --> </view> <view style="display: flex;margin-left: 14px;margin-bottom: 10px;"> - <view style="color: #5e5e5e;">鏍囩绫诲瀷:{{item.type}}</view> + <view style="color: #5e5e5e;">缁堢绫诲瀷:{{item.type}}</view> <!-- <view style="margin-left: 14px;color: #5e5e5e;">{{item.psex}}</view> --> - <view style="margin-left: 14px;color: #5e5e5e;">閮ㄩ棬:{{item.department}}</view> + <view style="margin-left: 14px;color: #5e5e5e;">浣滀笟璁″垝:{{item.department}}</view> + </view> + <!-- <view style="display: flex;"> + <view style="margin-bottom: 10px;font-size: 16px;">鍗″彿锛歿{detailform.baoliu1}}</view> + <image src="../../static/img/fuzhi.png" style="width:20px;height:20px;" + @click="copyInfo(detailform.baoliu1)"> + </image> + </view> --> + + <view style="display: flex;margin-left: 14px;margin-bottom: 10px;"> + <view v-if="item.mestagid=='-1' || item.mestagid==null" style="color: #5e5e5e;">鎻愰啋缁堢:鏃�</view> + <view v-else style="color: #5e5e5e;">鎻愰啋缁堢:{{item.mestagid}}</view> + <!-- <view style="margin-left: 14px;color: #5e5e5e;">{{item.psex}}</view> --> + <view v-if="item.bisuoid=='-1' || item.bisuoid==null" style="margin-left: 14px;color: #5e5e5e;"> + 鑱斿姩闂攣:鏃�</view> + <view v-else style="margin-left: 14px;color: #5e5e5e;">鑱斿姩闂攣:{{item.bisuoid}}</view> + <!-- <view style="margin-left: 14px;color: #5e5e5e;">鑱斿姩闂攣:{{item.bisuoid}}</view> --> + <view v-if="item.sound=='-1' || item.sound==null" style="margin-left: 14px;color: #5e5e5e;"> + 澹板厜鎶ヨ鍣�:鏃�</view> + <view v-else style="color: #5e5e5e;">澹板厜鎶ヨ鍣�:{{item.sound}}</view> + <view + style="position: absolute;left: 85%;font-size: 12px;border-radius: 4px; background-color: rgba(0, 170, 255, 0.5);padding: 5px;" + @click="positionclick(item.lat ,item.lon)">瀹氫綅</view> </view> <view style="display: flex;margin-left: 14px;margin-bottom: 10px;"> - <view style="color: #5e5e5e;">鎻愰啋鏍囩:{{item.mestagid}}</view> + <view v-if="item.ccid=='-1' || item.ccid==null" style="color: #5e5e5e;">鍗″彿:鏃�</view> + <view v-else style="color: #5e5e5e;">鍗″彿:{{item.ccid}}</view> <!-- <view style="margin-left: 14px;color: #5e5e5e;">{{item.psex}}</view> --> - <view style="margin-left: 14px;color: #5e5e5e;">鑱斿姩闂攣:{{item.bisuoid}}</view> + <image v-if="item.ccid!='-1' && item.ccid!=null" src="../../static/img/fuzhi.png" + style="width:20px;height:20px;" @click="copyInfo(item.ccid)"> + </image> </view> <view style="display: flex;margin-left: 14px;margin-bottom: 10px;"> <view style="color: #5e5e5e;">鍔犲瘑:{{item.encryption}}</view> <!-- <view style="margin-left: 14px;color: #5e5e5e;">{{item.psex}}</view> --> <view style="margin-left: 14px;color: #5e5e5e;">宸垎鏁版嵁婧�:{{item.rtcm}}</view> </view> - <view style="margin-left: 14px;margin-bottom: 10px;color: #5e5e5e;">鏃堕棿:{{item.addtime}}</view> - <u-line style="margin-left: 14px;margin-bottom: 10px;"></u-line> + <view style="display: flex;margin-left: 14px;margin-bottom: 12px;"> + <view style=" color: #5e5e5e;">鏃堕棿:{{item.addtime}}</view> + <!-- <view style="margin-left: 14px;color: #5e5e5e;">{{item.psex}}</view> --> + + </view> + + <u-line style="margin-left: 14px;"></u-line> </view> </data-list> </view> @@ -65,51 +95,104 @@ <view class="page-wrap u-skeleton"> --> <!-- <view class="item-wrap"> --> <!-- <view style="max-height: 300px; overflow-y: auto;"> --> - <tn-form> - <tn-form-item label="缂栧彿:" :labelWidth="labelWidth"> - <tn-input :disabled="disabled" v-model="form.tagid" inputAlign="right" - placeholder="璇疯緭鍏ョ紪鍙�"></tn-input> - </tn-form-item> - <tn-form-item label="鍚嶇О:" :labelWidth="labelWidth"> - <tn-input v-model="form.personname" inputAlign="right" placeholder="璇疯緭鍏ュ悕绉�"></tn-input> - </tn-form-item> - <tn-form-item label="鍔犲瘑:" :labelWidth="labelWidth"> + <u-form> + <u-form-item label="缂栧彿:" :labelWidth="labelWidth"> + <u-input :disabled="disabled" v-model="form.tagid" inputAlign="right" + placeholder="璇疯緭鍏ョ紪鍙�"></u-input> + </u-form-item> + <u-form-item label="鍚嶇О:" :labelWidth="labelWidth"> + <u-input v-model="form.personname" inputAlign="right" placeholder="璇疯緭鍏ュ悕绉�"></u-input> + </u-form-item> + <u-form-item label="鍔犲瘑:" :labelWidth="labelWidth" @click="show6 = true"> <!-- <tn-input v-model="form.encryption" inputAlign="right" placeholder="璇疯緭鍏ュ唴瀹�"></tn-input> --> - <tn-input v-model="form.encryption" type="select" @click="show6 = true" placeholder="璇烽�夋嫨鏄惁鍔犲瘑" /> - <tn-action-sheet :list="encryptionList" v-model="show6" @click="encryptionCallback"></tn-action-sheet> - </tn-form-item> - <tn-form-item label="鎸佹湁绫诲瀷:" :labelWidth="labelWidth"> - <tn-input v-model="form.type" type="select" @click="show3 = true" placeholder="璇烽�夋嫨绫诲瀷" /> - <tn-action-sheet :list="typeList" v-model="show3" @click="typeCallback"></tn-action-sheet> - </tn-form-item> - <tn-form-item label="鏍囩绫诲瀷:" :labelWidth="labelWidth"> - <tn-input v-model="form.baoliu1" type="select" @click="show2 = true" placeholder="璇烽�夋嫨绫诲瀷" /> - <tn-action-sheet :list="holdtypeList" v-model="show2" @click="holdtypeCallback"></tn-action-sheet> - </tn-form-item> + <!-- <tn-input v-model="form.encryption" type="select" @click="show6 = true" placeholder="璇烽�夋嫨鏄惁鍔犲瘑" /> --> + <!-- <tn-action-sheet :list="encryptionList" v-model="show6" + @click="encryptionCallback"></tn-action-sheet> --> + <u-input v-model="form.encryption" disabled disabledColor="#ffffff" placeholder="璇烽�夋嫨鏄惁鍔犲瘑" + border="none" /> + <u-icon slot="right" name="arrow-down"></u-icon> + <tn-select v-model="show6" mode="single" :list="encryptionList" @confirm="encryptionCallback" + :searchShow="true"></tn-select> + </u-form-item> + <u-form-item label="鎸佹湁绫诲瀷:" :labelWidth="labelWidth" @click="show3 = true"> + <!-- <tn-input v-model="form.type" type="select" @click="show3 = true" placeholder="璇烽�夋嫨绫诲瀷" /> --> + <u-input v-model="form.type" disabled disabledColor="#ffffff" placeholder="璇烽�夋嫨绫诲瀷" border="none" /> + <u-icon slot="right" name="arrow-down"></u-icon> + <!-- <tn-action-sheet :list="typeList" v-model="show3" @click="typeCallback"></tn-action-sheet> --> + <tn-select v-model="show3" mode="single" :list="typeList" @confirm="typeCallback" + :searchShow="true"></tn-select> + </u-form-item> + <u-form-item label="缁堢绫诲瀷:" :labelWidth="labelWidth" @click="show2 = true"> + <!-- <tn-input v-model="form.baoliu1" type="select" @click="show2 = true" placeholder="璇烽�夋嫨绫诲瀷" /> --> + <u-input v-model="form.baoliu1" disabled disabledColor="#ffffff" placeholder="璇烽�夋嫨绫诲瀷" + border="none" /> + <u-icon slot="right" name="arrow-down"></u-icon> + <!-- <tn-action-sheet :list="holdtypeList" v-model="show2" @click="holdtypeCallback"></tn-action-sheet> --> + <tn-select v-model="show2" mode="single" :list="holdtypeList" @confirm="holdtypeCallback" + :searchShow="true"></tn-select> + </u-form-item> - <tn-form-item label="鍏宠仈閮ㄩ棬:" :labelWidth="labelWidth"> - <tn-input v-model="form.department" type="select" @click="show1 = true" placeholder="璇烽�夋嫨鍏宠仈閮ㄩ棬" /> - <tn-action-sheet :list="bumenList" v-model="show1" @click="bymenCallback"></tn-action-sheet> - </tn-form-item> + <u-form-item label="鍏宠仈浣滀笟:" :labelWidth="labelWidth" @click="show1 = true"> + <!-- <tn-input v-model="form.department" type="select" @click="show1 = true" placeholder="璇烽�夋嫨鍏宠仈浣滀笟" /> --> + <u-input v-model="form.department" disabled disabledColor="#ffffff" placeholder="璇烽�夋嫨鍏宠仈浣滀笟" + border="none" /> + <u-icon slot="right" name="arrow-down"></u-icon> + <!-- <tn-action-sheet :list="bumenList" v-model="show1" @click="bymenCallback"></tn-action-sheet> --> - <tn-form-item label="鎻愰啋鏍囩:" :labelWidth="labelWidth"> - <u-badge v-if="tixingonlie==1 && form.mestagid!=''" :isDot="true" type="success"></u-badge> - <u-badge v-else-if="tixingonlie==0 && form.mestagid!=''" :isDot="true" type="info"></u-badge> + <tn-select v-model="show1" mode="single" :list="bumenList" @confirm="bymenCallback" + :searchShow="true"></tn-select> + </u-form-item> - <tn-input v-model="form.mestagid" type="select" @click="show4 = true" placeholder="璇烽�夋嫨鎻愰啋鏍囩" /> - <tn-action-sheet :list="tixinglist" v-model="show4" @click="tixingCallback"></tn-action-sheet> + <u-form-item label="鎻愰啋缁堢:" :labelWidth="labelWidth"> + <!-- <u-badge v-if="tixingonlie==1 && form.mestagid!=''" :isDot="true" type="success"></u-badge> + <u-badge v-else-if="tixingonlie==0 && form.mestagid!=''" :isDot="true" type="info"></u-badge> --> + + <!-- <tn-input clearable v-model="form.mestagid" type="select" @click="show4 = true" placeholder="璇烽�夋嫨鎻愰啋缁堢" /> + <tn-action-sheet :list="tixinglist" v-model="show4" @click="tixingCallback"></tn-action-sheet> --> <!-- <tn-input v-model="form.mestagid" inputAlign="right" placeholder="璇疯緭鍏ユ彁閱掓爣绛�"></tn-input> --> - </tn-form-item> + <zxz-uni-data-select v-model="value1" multiple dataKey="lable" dataValue="value" + :localdata="tixinglist" clear @change="change"></zxz-uni-data-select> + <!-- <mySelectCheckbox v-model="form.mestagid" multiple dataKey="text" dataValue="value" :localdata="tixinglist" + clear @change="change"></mySelectCheckbox> --> + </u-form-item> - <tn-form-item label="鑱斿姩闂攣:" :labelWidth="labelWidth"> - <u-badge v-if="bisuoonlie==1 && form.mestagid!=''" :isDot="true" type="success"></u-badge> - <u-badge v-else-if="tixingonlie==0 && form.mestagid!=''" :isDot="true" type="info"></u-badge> + <u-form-item label="鑱斿姩闂攣:" :labelWidth="labelWidth"> + <!-- <u-badge v-if="bisuoonlie==1 && form.mestagid!=''" :isDot="true" type="success"></u-badge> + <u-badge v-else-if="tixingonlie==0 && form.mestagid!=''" :isDot="true" type="info"></u-badge> --> <!-- <tn-input v-model="form.bisuoid" inputAlign="right" placeholder="璇疯緭鍏ヨ仈鍔ㄩ棴閿�"></tn-input> --> - <tn-input v-model="form.bisuoid" type="select" @click="show5 = true" placeholder="璇烽�夋嫨鑱斿姩闂攣" /> - <tn-action-sheet :list="bisuolist" v-model="show5" @click="bisuoCallback"></tn-action-sheet> - </tn-form-item> + <!-- <tn-input v-model="form.bisuoid" type="select" @click="show5 = true" placeholder="璇烽�夋嫨鑱斿姩闂攣" /> + <tn-action-sheet :list="bisuolist" v-model="show5" @click="bisuoCallback"></tn-action-sheet> --> + <zxz-uni-data-select v-model="value2" multiple dataKey="lable" dataValue="value" + :localdata="bisuolist" clear @change="change1"></zxz-uni-data-select> + <!-- <mySelectCheckbox v-model="form.bisuoid" multiple dataKey="value" dataValue="value" :localdata="bisuolist" + clear style="margin-right: -10px;" ></mySelectCheckbox> --> + </u-form-item> - </tn-form> + <u-form-item label="澹板厜鎶ヨ鍣�:" :labelWidth="labelWidth"> + <!-- <u-badge v-if="soundonlie==1 && form.sound!=''" :isDot="true" type="success"></u-badge> + <u-badge v-else-if="soundonlie==0 && form.sound!=''" :isDot="true" type="info"></u-badge> --> + <!-- <tn-input v-model="form.bisuoid" inputAlign="right" placeholder="璇疯緭鍏ヨ仈鍔ㄩ棴閿�"></tn-input> --> + <!-- <tn-input v-model="form.bisuoid" type="select" @click="show5 = true" placeholder="璇烽�夋嫨鑱斿姩闂攣" /> + <tn-action-sheet :list="bisuolist" v-model="show5" @click="bisuoCallback"></tn-action-sheet> --> + <!-- <zxz-uni-data-select v-model="value3" multiple dataKey="lable" dataValue="value" + :localdata="soundlist" clear @change="change2"></zxz-uni-data-select> --> + <!-- <mySelectCheckbox v-model="form.bisuoid" multiple dataKey="value" dataValue="value" :localdata="bisuolist" + clear style="margin-right: -10px;" ></mySelectCheckbox> --> + </u-form-item> + + <u-form-item > + <!-- <u-badge v-if="soundonlie==1 && form.sound!=''" :isDot="true" type="success"></u-badge> + <u-badge v-else-if="soundonlie==0 && form.sound!=''" :isDot="true" type="info"></u-badge> --> + <!-- <tn-input v-model="form.bisuoid" inputAlign="right" placeholder="璇疯緭鍏ヨ仈鍔ㄩ棴閿�"></tn-input> --> + <!-- <tn-input v-model="form.bisuoid" type="select" @click="show5 = true" placeholder="璇烽�夋嫨鑱斿姩闂攣" /> + <tn-action-sheet :list="bisuolist" v-model="show5" @click="bisuoCallback"></tn-action-sheet> --> + <zxz-uni-data-select v-model="value3" multiple dataKey="lable" dataValue="value" + :localdata="soundlist" clear @change="change2"></zxz-uni-data-select> + <!-- <mySelectCheckbox v-model="form.bisuoid" multiple dataKey="value" dataValue="value" :localdata="bisuolist" + clear style="margin-right: -10px;" ></mySelectCheckbox> --> + </u-form-item> + + </u-form> <!-- </view> --> <!-- </view> <button style="margin-top: 20px;" type="primary" @click="submitForm">淇濆瓨鍥存爮</button> --> @@ -122,13 +205,14 @@ <script> import successCom from '@/components/success.vue' - + import mySelectCheckbox from './my-selelctCheckbox.vue' import { minLogin } from '@/js/minLogin.js' import { findbisuo, findtixing, + findsound, saveper, updateper, findbumen, @@ -140,10 +224,14 @@ export default { mixins: [minLogin, pagesEquipment], components: { + mySelectCheckbox, successCom }, data() { return { + value3: '', + value2: '', + value1: '', show5: false, show4: false, show3: false, @@ -153,58 +241,78 @@ disabled: false, show6: false, encryptionList: [{ - text: '鏄�' + value: '鏄�', + label: '鏄�' }, - + { - text: '鍚�' + value: '鍚�', + label: '鍚�' } ], holdtypeList: [{ - text: '鎵嬫寔鏍囩' + value: '鎵嬫寔鏍囩', + label: '鎵嬫寔鏍囩' }, { - text: '杞﹁浇鏍囩' + value: '杞﹁浇鏍囩', + label: '杞﹁浇鏍囩' }, { - text: '楂樼簿搴﹀伐鍗�' + value: '楂樼簿搴﹀伐鍗�', + label: '楂樼簿搴﹀伐鍗�' }, { - text: '鎻愰啋鏍囩' + value: '鎻愰啋鏍囩', + label: '鎻愰啋鏍囩' }, { - text: '闂攣瑁呯疆' + value: '闂攣瑁呯疆', + label: '闂攣瑁呯疆' + }, + { + value: '澹板厜鎶ヨ鍣�', + label: '澹板厜鎶ヨ鍣�' } ], typeList: [{ - text: '宸ヤ綔璐熻矗浜�' + value: '宸ヤ綔璐熻矗浜�', + label: '宸ヤ綔璐熻矗浜�' }, { - text: '涓撹矗鐩戞姢浜�' + value: '涓撹矗鐩戞姢浜�', + label: '涓撹矗鐩戞姢浜�' }, { - text: '鐧婚珮浣滀笟浜�' + value: '鐧婚珮浣滀笟浜�', + label: '鐧婚珮浣滀笟浜�' }, { - text: '涓�鑸綔涓氫汉' + value: '涓�鑸綔涓氫汉', + label: '涓�鑸綔涓氫汉' }, { - text: '鍚婅溅' + value: '鍚婅溅', + label: '鍚婅溅' }, { - text: '鏂楄噦杞�' + value: '鏂楄噦杞�', + label: '鏂楄噦杞�' }, { - text: '鎸栨帢鏈�' + value: '鎸栨帢鏈�', + label: '鎸栨帢鏈�' }, { - text: '娉佃溅' + value: '娉佃溅', + label: '娉佃溅' }, { - text: '涓�鑸溅杈�' + value: '涓�鑸溅杈�', + label: '涓�鑸溅杈�' }, ], @@ -213,11 +321,12 @@ form: { baoliu1: '', tagid: '', - encryption:'', + encryption: '', personname: '', department: '', type: '', mestagid: '', + sound: '', company: '', alterPerson: '', perCompany: '', @@ -250,6 +359,9 @@ tixingonlie: '', bisuoonlie: '', bisuolist: [], + + soundlist: [], + soundonlie: '', boxKey: 0, scrollHeight: 500, topheight: 0, @@ -277,9 +389,11 @@ } }, mounted() { + this.findsoundall() this.findbisuoall() this.findbumenall() this.findtixingall() + this.topheight = this.vuex_custom_bar_height + 15 setTimeout(() => { this.showSkeleton = false @@ -293,27 +407,96 @@ }, methods: { + copyInfo(e) { + // this.gettime() + let _this = this + uni.setClipboardData({ + data: e, + success: function() { + // _this.info = '澶嶅埗淇℃伅鎴愬姛'+formatDate(new Date(), 'hh:mm:ss') + uni.showToast({ + title: '澶嶅埗鎴愬姛', + icon: 'success', + duration: 2000 + }); + } + }); + }, + change(e) { + let va = '' + for (var i = 0; i < this.value1.length; i++) { + if (i == this.value1.length - 1) { + va += this.value1[i] + } else { + va += this.value1[i] + ";" + } + + } + if (va == '') { + this.form.mestagid = '-1' + } else { + this.form.mestagid = va + } + }, + change1(e) { + let va = '' + for (var i = 0; i < this.value2.length; i++) { + if (i == this.value2.length - 1) { + va += this.value2[i] + } else { + va += this.value2[i] + ";" + } + + } + if (va == '') { + this.form.bisuoid = '-1' + } else { + this.form.bisuoid = va + } + }, + change2(e) { + let va = '' + for (var i = 0; i < this.value3.length; i++) { + if (i == this.value3.length - 1) { + va += this.value3[i] + } else { + va += this.value3[i] + ";" + } + + } + if (va == '') { + this.form.sound = '-1' + } else { + this.form.sound = va + } + }, + + + positionclick(e, i) { + this.$emit('toposition', e + "," + i); + }, cancelmodal() { + this.value1 = '' + this.value2 = '' + this.value3 = '' this.showpopup = false }, //淇濆瓨鍥存爮 submitForm() { + if (this.disabled == true) { //淇敼 this.form.company = this.company this.form.percompany = this.company this.form.alterPerson = this.vuex_user - updateper(this.form).then((res) => { - - - // if (res.code == 0) { - - // } this.$refs.refSuccess.showBox({ type: 'success', txt: "淇敼鎴愬姛" }); + this.value3 = '' + this.value1 = '' + this.value2 = '' this.showpopup = false setTimeout(() => { this.handleRefresh({ @@ -322,8 +505,12 @@ }, () => { // 鍙互鍦ㄨ繖閲屽鐞嗗姞杞藉畬鎴愬悗鐨勯�昏緫 }); + this.findbisuoall() + this.findbumenall() + this.findtixingall() + this.findsoundall() }, 1000) - + }) } else { @@ -331,6 +518,10 @@ if (this.form.mestagid == '') { this.form.mestagid = '-1' } + if (this.form.sound == '') { + this.form.sound = '-1' + } + if (this.form.bisuoid == '') { this.form.bisuoid = '-1' } @@ -350,6 +541,11 @@ }, () => { // 鍙互鍦ㄨ繖閲屽鐞嗗姞杞藉畬鎴愬悗鐨勯�昏緫 }); + this.findbisuoall() + this.findbumenall() + this.findtixingall() + this.findsoundall() + }) } }, @@ -361,6 +557,8 @@ this.form.tagid = '' this.form.department = '' this.form.mestagid = '' + this.form.sound = '' + this.form.type = '' this.form.bisuoid = '' this.form.baoliu1 = '' @@ -374,12 +572,36 @@ juese: uni.getStorageSync('juese'), } findbisuo(params).then((res) => { - console.log(res); if (res.code == 0) { this.bisuolist = res.data.map(item => ({ - value: item.online, - text: item.tagid + value: item.tagid, + lable: item.tagid, + line: item.online })); + } + + }) + } + + }, + + findsoundall() { + console.log(111111111111111111); + console.log(this.vuex_is_login); + if (this.vuex_is_login) { + const params = { + company: this.company, + juese: uni.getStorageSync('juese'), + } + console.log(params); + findsound(params).then((res) => { + console.log(res); + if (res.code == 0) { + this.soundlist = res.data.map(item => ({ + value: item.deviceMac, + lable: item.deviceMac, + // line: item.online + })); } }) @@ -394,11 +616,11 @@ juese: uni.getStorageSync('juese'), } findtixing(params).then((res) => { - console.log(res); if (res.code == 0) { this.tixinglist = res.data.map(item => ({ - value: item.online, - text: item.tagid + value: item.tagid, + lable: item.tagid, + line: item.online })); // } else { // this.$refs.refSuccess.showBox({ @@ -418,11 +640,10 @@ juese: uni.getStorageSync('juese'), } findbumen(params).then((res) => { - console.log(res); if (res.code == 0) { this.bumenList = res.data.map(item => ({ value: item.name, - text: item.name + label: item.name })); // } else { // this.$refs.refSuccess.showBox({ @@ -434,29 +655,32 @@ } }, - bymenCallback(index) { - console.log(this.bumenList); - this.form.department = this.bumenList[index].text; + bymenCallback(e) { + this.form.department = e[0].label + }, bisuoCallback(index) { - console.log(this.bisuolist); this.form.bisuoid = this.bisuolist[index].text; this.bisuoonlie = this.bisuolist[index].value; }, tixingCallback(index) { - console.log(this.tixinglist); - this.form.mestagid = this.tixinglist[index].text; - this.tixingonlie = this.tixinglist[index].value; + this.form.mestagid = this.tixinglist[index].value; + this.tixingonlie = this.tixinglist[index].line; }, - typeCallback(index) { - this.form.type = this.typeList[index].text; - }, - encryptionCallback(index) { - this.form.encryption = this.encryptionList[index].text; + soundCallback(index) { + this.form.sound = this.soundlist[index].value; + // this.soundonlie = this.soundlist[index].line; }, - holdtypeCallback(index) { - this.form.baoliu1 = this.holdtypeList[index].text; + typeCallback(e) { + this.form.type = e[0].label + }, + encryptionCallback(e) { + this.form.encryption = e[0].label + }, + + holdtypeCallback(e) { + this.form.baoliu1 = e[0].label }, editClick(e, i) { this.editindex = i @@ -464,13 +688,25 @@ this.disabled = true this.form.personname = e.personname this.form.encryption = e.encryption - + this.form.tagid = e.tagid this.form.department = e.department this.form.mestagid = e.mestagid + this.form.sound = e.sound + this.form.type = e.type this.form.bisuoid = e.bisuoid this.form.baoliu1 = e.baoliu1 + if (e.mestagid != '-1' && e.mestagid != null) { + this.value1 = e.mestagid.split(";") + } + if (e.sound != '-1' && e.sound != null) { + this.value3 = e.sound.split(";") + } + if (e.bisuoid != '-1' && e.bisuoid != null) { + this.value2 = e.bisuoid.split(";") + } + }, goAchor() { @@ -500,6 +736,9 @@ for (var i = 0; i < res.data.records.length; i++) { list.push(res.data.records[i]); } + if (data.lock == true) { + this.list = [] + } this.list = [...this.list, ...list]; callback({ list: this.list, -- Gitblit v1.9.3