diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 0fe68dba..7d42c251 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -46,6 +46,10 @@ export default {
path: "/alarmRules",
name: "告警规则",
},
+ {
+ path: "/I2config",
+ name: "I2配置",
+ },
],
};
},
diff --git a/src/router/index.js b/src/router/index.js
index fbb0fcfb..e4fb1d18 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -138,6 +138,47 @@ const routes = [
title: "告警规则",
},
},
+ {
+ path: "/I2config",
+ component: () => import("../views/I2config/index.vue"),
+ name: "I2config",
+ meta: {
+ title: "I2配置",
+ },
+ path: "/I2config",
+ component: () => import("../views/I2config/index.vue"),
+ name: "I2config",
+ redirect: "/I2config/filed",
+ meta: {
+ title: "I2配置管理",
+ },
+ children: [
+ {
+ path: "/I2config/filed",
+ component: () => import("../views/I2config/filed/index.vue"),
+ name: "filed",
+ meta: {
+ title: "字段映射",
+ },
+ },
+ {
+ path: "/I2config/exportType",
+ component: () => import("../views/I2config/exportType/index.vue"),
+ name: "exportType",
+ meta: {
+ title: "导出类型",
+ },
+ },
+ {
+ path: "/I2config/record",
+ component: () => import("../views/I2config/record/index.vue"),
+ name: "record",
+ meta: {
+ title: "导出记录",
+ },
+ },
+ ],
+ },
],
},
];
diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index e4af0b43..1aad4862 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -707,3 +707,35 @@ export function warningListApi(data) {
},
});
}
+
+//I2配置
+//字段映射列表
+export function listFieldConfigApi(data) {
+ return request({
+ url: "/i2sync/listFieldConfig",
+ method: "get",
+ params: data,
+ headers: {
+ "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+ },
+ });
+}
+//修改字段映射表
+
+export function updateFieldConfigApi(data) {
+ return request({
+ url: "/i2sync/updateFieldConfig",
+ method: "post",
+ data,
+ });
+}
+
+//删除字段映射表
+
+export function delFieldConfigApi(data) {
+ return request({
+ url: "/i2sync/delFieldConfig",
+ method: "post",
+ data,
+ });
+}
diff --git a/src/views/I2config/exportType/index.vue b/src/views/I2config/exportType/index.vue
new file mode 100644
index 00000000..79be8967
--- /dev/null
+++ b/src/views/I2config/exportType/index.vue
@@ -0,0 +1,43 @@
+
+
+
+
+
diff --git a/src/views/I2config/filed/components/addfiledDialog.vue b/src/views/I2config/filed/components/addfiledDialog.vue
new file mode 100644
index 00000000..2c5bc1e6
--- /dev/null
+++ b/src/views/I2config/filed/components/addfiledDialog.vue
@@ -0,0 +1,344 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 表字段
+ 导出字段
+
+
+
+ {{ item.comment + item.name }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/I2config/filed/index.vue b/src/views/I2config/filed/index.vue
new file mode 100644
index 00000000..8025d11e
--- /dev/null
+++ b/src/views/I2config/filed/index.vue
@@ -0,0 +1,155 @@
+
+
+
+
字段映射
+
+
+
新增字段映射
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.i2syncFields.length }}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/I2config/index.vue b/src/views/I2config/index.vue
new file mode 100644
index 00000000..97cd64e8
--- /dev/null
+++ b/src/views/I2config/index.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
I2配置
+
+ -
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/I2config/record/index.vue b/src/views/I2config/record/index.vue
new file mode 100644
index 00000000..3c0ec772
--- /dev/null
+++ b/src/views/I2config/record/index.vue
@@ -0,0 +1,43 @@
+
+
+
+
+
diff --git a/src/views/alarmRules/index.vue b/src/views/alarmRules/index.vue
index 68365e77..ecfc32d1 100644
--- a/src/views/alarmRules/index.vue
+++ b/src/views/alarmRules/index.vue
@@ -3,11 +3,21 @@
设备列表
+
+
+
+
{
+ this.$refs.tree.filter(this.filterText);
+ }, 500);
+ },
+ //树状图搜索
+ filterNode(value, data, node) {
+ console.log(value);
+ // 如果什么都没填全部匹配全部返回
+ if (!value) return true;
+ console.log(data);
+ this.searchName = data.mc + data.name;
+ console.log(this.searchName);
+ // 如果传入的value和data中的label相同,匹配成功
+ if (this.searchName.indexOf(value) !== -1) {
+ return true;
+ }
+ },
getParamTreeList() {
getParamTreeApi()
.then((res) => {
diff --git a/src/views/dataReport/index.vue b/src/views/dataReport/index.vue
index 4839bd87..a73d9cd5 100644
--- a/src/views/dataReport/index.vue
+++ b/src/views/dataReport/index.vue
@@ -335,10 +335,12 @@ export default {
},
//树状图搜索
filterNode(value, data, node) {
+ console.log(value);
// 如果什么都没填全部匹配全部返回
if (!value) return true;
- this.searchName = data.name;
- //console.log(this.searchName);
+ console.log(data);
+ this.searchName = data.mc + data.name;
+ console.log(this.searchName);
// 如果传入的value和data中的label相同,匹配成功
if (this.searchName.indexOf(value) !== -1) {
return true;
diff --git a/src/views/homePage/warnMessage/components/warnDialog.vue b/src/views/homePage/warnMessage/components/warnDialog.vue
index 569240c7..52f6e4eb 100644
--- a/src/views/homePage/warnMessage/components/warnDialog.vue
+++ b/src/views/homePage/warnMessage/components/warnDialog.vue
@@ -87,9 +87,15 @@
- 高
- 中
- 低
+ 高
+
+
+ 中
+
+
+ 低
+
diff --git a/src/views/paramBinding/index.vue b/src/views/paramBinding/index.vue
index ce2b9282..d0cd3e20 100644
--- a/src/views/paramBinding/index.vue
+++ b/src/views/paramBinding/index.vue
@@ -8,12 +8,22 @@
>
+
+
+
+
{
+ this.$refs.tree.filter(this.filterText);
+ }, 500);
+ },
+ //树状图搜索
+ filterNode(value, data, node) {
+ console.log(value);
+ // 如果什么都没填全部匹配全部返回
+ if (!value) return true;
+ console.log(data);
+ this.searchName = data.mc + data.name;
+ console.log(this.searchName);
+ // 如果传入的value和data中的label相同,匹配成功
+ if (this.searchName.indexOf(value) !== -1) {
+ return true;
+ }
+ },
getParamTreeList() {
getParamTreeApi()
.then((res) => {
diff --git a/vue.config.js b/vue.config.js
index a393c6ce..4fe23fcb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -20,8 +20,9 @@ module.exports = defineConfig({
proxy: {
"/cac-api": {
//表示拦截以/api开头的请求路径
- target: "http://192.168.1.190:88", //200服务器
- //target: "http://dev.xinyingpower.com:40080/", //dell服务器
+ //target: "http://192.168.1.190:88", //200服务器
+ target: "http://61.169.135.146:40080/", //dell服务器
+
changOrigin: true, //是否开启跨域
pathRewrite: {
"^/api": "/cac-api", //重写api,把api变成空字符,因为我们真正请求的路径是没有api的