diff --git a/debug.log b/debug.log
deleted file mode 100644
index 81b7e864..00000000
--- a/debug.log
+++ /dev/null
@@ -1,16 +0,0 @@
-[0530/113505.640:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0530/113508.674:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0530/141801.489:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0530/141801.943:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0929/090447.805:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0929/090447.874:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0929/090448.024:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0929/090501.978:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0930/163244.965:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0930/163245.034:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0930/163246.926:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[0930/163247.976:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[1011/144829.070:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[1011/144829.252:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[1011/144829.886:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
-[1011/144830.214:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
diff --git a/src/assets/js/api/cementMixingPileMonitor.js b/src/assets/js/api/cementMixingPileMonitor.js
new file mode 100644
index 00000000..a6624b17
--- /dev/null
+++ b/src/assets/js/api/cementMixingPileMonitor.js
@@ -0,0 +1,89 @@
+/**
+ * api接口统一管理 塔吊管理
+ */
+import { post, get } from '../http'
+
+// 启用指定类型的水泥搅拌桩/旋挖配置
+export const updateConfigEnableCementMixPileConfigApi = data => post('xmgl/cementMixPileConfig/updateConfigEnable', data);
+// 查询启用的水泥搅拌桩/旋挖配置
+export const getUseCementMixPileConfigApi = data => post('xmgl/cementMixPileConfig/getUseCementMixPileConfig', data, 'aa'); //通过塔吊设备唯一标识查询信息
+// 编辑水泥搅拌桩/旋挖配置信息
+export const editCementMixPileConfigApi = data => post('xmgl/cementMixPileConfig/edit', data);
+
+// 水泥搅拌桩
+// 列表查询水泥搅拌桩/旋挖设备信息
+export const getCementMixPileDevListApi = data => get('/xmgl/cementMixPileDev/list', data);
+// 添加水泥搅拌桩/旋挖设备信息
+export const addCementMixPileDevApi = data => post('/xmgl/cementMixPileDev/add', data);
+// 编辑水泥搅拌桩/旋挖设备信息
+export const editCementMixPileDevApi = data => post('/xmgl/cementMixPileDev/edit', data);
+// 删除水泥搅拌桩/旋挖设备信息
+export const deleteCementMixPileDevApi = data => post('/xmgl/cementMixPileDev/delete', data);
+// 通过id查询水泥搅拌桩/旋挖设备信息
+export const queryCementMixPileDevByIdApi = data => get('/xmgl/cementMixPileDev/queryById', data);
+
+// 任务记录
+// 分页列表查询水泥搅拌桩/旋挖任务信息
+export const getCementMixPileTaskPageApi = data => get('/xmgl/cementMixPileTask/page', data);
+// 添加水泥搅拌桩/旋挖任务信息
+export const addCementMixPileTaskApi = data => post('/xmgl/cementMixPileTask/add', data);
+// 编辑水泥搅拌桩/旋挖任务信息
+export const editCementMixPileTaskApi = data => post('/xmgl/cementMixPileTask/edit', data);
+// 删除水泥搅拌桩/旋挖任务信息
+export const deleteCementMixPileTaskApi = data => post('/xmgl/cementMixPileTask/delete', data);
+// 批量删除水泥搅拌桩/旋挖任务信息
+export const deleteBatchCementMixPileTaskApi = data => post('/xmgl/cementMixPileTask/deleteBatch', data);
+// 保存水泥搅拌桩/旋挖任务点位信息
+export const saveCementMixPileTaskPointApi = data => post('/xmgl/cementMixPileTask/savePoints', data);
+// 解绑水泥搅拌桩/旋挖任务点位信息
+export const delPointsByTaskIdCementMixPileTaskPointApi = data => post('/xmgl/cementMixPileTask/delPointsByTaskId', data);
+
+// 点位数据
+// 列表查询水泥搅拌桩/旋挖点位信息信息
+export const getCementMixPilePointListApi = data => get('/xmgl/cementMixPilePoint/list', data);
+// 分页列表查询水泥搅拌桩/旋挖点位信息信息
+export const getCementMixPilePointPageApi = data => get('/xmgl/cementMixPilePoint/page', data);
+// 添加水泥搅拌桩/旋挖点位信息
+export const addCementMixPilePointApi = data => post('/xmgl/cementMixPilePoint/add', data);
+// 编辑水泥搅拌桩/旋挖点位信息
+export const editCementMixPilePointApi = data => post('/xmgl/cementMixPilePoint/edit', data);
+// 删除水泥搅拌桩/旋挖点位信息
+export const deleteCementMixPilePointApi = data => post('/xmgl/cementMixPilePoint/delete', data);
+// 批量删除水泥搅拌桩/旋挖点位信息
+export const deleteBatchCementMixPilePointApi = data => post('/xmgl/cementMixPilePoint/deleteBatch', data);
+
+// 成桩数据
+// 分页列表查询水泥搅拌桩/旋挖沉桩数据信息
+export const getCementMixPilePilPageApi = data => get('/xmgl/cementMixPilePil/page', data);
+// 添加水泥搅拌桩/旋挖沉桩数据信息
+export const addCementMixPilePilApi = data => post('/xmgl/cementMixPilePil/add', data);
+// 编辑水泥搅拌桩/旋挖沉桩数据信息
+export const editCementMixPilePilApi = data => post('/xmgl/cementMixPilePil/edit', data);
+// 删除水泥搅拌桩/旋挖沉桩数据信息
+export const deleteCementMixPilePilApi = data => post('/xmgl/cementMixPilePil/delete', data);
+// 批量删除水泥搅拌桩/旋挖沉桩数据信息
+export const deleteBatchCementMixPilePilApi = data => post('/xmgl/cementMixPilePil/deleteBatch', data);
+
+// 实时数据
+// 分页列表查询水泥搅拌桩/旋挖沉桩实时数据信息
+export const getCementMixPileRealtimePageApi = data => get('/xmgl/cementMixPileRealtime/page', data);
+// 添加水泥搅拌桩/旋挖沉桩实时数据信息
+export const addCementMixPileRealtimeApi = data => post('/xmgl/cementMixPileRealtime/add', data);
+// 编辑水泥搅拌桩/旋挖沉桩实时数据信息
+export const editCementMixPileRealtimeApi = data => post('/xmgl/cementMixPileRealtime/edit', data);
+// 删除水泥搅拌桩/旋挖沉桩实时数据信息
+export const deleteCementMixPileRealtimeApi = data => post('/xmgl/cementMixPileRealtime/delete', data);
+// 批量删除水泥搅拌桩/旋挖沉桩实时数据信息
+export const deleteBatchCementMixPileRealtimeApi = data => post('/xmgl/cementMixPileRealtime/deleteBatch', data);
+
+// 报警数据
+// 分页列表查询水泥搅拌桩/旋挖沉桩报警信息
+export const getCementMixPileAlarmPageApi = data => get('/xmgl/cementMixPileAlarm/page', data);
+// 添加水泥搅拌桩/旋挖沉桩报警信息
+export const addCementMixPileAlarmApi = data => post('/xmgl/cementMixPileAlarm/add', data);
+// 编辑水泥搅拌桩/旋挖沉桩报警信息
+export const editCementMixPileAlarmApi = data => post('/xmgl/cementMixPileAlarm/edit', data);
+// 删除水泥搅拌桩/旋挖沉桩报警信息
+export const deleteCementMixPileAlarmApi = data => post('/xmgl/cementMixPileAlarm/delete', data);
+// 批量删除水泥搅拌桩/旋挖沉桩报警信息
+export const deleteBatchCementMixPileAlarmApi = data => post('/xmgl/cementMixPileAlarm/deleteBatch', data);
\ No newline at end of file
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 46d31e2b..0a45a68e 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -181,34 +181,34 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地
// axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
- axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地
- // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
- // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
- // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
- // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
- // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
- // axios.defaults.baseURL = 'http://101.43.164.214:11111/' // 百色三标段项目
- // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上(最新)地址
- // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上(最新)地址
- // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
- // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
- // axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址
- // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
- // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
- // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
- // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
- // axios.defaults.baseURL = 'http://192.168.9.249:9820/' //四川网城正式地址
- // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:34568/' //四川网城外网映射地址
- // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址
- // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
- // axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工
- // axios.defaults.baseURL = "http://222.80.185.228:6090"; //木垒
- // axios.defaults.baseURL = "https://zm.zhgdyun.com:11111";
- // // axios.defaults.baseURL = "http://121.37.106.37:9809";
- // axios.defaults.baseURL = "http://139.9.66.234:20628";
- // axios.defaults.baseURL = "http://jxj.zhgdyun.com:9500";
- // axios.defaults.baseURL = "http://jxj.zhgdyun.com:21000/"; // 潮州
- // axios.defaults.baseURL = "http://gszhdz.crpower.com.cn:9809/"; // 敦煌
+ // axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地
+ // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
+ // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
+ // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
+ // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
+ // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
+ // axios.defaults.baseURL = 'http://101.43.164.214:11111/' // 百色三标段项目
+ // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上(最新)地址
+ // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上(最新)地址
+ // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
+ // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
+ // axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址
+ // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
+ // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
+ // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
+ // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
+ // axios.defaults.baseURL = 'http://192.168.9.249:9820/' //四川网城正式地址
+ // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:34568/' //四川网城外网映射地址
+ // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址
+ // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址
+ // axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工
+ // axios.defaults.baseURL = "http://222.80.185.228:6090"; //木垒
+ // axios.defaults.baseURL = "https://zm.zhgdyun.com:11111";
+ // // axios.defaults.baseURL = "http://121.37.106.37:9809";
+ // axios.defaults.baseURL = "http://139.9.66.234:20628";
+ // axios.defaults.baseURL = "http://jxj.zhgdyun.com:9500";
+ // axios.defaults.baseURL = "http://jxj.zhgdyun.com:21000/"; // 潮州
+ // axios.defaults.baseURL = "http://gszhdz.crpower.com.cn:9809/"; // 敦煌
} else if (process.env.NODE_ENV == "debug") {
axios.defaults.baseURL = "https://www.ceshi.com";
} else if (process.env.NODE_ENV == "production") {
diff --git a/src/router/equipmentCenter.js b/src/router/equipmentCenter.js
index 0edbb787..0cdd72ae 100644
--- a/src/router/equipmentCenter.js
+++ b/src/router/equipmentCenter.js
@@ -285,6 +285,12 @@ const routes = [{
component: (resolve) =>
require(["@/views/equipmentCenter/tunnelBoringMachine/deviceManage"], resolve),
},
+ {
+ path: "cementMixingPileMonitor/deviceManager",
+ name: "盾构机管理_设备管理",
+ component: (resolve) =>
+ require(["@/views/projectFront/cementMixingPileMonitor/deviceManager.vue"], resolve),
+ },
],
},
{
diff --git a/src/router/index.js b/src/router/index.js
index 2f134f96..fabfafce 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -411,7 +411,7 @@ const routes2 = [{
},
{
path: "/project/cementMixingPileMonitor/pileDrivingList",
- name: "成桩数据",
+ name: "点位数据",
component: (resolve) =>
require(["@/views/projectFront/cementMixingPileMonitor/pileDrivingList.vue"], resolve),
},
@@ -421,6 +421,18 @@ const routes2 = [{
component: (resolve) =>
require(["@/views/projectFront/cementMixingPileMonitor/taskRecord.vue"], resolve),
},
+ {
+ path: "/project/cementMixingPileMonitor/realTimeList",
+ name: "实时数据",
+ component: (resolve) =>
+ require(["@/views/projectFront/cementMixingPileMonitor/realTimeList.vue"], resolve),
+ },
+ {
+ path: "/project/cementMixingPileMonitor/alarmList",
+ name: "报警数据",
+ component: (resolve) =>
+ require(["@/views/projectFront/cementMixingPileMonitor/alarmList.vue"], resolve),
+ },
//天气管理
{
path: "/project/summary/weatherManagement",
diff --git a/src/views/equipmentCenter/carPosition/devConfig.vue b/src/views/equipmentCenter/carPosition/devConfig.vue
index b538c563..100b0013 100644
--- a/src/views/equipmentCenter/carPosition/devConfig.vue
+++ b/src/views/equipmentCenter/carPosition/devConfig.vue
@@ -149,8 +149,8 @@
:disabled="Popup.type === 'edit'"
@change="devTypeChange"
>
-
+ 服务商(以下服务商同时只可开启一种,如果当前有开启的定位,在选择其他服务商时,该类型配置及所有信息将归零) +
+
+ {{ item }}
+
+
+
+
+ 请选择您的服务商(以下服务商同时只可开启一种)
++ 注:选择服务商,配置完成后才可使用其他功能。 +
+ +