diff --git a/src/api/modules/api.js b/src/api/modules/api.js
index 49230aa..ab0c818 100644
--- a/src/api/modules/api.js
+++ b/src/api/modules/api.js
@@ -1016,3 +1016,11 @@ export function findByAgentId(query) {
params:query
})
}
+//销讲词模板
+export function templategetMarketingTree(query) {
+ return request({
+ url: '/autoSR/marketing/getMarketingTree',
+ method:'get',
+ params:query
+ })
+}
diff --git a/src/views/Equipment/index.vue b/src/views/Equipment/index.vue
index 875aecb..359a514 100644
--- a/src/views/Equipment/index.vue
+++ b/src/views/Equipment/index.vue
@@ -361,7 +361,7 @@
绑定
删除 -->
-
+
更多
@@ -392,9 +392,14 @@
> -->
绑定
+ 解绑
删除 {
+ this.$api.api
+ .zkequipmentUnbind({
+ imeis: row.imei,
+ })
+ .then((res) => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ this.equipmentManagement();
+ });
+ })
+ .catch(() => {
+ // this.$message({
+ // type: "info",
+ // message: "已取消操作",
+ // });
+ });
+ },
//批量转移确认
Masstransfer() {
this.$refs.allbindForm.validate((valid) => {
@@ -1090,7 +1122,7 @@ export default {
},
//批量归还
Batchreturn() {
- this.$confirm("确认批量解绑吗?", "提示", {
+ this.$confirm("确认批量归还吗?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue
index 7067040..a6047e1 100644
--- a/src/views/ReceivingRecords/index.vue
+++ b/src/views/ReceivingRecords/index.vue
@@ -84,13 +84,13 @@
v-model="searchForm.keywordsId"
placeholder="请选择"
>
-
-
+
+
diff --git a/src/views/Template/Pinspeakwords.vue b/src/views/Template/Pinspeakwords.vue
index 354ff1d..0a6445a 100644
--- a/src/views/Template/Pinspeakwords.vue
+++ b/src/views/Template/Pinspeakwords.vue
@@ -255,7 +255,7 @@ export default {
let parmest={
houseId:this.houseId,
}
- this.$api.http.templategetMarketingTree(parmest).then((res) => {
+ this.$api.api.templategetMarketingTree(parmest).then((res) => {
console.log(res);
let data = res.data;
data = JSON.stringify(data).replace(/name/g, "label");
diff --git a/vue.config.js b/vue.config.js
index b514bbc..1636ee9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,8 +4,8 @@
*/
// const url = 'http://pigx-gateway'
// const url = 'http://39.97.167.65:9999' //测试
-// const url = 'http://192.168.31.169:9999' //长龙
-const url = 'http://192.168.31.134:9999' //嘉豪
+const url = 'http://192.168.31.160:9999' //长龙
+// const url = 'http://192.168.31.134:9999' //嘉豪
// const url = 'http://192.168.31.100:9999' //王笑
// const url = 'http://nitu5e.natappfree.cc' //王笑