diff --git a/src/api/system/tool.js b/src/api/system/tool.js
index 7524a0a..9d6e152 100644
--- a/src/api/system/tool.js
+++ b/src/api/system/tool.js
@@ -1,28 +1,28 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
// 查询生成表数据
export function listTable(query) {
return request({
url: '/code/gen/list',
method: 'get',
- params: query
- })
+ params: query,
+ });
}
// 查询db数据库列表
export function listDbTable(query) {
return request({
url: '/code/gen/db/list',
method: 'get',
- params: query
- })
+ params: query,
+ });
}
// 查询表详细信息
export function getGenTable(tableId) {
return request({
url: '/code/gen/' + tableId,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 修改代码生成信息
@@ -30,8 +30,8 @@
return request({
url: '/code/gen',
method: 'put',
- data: data
- })
+ data: data,
+ });
}
// 导入表
@@ -39,38 +39,48 @@
return request({
url: '/code/gen/importTable',
method: 'post',
- params: data
- })
+ params: data,
+ });
}
// 预览生成代码
export function previewTable(tableId) {
return request({
url: '/code/gen/preview/' + tableId,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 删除表数据
export function delTable(tableId) {
return request({
url: '/code/gen/' + tableId,
- method: 'delete'
- })
+ method: 'delete',
+ });
}
// 生成代码(自定义路径)
export function genCode(tableName) {
return request({
url: '/code/gen/genCode/' + tableName,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 同步数据库
export function synchDb(tableName) {
return request({
url: '/code/gen/synchDb/' + tableName,
- method: 'get'
- })
+ method: 'get',
+ });
+}
+
+// 天气
+// http://113.200.135.155:9103/custom/v1/api?interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a
+export function getQLWeather(params) {
+ return request({
+ url: '/tqApi/custom/v1/api',
+ method: 'get',
+ params: params,
+ });
}
diff --git a/src/api/system/tool.js b/src/api/system/tool.js
index 7524a0a..9d6e152 100644
--- a/src/api/system/tool.js
+++ b/src/api/system/tool.js
@@ -1,28 +1,28 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
// 查询生成表数据
export function listTable(query) {
return request({
url: '/code/gen/list',
method: 'get',
- params: query
- })
+ params: query,
+ });
}
// 查询db数据库列表
export function listDbTable(query) {
return request({
url: '/code/gen/db/list',
method: 'get',
- params: query
- })
+ params: query,
+ });
}
// 查询表详细信息
export function getGenTable(tableId) {
return request({
url: '/code/gen/' + tableId,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 修改代码生成信息
@@ -30,8 +30,8 @@
return request({
url: '/code/gen',
method: 'put',
- data: data
- })
+ data: data,
+ });
}
// 导入表
@@ -39,38 +39,48 @@
return request({
url: '/code/gen/importTable',
method: 'post',
- params: data
- })
+ params: data,
+ });
}
// 预览生成代码
export function previewTable(tableId) {
return request({
url: '/code/gen/preview/' + tableId,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 删除表数据
export function delTable(tableId) {
return request({
url: '/code/gen/' + tableId,
- method: 'delete'
- })
+ method: 'delete',
+ });
}
// 生成代码(自定义路径)
export function genCode(tableName) {
return request({
url: '/code/gen/genCode/' + tableName,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 同步数据库
export function synchDb(tableName) {
return request({
url: '/code/gen/synchDb/' + tableName,
- method: 'get'
- })
+ method: 'get',
+ });
+}
+
+// 天气
+// http://113.200.135.155:9103/custom/v1/api?interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a
+export function getQLWeather(params) {
+ return request({
+ url: '/tqApi/custom/v1/api',
+ method: 'get',
+ params: params,
+ });
}
diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue
index d401233..29f98ba 100644
--- a/src/views/DialogTabs/component/GongDanPaiFa.vue
+++ b/src/views/DialogTabs/component/GongDanPaiFa.vue
@@ -112,19 +112,23 @@
addWorkOrder(orderForm.value)
.then(res => {
console.log('🚀 ~ CloseDialog ~ res:---------派发成功', res);
- unitVoiceTemplateCall({
- robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
- phones: '13129919657,13638648812,13332926003',
- templateDesc: {
- title: '延安城市生命线通知',
- // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
- notice: `在${form.value.eventAddress}出现了${form.value.eventDetails},请于${form.value.requestFeedbackHourNum}进行确认与反馈`,
- },
- }).then(response => {
- proxy.$modal.msgSuccess('派发成功');
- bus.emit('nowDynamic');
- bus.emit('publicDialog_Close');
- });
+ // unitVoiceTemplateCall({
+ // robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+ // phones: '13129919657,13638648812,13332926003',
+ // templateDesc: {
+ // title: '延安城市生命线通知',
+ // // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+ // notice: `在${form.value.eventAddress}出现了${form.value.eventDetails},请于${form.value.requestFeedbackHourNum}进行确认与反馈`,
+ // },
+ // }).then(response => {
+ // proxy.$modal.msgSuccess('派发成功');
+ // bus.emit('nowDynamic');
+ // bus.emit('publicDialog_Close');
+ // });
+
+ proxy.$modal.msgSuccess('派发成功');
+ bus.emit('nowDynamic');
+ bus.emit('publicDialog_Close');
})
.catch(err => {
console.log('🚀 ~ alarmWorkOrderAdd ~ err:', err);
diff --git a/src/api/system/tool.js b/src/api/system/tool.js
index 7524a0a..9d6e152 100644
--- a/src/api/system/tool.js
+++ b/src/api/system/tool.js
@@ -1,28 +1,28 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
// 查询生成表数据
export function listTable(query) {
return request({
url: '/code/gen/list',
method: 'get',
- params: query
- })
+ params: query,
+ });
}
// 查询db数据库列表
export function listDbTable(query) {
return request({
url: '/code/gen/db/list',
method: 'get',
- params: query
- })
+ params: query,
+ });
}
// 查询表详细信息
export function getGenTable(tableId) {
return request({
url: '/code/gen/' + tableId,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 修改代码生成信息
@@ -30,8 +30,8 @@
return request({
url: '/code/gen',
method: 'put',
- data: data
- })
+ data: data,
+ });
}
// 导入表
@@ -39,38 +39,48 @@
return request({
url: '/code/gen/importTable',
method: 'post',
- params: data
- })
+ params: data,
+ });
}
// 预览生成代码
export function previewTable(tableId) {
return request({
url: '/code/gen/preview/' + tableId,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 删除表数据
export function delTable(tableId) {
return request({
url: '/code/gen/' + tableId,
- method: 'delete'
- })
+ method: 'delete',
+ });
}
// 生成代码(自定义路径)
export function genCode(tableName) {
return request({
url: '/code/gen/genCode/' + tableName,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 同步数据库
export function synchDb(tableName) {
return request({
url: '/code/gen/synchDb/' + tableName,
- method: 'get'
- })
+ method: 'get',
+ });
+}
+
+// 天气
+// http://113.200.135.155:9103/custom/v1/api?interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a
+export function getQLWeather(params) {
+ return request({
+ url: '/tqApi/custom/v1/api',
+ method: 'get',
+ params: params,
+ });
}
diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue
index d401233..29f98ba 100644
--- a/src/views/DialogTabs/component/GongDanPaiFa.vue
+++ b/src/views/DialogTabs/component/GongDanPaiFa.vue
@@ -112,19 +112,23 @@
addWorkOrder(orderForm.value)
.then(res => {
console.log('🚀 ~ CloseDialog ~ res:---------派发成功', res);
- unitVoiceTemplateCall({
- robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
- phones: '13129919657,13638648812,13332926003',
- templateDesc: {
- title: '延安城市生命线通知',
- // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
- notice: `在${form.value.eventAddress}出现了${form.value.eventDetails},请于${form.value.requestFeedbackHourNum}进行确认与反馈`,
- },
- }).then(response => {
- proxy.$modal.msgSuccess('派发成功');
- bus.emit('nowDynamic');
- bus.emit('publicDialog_Close');
- });
+ // unitVoiceTemplateCall({
+ // robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+ // phones: '13129919657,13638648812,13332926003',
+ // templateDesc: {
+ // title: '延安城市生命线通知',
+ // // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+ // notice: `在${form.value.eventAddress}出现了${form.value.eventDetails},请于${form.value.requestFeedbackHourNum}进行确认与反馈`,
+ // },
+ // }).then(response => {
+ // proxy.$modal.msgSuccess('派发成功');
+ // bus.emit('nowDynamic');
+ // bus.emit('publicDialog_Close');
+ // });
+
+ proxy.$modal.msgSuccess('派发成功');
+ bus.emit('nowDynamic');
+ bus.emit('publicDialog_Close');
})
.catch(err => {
console.log('🚀 ~ alarmWorkOrderAdd ~ err:', err);
diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index f7eb8d5..207f181 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -169,7 +169,7 @@
icon: '/Three/icon/jsdj_icon.png',
data: [],
show: false,
- pointCode: '',
+ pointCode: '111',
dataTime: '',
toP: {
x: -13.954768127208757,
@@ -197,7 +197,7 @@
icon: '/Three/icon/jsdj_icon.png',
data: [],
show: false,
- pointCode: '',
+ pointCode: '111',
dataTime: '',
toP: {
x: -59.96926543723423,
@@ -414,8 +414,8 @@
// 是否开启右键拖拽
Controls.value.enablePan = true;
// AxesHelper:辅助观察的坐标系
- const axesHelper = new THREE.AxesHelper(3000);
- Scene.add(axesHelper);
+ // const axesHelper = new THREE.AxesHelper(3000);
+ // Scene.add(axesHelper);
};
/**
@@ -476,8 +476,8 @@
LabelRenderer.value.render(Scene, Camera.value);
const delta = clock.getDelta();
// 如需调试请打开这个获取Camera,Controls 的值
- console.log('Camera.value', Camera.value);
- console.log('Controls.value', Controls.value);
+ // console.log('Camera.value', Camera.value);
+ // console.log('Controls.value', Controls.value);
};
// 创建气泡窗
diff --git a/src/api/system/tool.js b/src/api/system/tool.js
index 7524a0a..9d6e152 100644
--- a/src/api/system/tool.js
+++ b/src/api/system/tool.js
@@ -1,28 +1,28 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
// 查询生成表数据
export function listTable(query) {
return request({
url: '/code/gen/list',
method: 'get',
- params: query
- })
+ params: query,
+ });
}
// 查询db数据库列表
export function listDbTable(query) {
return request({
url: '/code/gen/db/list',
method: 'get',
- params: query
- })
+ params: query,
+ });
}
// 查询表详细信息
export function getGenTable(tableId) {
return request({
url: '/code/gen/' + tableId,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 修改代码生成信息
@@ -30,8 +30,8 @@
return request({
url: '/code/gen',
method: 'put',
- data: data
- })
+ data: data,
+ });
}
// 导入表
@@ -39,38 +39,48 @@
return request({
url: '/code/gen/importTable',
method: 'post',
- params: data
- })
+ params: data,
+ });
}
// 预览生成代码
export function previewTable(tableId) {
return request({
url: '/code/gen/preview/' + tableId,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 删除表数据
export function delTable(tableId) {
return request({
url: '/code/gen/' + tableId,
- method: 'delete'
- })
+ method: 'delete',
+ });
}
// 生成代码(自定义路径)
export function genCode(tableName) {
return request({
url: '/code/gen/genCode/' + tableName,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 同步数据库
export function synchDb(tableName) {
return request({
url: '/code/gen/synchDb/' + tableName,
- method: 'get'
- })
+ method: 'get',
+ });
+}
+
+// 天气
+// http://113.200.135.155:9103/custom/v1/api?interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a
+export function getQLWeather(params) {
+ return request({
+ url: '/tqApi/custom/v1/api',
+ method: 'get',
+ params: params,
+ });
}
diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue
index d401233..29f98ba 100644
--- a/src/views/DialogTabs/component/GongDanPaiFa.vue
+++ b/src/views/DialogTabs/component/GongDanPaiFa.vue
@@ -112,19 +112,23 @@
addWorkOrder(orderForm.value)
.then(res => {
console.log('🚀 ~ CloseDialog ~ res:---------派发成功', res);
- unitVoiceTemplateCall({
- robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
- phones: '13129919657,13638648812,13332926003',
- templateDesc: {
- title: '延安城市生命线通知',
- // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
- notice: `在${form.value.eventAddress}出现了${form.value.eventDetails},请于${form.value.requestFeedbackHourNum}进行确认与反馈`,
- },
- }).then(response => {
- proxy.$modal.msgSuccess('派发成功');
- bus.emit('nowDynamic');
- bus.emit('publicDialog_Close');
- });
+ // unitVoiceTemplateCall({
+ // robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+ // phones: '13129919657,13638648812,13332926003',
+ // templateDesc: {
+ // title: '延安城市生命线通知',
+ // // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+ // notice: `在${form.value.eventAddress}出现了${form.value.eventDetails},请于${form.value.requestFeedbackHourNum}进行确认与反馈`,
+ // },
+ // }).then(response => {
+ // proxy.$modal.msgSuccess('派发成功');
+ // bus.emit('nowDynamic');
+ // bus.emit('publicDialog_Close');
+ // });
+
+ proxy.$modal.msgSuccess('派发成功');
+ bus.emit('nowDynamic');
+ bus.emit('publicDialog_Close');
})
.catch(err => {
console.log('🚀 ~ alarmWorkOrderAdd ~ err:', err);
diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index f7eb8d5..207f181 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -169,7 +169,7 @@
icon: '/Three/icon/jsdj_icon.png',
data: [],
show: false,
- pointCode: '',
+ pointCode: '111',
dataTime: '',
toP: {
x: -13.954768127208757,
@@ -197,7 +197,7 @@
icon: '/Three/icon/jsdj_icon.png',
data: [],
show: false,
- pointCode: '',
+ pointCode: '111',
dataTime: '',
toP: {
x: -59.96926543723423,
@@ -414,8 +414,8 @@
// 是否开启右键拖拽
Controls.value.enablePan = true;
// AxesHelper:辅助观察的坐标系
- const axesHelper = new THREE.AxesHelper(3000);
- Scene.add(axesHelper);
+ // const axesHelper = new THREE.AxesHelper(3000);
+ // Scene.add(axesHelper);
};
/**
@@ -476,8 +476,8 @@
LabelRenderer.value.render(Scene, Camera.value);
const delta = clock.getDelta();
// 如需调试请打开这个获取Camera,Controls 的值
- console.log('Camera.value', Camera.value);
- console.log('Controls.value', Controls.value);
+ // console.log('Camera.value', Camera.value);
+ // console.log('Controls.value', Controls.value);
};
// 创建气泡窗
diff --git a/src/views/oneMap/components/ZHQL.vue b/src/views/oneMap/components/ZHQL.vue
index 8b0a328..f073acf 100644
--- a/src/views/oneMap/components/ZHQL.vue
+++ b/src/views/oneMap/components/ZHQL.vue
@@ -33,6 +33,8 @@
import QL_FL from '@/assets/images/Sponge_screen/QiaoLiang/QL_FL.png';
import QL_JY from '@/assets/images/Sponge_screen/QiaoLiang/QL_JY.png';
import QL_QY from '@/assets/images/Sponge_screen/QiaoLiang/QL_QY.png';
+import { getQLWeather } from '@/api/system/tool';
+
const AllData = reactive({
// 顶部信息展示
TopInfoData: [
@@ -93,18 +95,38 @@
// 获取天气信息
const getWeather = () => {
- axios
- .get(
- 'http://113.200.135.155:9103/custom/v1/api?interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a'
- )
+ // axios
+ // .get(
+ // 'http://113.200.135.155:9103/custom/v1/api?interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a'
+ // )
+ // .then(res => {
+ // var temVal = res.data.data[0];
+ // // console.log('-------------',temVal);
+ // TopInfoData.value[0].num = temVal.tem;
+ // TopInfoData.value[1].num = temVal.rhu;
+ // TopInfoData.value[2].num = temVal.win_s_avg_2mi;
+ // TopInfoData.value[3].num = temVal.pre_1h;
+ // TopInfoData.value[4].num = temVal.prs;
+ // // allData.weather = res.data.result.realtime;
+ // // allData.weatherTime = res.data.result.last_update;
+ // // allData.location = res.data.result.location;
+ // })
+ // .catch(res => {});
+
+ // interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a
+ getQLWeather({
+ interfaceId: 'getHourByCgj',
+ stationno: '53845',
+ token: 'cee974c7f92e6b680940f172cbd1b74a',
+ })
.then(res => {
- var temVal = res.data.data[0]
+ var temVal = res.data[0];
// console.log('-------------',temVal);
- TopInfoData.value[0].num = temVal.tem
- TopInfoData.value[1].num = temVal.rhu
- TopInfoData.value[2].num = temVal.win_s_avg_2mi
- TopInfoData.value[3].num = temVal.pre_1h
- TopInfoData.value[4].num = temVal.prs
+ TopInfoData.value[0].num = temVal.tem;
+ TopInfoData.value[1].num = temVal.rhu;
+ TopInfoData.value[2].num = temVal.win_s_avg_2mi;
+ TopInfoData.value[3].num = temVal.pre_1h;
+ TopInfoData.value[4].num = temVal.prs;
// allData.weather = res.data.result.realtime;
// allData.weatherTime = res.data.result.last_update;
// allData.location = res.data.result.location;
@@ -113,8 +135,7 @@
};
onMounted(() => {
-
- getWeather()
+ getWeather();
});
diff --git a/src/api/system/tool.js b/src/api/system/tool.js
index 7524a0a..9d6e152 100644
--- a/src/api/system/tool.js
+++ b/src/api/system/tool.js
@@ -1,28 +1,28 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
// 查询生成表数据
export function listTable(query) {
return request({
url: '/code/gen/list',
method: 'get',
- params: query
- })
+ params: query,
+ });
}
// 查询db数据库列表
export function listDbTable(query) {
return request({
url: '/code/gen/db/list',
method: 'get',
- params: query
- })
+ params: query,
+ });
}
// 查询表详细信息
export function getGenTable(tableId) {
return request({
url: '/code/gen/' + tableId,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 修改代码生成信息
@@ -30,8 +30,8 @@
return request({
url: '/code/gen',
method: 'put',
- data: data
- })
+ data: data,
+ });
}
// 导入表
@@ -39,38 +39,48 @@
return request({
url: '/code/gen/importTable',
method: 'post',
- params: data
- })
+ params: data,
+ });
}
// 预览生成代码
export function previewTable(tableId) {
return request({
url: '/code/gen/preview/' + tableId,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 删除表数据
export function delTable(tableId) {
return request({
url: '/code/gen/' + tableId,
- method: 'delete'
- })
+ method: 'delete',
+ });
}
// 生成代码(自定义路径)
export function genCode(tableName) {
return request({
url: '/code/gen/genCode/' + tableName,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 同步数据库
export function synchDb(tableName) {
return request({
url: '/code/gen/synchDb/' + tableName,
- method: 'get'
- })
+ method: 'get',
+ });
+}
+
+// 天气
+// http://113.200.135.155:9103/custom/v1/api?interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a
+export function getQLWeather(params) {
+ return request({
+ url: '/tqApi/custom/v1/api',
+ method: 'get',
+ params: params,
+ });
}
diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue
index d401233..29f98ba 100644
--- a/src/views/DialogTabs/component/GongDanPaiFa.vue
+++ b/src/views/DialogTabs/component/GongDanPaiFa.vue
@@ -112,19 +112,23 @@
addWorkOrder(orderForm.value)
.then(res => {
console.log('🚀 ~ CloseDialog ~ res:---------派发成功', res);
- unitVoiceTemplateCall({
- robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
- phones: '13129919657,13638648812,13332926003',
- templateDesc: {
- title: '延安城市生命线通知',
- // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
- notice: `在${form.value.eventAddress}出现了${form.value.eventDetails},请于${form.value.requestFeedbackHourNum}进行确认与反馈`,
- },
- }).then(response => {
- proxy.$modal.msgSuccess('派发成功');
- bus.emit('nowDynamic');
- bus.emit('publicDialog_Close');
- });
+ // unitVoiceTemplateCall({
+ // robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+ // phones: '13129919657,13638648812,13332926003',
+ // templateDesc: {
+ // title: '延安城市生命线通知',
+ // // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+ // notice: `在${form.value.eventAddress}出现了${form.value.eventDetails},请于${form.value.requestFeedbackHourNum}进行确认与反馈`,
+ // },
+ // }).then(response => {
+ // proxy.$modal.msgSuccess('派发成功');
+ // bus.emit('nowDynamic');
+ // bus.emit('publicDialog_Close');
+ // });
+
+ proxy.$modal.msgSuccess('派发成功');
+ bus.emit('nowDynamic');
+ bus.emit('publicDialog_Close');
})
.catch(err => {
console.log('🚀 ~ alarmWorkOrderAdd ~ err:', err);
diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index f7eb8d5..207f181 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -169,7 +169,7 @@
icon: '/Three/icon/jsdj_icon.png',
data: [],
show: false,
- pointCode: '',
+ pointCode: '111',
dataTime: '',
toP: {
x: -13.954768127208757,
@@ -197,7 +197,7 @@
icon: '/Three/icon/jsdj_icon.png',
data: [],
show: false,
- pointCode: '',
+ pointCode: '111',
dataTime: '',
toP: {
x: -59.96926543723423,
@@ -414,8 +414,8 @@
// 是否开启右键拖拽
Controls.value.enablePan = true;
// AxesHelper:辅助观察的坐标系
- const axesHelper = new THREE.AxesHelper(3000);
- Scene.add(axesHelper);
+ // const axesHelper = new THREE.AxesHelper(3000);
+ // Scene.add(axesHelper);
};
/**
@@ -476,8 +476,8 @@
LabelRenderer.value.render(Scene, Camera.value);
const delta = clock.getDelta();
// 如需调试请打开这个获取Camera,Controls 的值
- console.log('Camera.value', Camera.value);
- console.log('Controls.value', Controls.value);
+ // console.log('Camera.value', Camera.value);
+ // console.log('Controls.value', Controls.value);
};
// 创建气泡窗
diff --git a/src/views/oneMap/components/ZHQL.vue b/src/views/oneMap/components/ZHQL.vue
index 8b0a328..f073acf 100644
--- a/src/views/oneMap/components/ZHQL.vue
+++ b/src/views/oneMap/components/ZHQL.vue
@@ -33,6 +33,8 @@
import QL_FL from '@/assets/images/Sponge_screen/QiaoLiang/QL_FL.png';
import QL_JY from '@/assets/images/Sponge_screen/QiaoLiang/QL_JY.png';
import QL_QY from '@/assets/images/Sponge_screen/QiaoLiang/QL_QY.png';
+import { getQLWeather } from '@/api/system/tool';
+
const AllData = reactive({
// 顶部信息展示
TopInfoData: [
@@ -93,18 +95,38 @@
// 获取天气信息
const getWeather = () => {
- axios
- .get(
- 'http://113.200.135.155:9103/custom/v1/api?interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a'
- )
+ // axios
+ // .get(
+ // 'http://113.200.135.155:9103/custom/v1/api?interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a'
+ // )
+ // .then(res => {
+ // var temVal = res.data.data[0];
+ // // console.log('-------------',temVal);
+ // TopInfoData.value[0].num = temVal.tem;
+ // TopInfoData.value[1].num = temVal.rhu;
+ // TopInfoData.value[2].num = temVal.win_s_avg_2mi;
+ // TopInfoData.value[3].num = temVal.pre_1h;
+ // TopInfoData.value[4].num = temVal.prs;
+ // // allData.weather = res.data.result.realtime;
+ // // allData.weatherTime = res.data.result.last_update;
+ // // allData.location = res.data.result.location;
+ // })
+ // .catch(res => {});
+
+ // interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a
+ getQLWeather({
+ interfaceId: 'getHourByCgj',
+ stationno: '53845',
+ token: 'cee974c7f92e6b680940f172cbd1b74a',
+ })
.then(res => {
- var temVal = res.data.data[0]
+ var temVal = res.data[0];
// console.log('-------------',temVal);
- TopInfoData.value[0].num = temVal.tem
- TopInfoData.value[1].num = temVal.rhu
- TopInfoData.value[2].num = temVal.win_s_avg_2mi
- TopInfoData.value[3].num = temVal.pre_1h
- TopInfoData.value[4].num = temVal.prs
+ TopInfoData.value[0].num = temVal.tem;
+ TopInfoData.value[1].num = temVal.rhu;
+ TopInfoData.value[2].num = temVal.win_s_avg_2mi;
+ TopInfoData.value[3].num = temVal.pre_1h;
+ TopInfoData.value[4].num = temVal.prs;
// allData.weather = res.data.result.realtime;
// allData.weatherTime = res.data.result.last_update;
// allData.location = res.data.result.location;
@@ -113,8 +135,7 @@
};
onMounted(() => {
-
- getWeather()
+ getWeather();
});
diff --git a/src/views/order/components/orderDia.vue b/src/views/order/components/orderDia.vue
index 95d104c..277bccf 100644
--- a/src/views/order/components/orderDia.vue
+++ b/src/views/order/components/orderDia.vue
@@ -450,21 +450,40 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -535,6 +554,17 @@
const confirmFormRef = ref();
const infoLoading = ref(false);
const orderData = reactive({
+ orderRobotId: '',
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ robotId: null,
+ robotName: null,
+ callType: null,
+ publishState: null,
+ templateDesc: null,
+ status: null,
+ },
rules: {
name: [
{ required: true, message: 'Please input Activity name', trigger: 'blur' },
@@ -604,7 +634,7 @@
},
});
-const { rules, orderForm, handleProcess, confirmForm, historyParams } = toRefs(orderData);
+const { rules, orderForm, handleProcess, confirmForm, historyParams, queryParams, orderRobotId } = toRefs(orderData);
// 详情
const getDetail = () => {
@@ -674,7 +704,7 @@
}, '');
let params = {
- robotId: 'e01059a0-7cc3-4971-b4e8-66cefbf236ef',
+ robotId: orderRobotId.value,
phones: phonesCall.slice(0, -1),
templateDesc: { title: '延安城市生命线通知', notice: '请尽快处理相关工单内容' },
};
@@ -725,8 +755,17 @@
// });
};
+/** 查询语音外呼-模板信息列表 */
+function getList() {
+ pageunitVoiceTemplate(queryParams.value).then(response => {
+ orderRobotId.value = response.data.find(item => item.robotName == '项目通知').robotId;
+ // console.log('--------',orderRobotId.value);
+ });
+}
+
onMounted(() => {
useOrder.getUserList({ workOrderId: props.orderId });
+ getList();
if (props.status == 'xiangqing') {
getHistoryData();
}
diff --git a/src/api/system/tool.js b/src/api/system/tool.js
index 7524a0a..9d6e152 100644
--- a/src/api/system/tool.js
+++ b/src/api/system/tool.js
@@ -1,28 +1,28 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
// 查询生成表数据
export function listTable(query) {
return request({
url: '/code/gen/list',
method: 'get',
- params: query
- })
+ params: query,
+ });
}
// 查询db数据库列表
export function listDbTable(query) {
return request({
url: '/code/gen/db/list',
method: 'get',
- params: query
- })
+ params: query,
+ });
}
// 查询表详细信息
export function getGenTable(tableId) {
return request({
url: '/code/gen/' + tableId,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 修改代码生成信息
@@ -30,8 +30,8 @@
return request({
url: '/code/gen',
method: 'put',
- data: data
- })
+ data: data,
+ });
}
// 导入表
@@ -39,38 +39,48 @@
return request({
url: '/code/gen/importTable',
method: 'post',
- params: data
- })
+ params: data,
+ });
}
// 预览生成代码
export function previewTable(tableId) {
return request({
url: '/code/gen/preview/' + tableId,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 删除表数据
export function delTable(tableId) {
return request({
url: '/code/gen/' + tableId,
- method: 'delete'
- })
+ method: 'delete',
+ });
}
// 生成代码(自定义路径)
export function genCode(tableName) {
return request({
url: '/code/gen/genCode/' + tableName,
- method: 'get'
- })
+ method: 'get',
+ });
}
// 同步数据库
export function synchDb(tableName) {
return request({
url: '/code/gen/synchDb/' + tableName,
- method: 'get'
- })
+ method: 'get',
+ });
+}
+
+// 天气
+// http://113.200.135.155:9103/custom/v1/api?interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a
+export function getQLWeather(params) {
+ return request({
+ url: '/tqApi/custom/v1/api',
+ method: 'get',
+ params: params,
+ });
}
diff --git a/src/views/DialogTabs/component/GongDanPaiFa.vue b/src/views/DialogTabs/component/GongDanPaiFa.vue
index d401233..29f98ba 100644
--- a/src/views/DialogTabs/component/GongDanPaiFa.vue
+++ b/src/views/DialogTabs/component/GongDanPaiFa.vue
@@ -112,19 +112,23 @@
addWorkOrder(orderForm.value)
.then(res => {
console.log('🚀 ~ CloseDialog ~ res:---------派发成功', res);
- unitVoiceTemplateCall({
- robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
- phones: '13129919657,13638648812,13332926003',
- templateDesc: {
- title: '延安城市生命线通知',
- // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
- notice: `在${form.value.eventAddress}出现了${form.value.eventDetails},请于${form.value.requestFeedbackHourNum}进行确认与反馈`,
- },
- }).then(response => {
- proxy.$modal.msgSuccess('派发成功');
- bus.emit('nowDynamic');
- bus.emit('publicDialog_Close');
- });
+ // unitVoiceTemplateCall({
+ // robotId: '2c922fb8-40f1-47e9-afc0-dc3c7b6bb3cd',
+ // phones: '13129919657,13638648812,13332926003',
+ // templateDesc: {
+ // title: '延安城市生命线通知',
+ // // notice: `在${form.value.FXWZ}出现了${form.value.FZYP},请于${form.value.FKSJ}进行确认与反馈`,
+ // notice: `在${form.value.eventAddress}出现了${form.value.eventDetails},请于${form.value.requestFeedbackHourNum}进行确认与反馈`,
+ // },
+ // }).then(response => {
+ // proxy.$modal.msgSuccess('派发成功');
+ // bus.emit('nowDynamic');
+ // bus.emit('publicDialog_Close');
+ // });
+
+ proxy.$modal.msgSuccess('派发成功');
+ bus.emit('nowDynamic');
+ bus.emit('publicDialog_Close');
})
.catch(err => {
console.log('🚀 ~ alarmWorkOrderAdd ~ err:', err);
diff --git a/src/views/oneMap/BIM/WangJiaPIng.vue b/src/views/oneMap/BIM/WangJiaPIng.vue
index f7eb8d5..207f181 100644
--- a/src/views/oneMap/BIM/WangJiaPIng.vue
+++ b/src/views/oneMap/BIM/WangJiaPIng.vue
@@ -169,7 +169,7 @@
icon: '/Three/icon/jsdj_icon.png',
data: [],
show: false,
- pointCode: '',
+ pointCode: '111',
dataTime: '',
toP: {
x: -13.954768127208757,
@@ -197,7 +197,7 @@
icon: '/Three/icon/jsdj_icon.png',
data: [],
show: false,
- pointCode: '',
+ pointCode: '111',
dataTime: '',
toP: {
x: -59.96926543723423,
@@ -414,8 +414,8 @@
// 是否开启右键拖拽
Controls.value.enablePan = true;
// AxesHelper:辅助观察的坐标系
- const axesHelper = new THREE.AxesHelper(3000);
- Scene.add(axesHelper);
+ // const axesHelper = new THREE.AxesHelper(3000);
+ // Scene.add(axesHelper);
};
/**
@@ -476,8 +476,8 @@
LabelRenderer.value.render(Scene, Camera.value);
const delta = clock.getDelta();
// 如需调试请打开这个获取Camera,Controls 的值
- console.log('Camera.value', Camera.value);
- console.log('Controls.value', Controls.value);
+ // console.log('Camera.value', Camera.value);
+ // console.log('Controls.value', Controls.value);
};
// 创建气泡窗
diff --git a/src/views/oneMap/components/ZHQL.vue b/src/views/oneMap/components/ZHQL.vue
index 8b0a328..f073acf 100644
--- a/src/views/oneMap/components/ZHQL.vue
+++ b/src/views/oneMap/components/ZHQL.vue
@@ -33,6 +33,8 @@
import QL_FL from '@/assets/images/Sponge_screen/QiaoLiang/QL_FL.png';
import QL_JY from '@/assets/images/Sponge_screen/QiaoLiang/QL_JY.png';
import QL_QY from '@/assets/images/Sponge_screen/QiaoLiang/QL_QY.png';
+import { getQLWeather } from '@/api/system/tool';
+
const AllData = reactive({
// 顶部信息展示
TopInfoData: [
@@ -93,18 +95,38 @@
// 获取天气信息
const getWeather = () => {
- axios
- .get(
- 'http://113.200.135.155:9103/custom/v1/api?interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a'
- )
+ // axios
+ // .get(
+ // 'http://113.200.135.155:9103/custom/v1/api?interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a'
+ // )
+ // .then(res => {
+ // var temVal = res.data.data[0];
+ // // console.log('-------------',temVal);
+ // TopInfoData.value[0].num = temVal.tem;
+ // TopInfoData.value[1].num = temVal.rhu;
+ // TopInfoData.value[2].num = temVal.win_s_avg_2mi;
+ // TopInfoData.value[3].num = temVal.pre_1h;
+ // TopInfoData.value[4].num = temVal.prs;
+ // // allData.weather = res.data.result.realtime;
+ // // allData.weatherTime = res.data.result.last_update;
+ // // allData.location = res.data.result.location;
+ // })
+ // .catch(res => {});
+
+ // interfaceId=getHourByCgj&stationno=53845&token=cee974c7f92e6b680940f172cbd1b74a
+ getQLWeather({
+ interfaceId: 'getHourByCgj',
+ stationno: '53845',
+ token: 'cee974c7f92e6b680940f172cbd1b74a',
+ })
.then(res => {
- var temVal = res.data.data[0]
+ var temVal = res.data[0];
// console.log('-------------',temVal);
- TopInfoData.value[0].num = temVal.tem
- TopInfoData.value[1].num = temVal.rhu
- TopInfoData.value[2].num = temVal.win_s_avg_2mi
- TopInfoData.value[3].num = temVal.pre_1h
- TopInfoData.value[4].num = temVal.prs
+ TopInfoData.value[0].num = temVal.tem;
+ TopInfoData.value[1].num = temVal.rhu;
+ TopInfoData.value[2].num = temVal.win_s_avg_2mi;
+ TopInfoData.value[3].num = temVal.pre_1h;
+ TopInfoData.value[4].num = temVal.prs;
// allData.weather = res.data.result.realtime;
// allData.weatherTime = res.data.result.last_update;
// allData.location = res.data.result.location;
@@ -113,8 +135,7 @@
};
onMounted(() => {
-
- getWeather()
+ getWeather();
});
diff --git a/src/views/order/components/orderDia.vue b/src/views/order/components/orderDia.vue
index 95d104c..277bccf 100644
--- a/src/views/order/components/orderDia.vue
+++ b/src/views/order/components/orderDia.vue
@@ -450,21 +450,40 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -535,6 +554,17 @@
const confirmFormRef = ref();
const infoLoading = ref(false);
const orderData = reactive({
+ orderRobotId: '',
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ robotId: null,
+ robotName: null,
+ callType: null,
+ publishState: null,
+ templateDesc: null,
+ status: null,
+ },
rules: {
name: [
{ required: true, message: 'Please input Activity name', trigger: 'blur' },
@@ -604,7 +634,7 @@
},
});
-const { rules, orderForm, handleProcess, confirmForm, historyParams } = toRefs(orderData);
+const { rules, orderForm, handleProcess, confirmForm, historyParams, queryParams, orderRobotId } = toRefs(orderData);
// 详情
const getDetail = () => {
@@ -674,7 +704,7 @@
}, '');
let params = {
- robotId: 'e01059a0-7cc3-4971-b4e8-66cefbf236ef',
+ robotId: orderRobotId.value,
phones: phonesCall.slice(0, -1),
templateDesc: { title: '延安城市生命线通知', notice: '请尽快处理相关工单内容' },
};
@@ -725,8 +755,17 @@
// });
};
+/** 查询语音外呼-模板信息列表 */
+function getList() {
+ pageunitVoiceTemplate(queryParams.value).then(response => {
+ orderRobotId.value = response.data.find(item => item.robotName == '项目通知').robotId;
+ // console.log('--------',orderRobotId.value);
+ });
+}
+
onMounted(() => {
useOrder.getUserList({ workOrderId: props.orderId });
+ getList();
if (props.status == 'xiangqing') {
getHistoryData();
}
diff --git a/vite.config.js b/vite.config.js
index ca3cd5c..60a4979 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -94,6 +94,13 @@
logLevel: 'debug',
rewrite: p => p.replace(/^\/hsApi/, ''),
},
+ // 天气
+ '/tqApi': {
+ target: 'http://113.200.135.155:9103',
+ changeOrigin: true,
+ logLevel: 'debug',
+ rewrite: p => p.replace(/^\/tqApi/, ''),
+ },
//百度全景
'/bdApi': {
// target: 'http://192.168.16.34:8105/', //测试服务