From f9c8296c5f3384bee51b6b840cd61d80f2b0c8a2 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期三, 11 十月 2023 16:36:26 +0800
Subject: [PATCH] agv监控接口对接
---
web/src/api/modules/ductpiecePLM.js | 7 +++++++
web/src/views/DuctpiecePLM/ReportCenter/VideoAgv.vue | 31 ++++++++++++++-----------------
web/vue.config.js | 4 ++--
web/.env.development | 6 +++---
4 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/web/.env.development b/web/.env.development
index b97ccca..a2cd8ab 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -1,6 +1,6 @@
# VUE_APP_BASE_URL = 'http://111.30.93.212:11102'
-# VUE_APP_BASE_URL = 'http://192.168.0.154:8880'
+# VUE_APP_BASE_URL = 'http://192.168.0.226:8880'
# VUE_APP_BASE_URL = 'https://logadd.com:8443/pipe'
# VUE_APP_BASE_URL = 'https://ssfp.thhy-tj.com/api'
-# VUE_APP_BASE_URL = 'http://111.30.93.212:8089/api'
- VUE_APP_BASE_URL = 'https://pipe.thhy-tj.com:8880'
\ No newline at end of file
+ VUE_APP_BASE_URL = 'http://111.30.93.212:8089/suapi'
+# VUE_APP_BASE_URL = 'http://111.30.93.212:8089/pipesu'
\ No newline at end of file
diff --git a/web/src/api/modules/ductpiecePLM.js b/web/src/api/modules/ductpiecePLM.js
index 3e1f009..e67479f 100644
--- a/web/src/api/modules/ductpiecePLM.js
+++ b/web/src/api/modules/ductpiecePLM.js
@@ -56,6 +56,13 @@
// 获取全部钢筋笼与模具信息
getAllSteelPipeData: (params) =>
axios.post('/m/steelProduce/ModSteelPullDown', params),
+
+
+ /**
+ * agv监控
+ */
+ searchAgvLists: (params) =>
+ axios.post('/screen/pl/agv', params),
/**
* 水养模块接口
diff --git a/web/src/views/DuctpiecePLM/ReportCenter/VideoAgv.vue b/web/src/views/DuctpiecePLM/ReportCenter/VideoAgv.vue
index 8619f62..9225a88 100644
--- a/web/src/views/DuctpiecePLM/ReportCenter/VideoAgv.vue
+++ b/web/src/views/DuctpiecePLM/ReportCenter/VideoAgv.vue
@@ -34,17 +34,17 @@
</el-table-column>
<el-table-column prop="mouldCode" label="时间" align="center" ></el-table-column>
<el-table-column prop="mouldNum" label="AGV名称" align="center" ></el-table-column>
- <el-table-column prop="mouldTypes" label="AGV状态" align="center" ></el-table-column>
- <el-table-column prop="sizeName" label="顶升机构状态" align="center" ></el-table-column>
- <el-table-column prop="turn" label="是否存在重物" align="center" ></el-table-column>
- <el-table-column prop="holes" label="AGV任务状态" align="center" ></el-table-column>
- <el-table-column prop="scanNum" label="AGV当前位置" align="center" ></el-table-column>
- <el-table-column prop="lengthTime" label="电压" align="center"></el-table-column>
- <el-table-column prop="createTime" label="电流" align="center"></el-table-column>
- <el-table-column prop="createTime" label="电量" align="center"></el-table-column>
+ <el-table-column prop="agvTaskState" label="AGV状态" align="center" ></el-table-column>
+ <el-table-column prop="agvJackingState" label="顶升机构状态" align="center" ></el-table-column>
+ <el-table-column prop="agvLiftupHeavyState" label="是否存在重物" align="center" ></el-table-column>
+ <el-table-column prop="agvTaskState" label="AGV任务状态" align="center" ></el-table-column>
+ <el-table-column prop="agvCurrentLandmarkRFID" label="AGV当前位置" align="center" ></el-table-column>
+ <el-table-column prop="battery1Voltage" label="电压" align="center"></el-table-column>
+ <el-table-column prop="battery1Current" label="电流" align="center"></el-table-column>
+ <el-table-column prop="battery1Charge" label="电量" align="center"></el-table-column>
</el-table>
</div>
- <div class="main_footer">
+ <!-- <div class="main_footer">
<el-pagination
background
@current-change="changePageNum"
@@ -55,7 +55,7 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
- </div>
+ </div> -->
</div>
</template>
@@ -96,15 +96,12 @@
if(bol) {
this.pageNum = 1;
}
- let params = Object.assign({},this.search,{
- pageNum: this.pageNum,
- pageSize: this.pageSize
- })
+ let params = Object.assign({},this.search)
this.loading = true;
- this.$api.Report.searchDieList(params).then((res) => {
+ this.$api.DuctpiecePLM.searchAgvLists(params).then((res) => {
if(res.statusMsg === 'ok') {
- this.total = res.data.total;
- this.dataList = res.data.list;
+ // this.total = res.data.total;
+ this.dataList = res.data;
}
this.loading = false;
})
diff --git a/web/vue.config.js b/web/vue.config.js
index 6478174..e0287ce 100644
--- a/web/vue.config.js
+++ b/web/vue.config.js
@@ -3,12 +3,12 @@
// publicPath: process.env.NODE_ENV === 'production' ? '/pipe' : '/',
devServer: {
proxy: {
- '/api': {
+ '/suapi': {
target: process.env.VUE_APP_BASE_URL,
ws: true,
changeOrigin: true,
pathRewrite: {
- '^/api': '' //路径重写
+ '^/suapi': '' //路径重写
}
},
}
--
Gitblit v1.9.3