diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js
index 2a99324..d60ad7b 100644
--- a/src/api/http/http-api.js
+++ b/src/api/http/http-api.js
@@ -29,6 +29,7 @@ export default {
// url: "/street",
// name: "删除巷道"
// },
+ //注释:所有用到删除的接口都需要拼接变量id,所以请求方式采用了挂载在原型链上的$axios进行请求,详细请看具体页面的$axios请求
getCameraList: {
method: "POST",
url: "/camera/page",
@@ -49,6 +50,27 @@ export default {
url: "/lychee/stream/push",
name: "获取channel字符集"
},
+ getCameraIoList: {
+ method: "POST",
+ url: "/camera/config/page",
+ name: "球机IO配置分页列表"
+ },
+ addCameraIo: {
+ method: "POST",
+ url: "/camera/config",
+ name: "球机IO指令配置新增"
+ },
+ editCameraIo: {
+ method: "PUT",
+ url: "/camera/config",
+ name: "球机IO指令配置编辑"
+ },
+ // cameraIoImport: {
+ // method: "POST",
+ // url: "/camera/config/import",
+ // name: "球机IO导入"
+ // },
+ //注释:导出接口路径已采用ant design vue的upload组件action属性动态定义
queryList: {
url: '/order/list',
name: '查询',
diff --git a/src/api/importExcel.js b/src/api/importExcel.js
new file mode 100644
index 0000000..112bd85
--- /dev/null
+++ b/src/api/importExcel.js
@@ -0,0 +1 @@
+export const importExcelUrl = process.env.VUE_APP_API_URL + "/camera/config/import";
diff --git a/src/plugins/antd.js b/src/plugins/antd.js
index 96f26a2..424cd71 100644
--- a/src/plugins/antd.js
+++ b/src/plugins/antd.js
@@ -25,7 +25,8 @@ import {
Tag,
Drawer,
Divider,
- DatePicker
+ DatePicker,
+ Upload,
} from "ant-design-vue";
Vue.use(Layout);
Vue.use(ConfigProvider);
@@ -51,7 +52,8 @@ Vue.use(Tooltip)
Vue.use(Tag)
Vue.use(Drawer)
Vue.use(Divider)
-Vue.use(DatePicker )
+Vue.use(DatePicker)
+Vue.use(Upload)
Vue.prototype.$message = message;
Vue.prototype.$info = Modal.info;
Vue.prototype.$success = Modal.success;
diff --git a/src/plugins/axios/axios.js b/src/plugins/axios/axios.js
index 9c7c175..aa5d17f 100644
--- a/src/plugins/axios/axios.js
+++ b/src/plugins/axios/axios.js
@@ -13,6 +13,8 @@ window.once = 0
instance.interceptors.request.use((config) => {
const reqObj = config;
// 在发送请求之前做些什么 -- 路径参数拼接
+ console.log('xxxxxxxxxx')
+ console.log(reqObj)
const reg = /\{(.+?)\}/g;
if (reg.test(reqObj.url)) {
reqObj.url = reqObj.url.replace(reg, Object.values(reqObj.path)[0]);
diff --git a/src/plugins/axios/index.js b/src/plugins/axios/index.js
index c107685..c438f74 100644
--- a/src/plugins/axios/index.js
+++ b/src/plugins/axios/index.js
@@ -30,5 +30,4 @@ apiAll.keys().map((key) => {
console.log('moduleApis ', moduleApis)
return trans(moduleApis[name]);
});
-
export default moduleApis;
diff --git a/src/views/cameraManage/index.vue b/src/views/cameraManage/index.vue
index 5f320de..ac4731a 100644
--- a/src/views/cameraManage/index.vue
+++ b/src/views/cameraManage/index.vue
@@ -147,7 +147,7 @@ export default {
})
},
goIo(){
- this.$router.push({ name: "ioTable" });
+ this.$router.push({ name: "ioTable"});
}
},
components:{
diff --git a/src/views/cameraManage/ioModel.vue b/src/views/cameraManage/ioModel.vue
index 41f33ab..9294f59 100644
--- a/src/views/cameraManage/ioModel.vue
+++ b/src/views/cameraManage/ioModel.vue
@@ -90,24 +90,24 @@ export default {
if (!err) {
console.log(this.title)
if(this.type=='add'){
- this.$api.httpApi.addCamera({
+ this.$api.httpApi.addCameraIo({
data:values
}).then(res => {
if(res.code==200){
this.$emit('sure',false)
- this.$message.success('新增球机成功');
+ this.$message.success('新增IO指令成功');
}
}).catch(err => {
});
}else if(this.type=='edit'){
values.id = this.id
- this.$api.httpApi.editCamera({
+ this.$api.httpApi.editCameraIo({
data:values
}).then(res => {
if(res.code==200){
this.$emit('sure',false)
- this.$message.success('编辑球机成功');
+ this.$message.success('编辑IO指令成功');
}
}).catch(err => {
diff --git a/src/views/cameraManage/ioTable.vue b/src/views/cameraManage/ioTable.vue
index 57472dc..65ee7ba 100644
--- a/src/views/cameraManage/ioTable.vue
+++ b/src/views/cameraManage/ioTable.vue
@@ -4,16 +4,26 @@
新增
-
- 导入
-
+
+
+ 导入
+
+
@@ -42,14 +52,20 @@