From ccee5f79043769c13d304343a40c46a3de4e9d17 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期五, 28 一月 2022 15:19:30 +0800
Subject: [PATCH] Merge branch 'bhomebus' of http://192.168.5.5:10010/r/web/vue-smart-ai into bhomebus
---
src/pages/internetData/views/helemtTable.vue | 197 ++++++++++---------------------------------------
1 files changed, 40 insertions(+), 157 deletions(-)
diff --git a/src/pages/internetData/views/helemtTable.vue b/src/pages/internetData/views/helemtTable.vue
index ee8972e..f12a8ff 100644
--- a/src/pages/internetData/views/helemtTable.vue
+++ b/src/pages/internetData/views/helemtTable.vue
@@ -110,25 +110,25 @@
src="/images/InternetData/瑙嗛.png"
alt=""
v-if="!scope.row.isSend"
- @click="sendVoice(scope.row)"
+ @click="sendVoice(scope.row, scope.$index)"
/>
<img
src="/images/InternetData/瑙嗛_鐐瑰嚮.png"
alt=""
v-else
- @click="sendVoice(scope.row)"
+ @click="sendVoice(scope.row, scope.$index)"
/>
<img
src="/images/InternetData/璇煶.png"
alt=""
v-if="!scope.row.istele"
- @click="telephone(scope.row)"
+ @click="telephone(scope.row, scope.$index)"
/>
<img
src="/images/InternetData/璇煶_鐐瑰嚮.png"
alt=""
v-else
- @click="telephone(scope.row)"
+ @click="telephone(scope.row, scope.$index)"
/>
</div>
</template>
@@ -166,141 +166,10 @@
currentPage: 1,
page_size: 10,
total: 10,
- tableData: [
- {
- code: "A123123123123",
- elec: 79.1,
- ip: "192.168.1.2",
- mac: "ec:da:da:da:ed:98",
- longitude: 120.123123,
- latitude: 120.123123,
- height: "11.21",
- time: "0.23.45",
- positon: "鍗曞悜瀹氫綅",
- isSend: false,
- istele: false,
- },
- {
- code: "A123123123123",
- elec: 29.1,
- ip: "192.168.1.2",
- mac: "ec:da:da:da:ed:98",
- longitude: 120.123123,
- latitude: 120.123123,
- height: "11.21",
- time: "0.23.45",
- positon: "鍗曞悜瀹氫綅",
- isSend: false,
- istele: false,
- },
- {
- code: "A123123123123",
- elec: 0,
- ip: "192.168.1.2",
- mac: "ec:da:da:da:ed:98",
- longitude: 120.123123,
- latitude: 120.123123,
- height: "11.21",
- time: "0.23.45",
- positon: "鍗曞悜瀹氫綅",
- isSend: false,
- istele: false,
- },
- {
- code: "A123123123123",
- elec: 79.1,
- ip: "192.168.1.2",
- mac: "ec:da:da:da:ed:98",
- longitude: 120.123123,
- latitude: 120.123123,
- height: "11.21",
- time: "0.23.45",
- positon: "鍗曞悜瀹氫綅",
- isSend: false,
- istele: false,
- },
- {
- code: "A123123123123",
- elec: 79.1,
- ip: "192.168.1.2",
- mac: "ec:da:da:da:ed:98",
- longitude: 120.123123,
- latitude: 120.123123,
- height: "11.21",
- time: "0.23.45",
- positon: "鍗曞悜瀹氫綅",
- isSend: false,
- istele: false,
- },
- {
- code: "A123123123123",
- elec: 79.1,
- ip: "192.168.1.2",
- mac: "ec:da:da:da:ed:98",
- longitude: 120.123123,
- latitude: 120.123123,
- height: "11.21",
- time: "0.23.45",
- positon: "鍗曞悜瀹氫綅",
- isSend: false,
- istele: false,
- },
- {
- code: "A123123123123",
- elec: 79.1,
- ip: "192.168.1.2",
- mac: "ec:da:da:da:ed:98",
- longitude: 120.123123,
- latitude: 120.123123,
- height: "11.21",
- time: "0.23.45",
- positon: "鍗曞悜瀹氫綅",
- isSend: false,
- istele: false,
- },
- {
- code: "A123123123123",
- elec: 79.1,
- ip: "192.168.1.2",
- mac: "ec:da:da:da:ed:98",
- longitude: 120.123123,
- latitude: 120.123123,
- height: "11.21",
- time: "0.23.45",
- positon: "鍗曞悜瀹氫綅",
- isSend: false,
- istele: false,
- },
- {
- code: "A123123123123",
- elec: 79.1,
- ip: "192.168.1.2",
- mac: "ec:da:da:da:ed:98",
- longitude: 120.123123,
- latitude: 120.123123,
- height: "11.21",
- time: "0.23.45",
- positon: "鍗曞悜瀹氫綅",
- isSend: false,
- istele: false,
- },
- {
- code: "A123123123123",
- elec: 79.1,
- ip: "192.168.1.2",
- mac: "ec:da:da:da:ed:98",
- longitude: 120.123123,
- latitude: 120.123123,
- height: "11.21",
- time: "0.23.45",
- positon: "鍗曞悜瀹氫綅",
- isSend: false,
- istele: false,
- },
- ],
helemtArr: [],
commentContent: "",
telephoneObj: null,
+ targetIndex: null,
};
},
created() {
@@ -312,11 +181,11 @@
methods: {
async getHelemtArr(data) {
const res = await getHelemtData(data);
- console.log(res);
this.helemtArr = res.data.items;
this.total = res.data.total;
},
- sendVoice(target) {
+ sendVoice(target, index) {
+ const _this = this;
target.isSend = true;
const h = this.$createElement;
@@ -381,29 +250,41 @@
target.isSend = false;
done();
},
- }).then((action) => {
- if (action == "confirm") {
- if (!voiceText) {
- this.$message({
- message: "鎸囦护涓嶈兘涓虹┖",
- type: "warning",
+ })
+ .then((action) => {
+ if (action == "confirm") {
+ if (!voiceText) {
+ this.$message({
+ message: "鎸囦护涓嶈兘涓虹┖",
+ type: "warning",
+ });
+ target.isSend = false;
+ _this.$set(_this.helemtArr, index, target);
+ return;
+ }
+ console.log(voiceText);
+ sendAudio(target.device_sn, voiceText).then((res) => {
+ this.$message({
+ message: "鎸囦护鍙戦�佹垚鍔�",
+ type: "success",
+ });
+ target.isSend = false;
+ _this.$set(_this.helemtArr, index, target);
});
- return;
+ target.isSend = false;
+ _this.$set(_this.helemtArr, index, target);
+ } else {
+ target.isSend = false;
+ _this.$set(_this.helemtArr, index, target);
}
- console.log(voiceText);
- sendAudio(target.device_sn, voiceText).then((res) => {
- this.$message({
- message: "鎸囦护鍙戦�佹垚鍔�",
- type: "success",
- });
- });
+ })
+ .catch(() => {
target.isSend = false;
- } else {
- target.isSend = false;
- }
- });
+ _this.$set(_this.helemtArr, index, target);
+ });
},
- telephone(target) {
+ telephone(target, index) {
+ this.targetIndex = index;
target.istele = true;
this.telephoneObj = target;
},
@@ -431,7 +312,9 @@
},
closeTele(e) {
e.istele = false;
+ this.$set(this.helemtArr, this.targetIndex, e);
this.telephoneObj = null;
+ this.targetIndex = null;
},
},
components: {
--
Gitblit v1.8.0