From 0da9c6652870390cd07bc90211aefe095445baf6 Mon Sep 17 00:00:00 2001
From: master <master@163.com>
Date: 星期三, 23 三月 2022 17:09:23 +0800
Subject: [PATCH] 完善表格功能
---
src/cool/modules/index.ts | 10
src/cool/modules/alarm/index.ts | 0
src/cool/modules/basedevice/components/index.ts | 0
src/cool/modules/alarm/pages/index.ts | 0
src/cool/modules/hntask/store/index.ts | 0
src/cool/modules/doulunji/directives/index.ts | 0
src/cool/modules/userInfo/views/userInfo.vue | 73 +++++
src/cool/modules/doulunji/views/index.ts | 0
src/cool/modules/alarm/service/index.ts | 0
src/cool/modules/hntask/views/periodic_task.vue | 70 +++-
src/cool/modules/basedevice/index.ts | 0
src/cool/modules/hntask/index.ts | 0
src/cool/modules/basedevice/views/index.ts | 0
src/cool/modules/hntask/views/index.ts | 0
src/cool/modules/basedevice/views/basedevice_info.vue | 175 +++++++++---
src/cool/modules/basedevice/directives/index.ts | 0
src/cool/modules/hntask/pages/index.ts | 0
src/cool/modules/doulunji/index.ts | 0
src/cool/modules/metadata/views/monitor_metadata.vue | 209 ++++++++++++++++
src/cool/modules/alarm/views/index.ts | 0
src/cool/modules/basedevice/service/index.ts | 0
src/cool/modules/metadata/views/index.ts | 0
src/cool/modules/basedevice/pages/index.ts | 0
src/cool/modules/alarm/components/index.ts | 0
src/cool/modules/basedevice/store/index.ts | 0
src/cool/modules/metadata/index.ts | 0
src/cool/modules/doulunji/service/index.ts | 0
src/cool/modules/hntask/views/immediate_task.vue | 132 ++++-----
src/cool/modules/hntask/service/index.ts | 0
src/cool/modules/doulunji/views/doulunji_info.vue | 0
src/cool/modules/basedevice/views/basedevice_group.vue | 64 ++--
src/cool/modules/metadata/store/index.ts | 0
/dev/null | 1
src/cool/modules/doulunji/components/index.ts | 0
src/cool/modules/hntask/directives/index.ts | 0
src/cool/modules/doulunji/pages/index.ts | 0
src/cool/modules/alarm/store/index.ts | 0
src/cool/modules/metadata/directives/index.ts | 0
src/cool/modules/metadata/service/index.ts | 0
src/cool/modules/alarm/directives/index.ts | 0
src/cool/modules/metadata/pages/index.ts | 0
src/cool/modules/doulunji/store/index.ts | 0
src/cool/modules/hntask/components/index.ts | 0
src/cool/modules/metadata/components/index.ts | 0
44 files changed, 552 insertions(+), 182 deletions(-)
diff --git a/src/cool/modules/device/components/index.ts b/src/cool/modules/alarm/components/index.ts
similarity index 100%
copy from src/cool/modules/device/components/index.ts
copy to src/cool/modules/alarm/components/index.ts
diff --git a/src/cool/modules/device/directives/index.ts b/src/cool/modules/alarm/directives/index.ts
similarity index 100%
copy from src/cool/modules/device/directives/index.ts
copy to src/cool/modules/alarm/directives/index.ts
diff --git a/src/cool/modules/device/index.ts b/src/cool/modules/alarm/index.ts
similarity index 100%
copy from src/cool/modules/device/index.ts
copy to src/cool/modules/alarm/index.ts
diff --git a/src/cool/modules/device/pages/index.ts b/src/cool/modules/alarm/pages/index.ts
similarity index 100%
copy from src/cool/modules/device/pages/index.ts
copy to src/cool/modules/alarm/pages/index.ts
diff --git a/src/cool/modules/douMsg/service/index.ts b/src/cool/modules/alarm/service/index.ts
similarity index 100%
copy from src/cool/modules/douMsg/service/index.ts
copy to src/cool/modules/alarm/service/index.ts
diff --git a/src/cool/modules/device/store/index.ts b/src/cool/modules/alarm/store/index.ts
similarity index 100%
copy from src/cool/modules/device/store/index.ts
copy to src/cool/modules/alarm/store/index.ts
diff --git a/src/cool/modules/device/views/index.ts b/src/cool/modules/alarm/views/index.ts
similarity index 100%
copy from src/cool/modules/device/views/index.ts
copy to src/cool/modules/alarm/views/index.ts
diff --git a/src/cool/modules/device/components/index.ts b/src/cool/modules/basedevice/components/index.ts
similarity index 100%
rename from src/cool/modules/device/components/index.ts
rename to src/cool/modules/basedevice/components/index.ts
diff --git a/src/cool/modules/device/directives/index.ts b/src/cool/modules/basedevice/directives/index.ts
similarity index 100%
rename from src/cool/modules/device/directives/index.ts
rename to src/cool/modules/basedevice/directives/index.ts
diff --git a/src/cool/modules/device/index.ts b/src/cool/modules/basedevice/index.ts
similarity index 100%
rename from src/cool/modules/device/index.ts
rename to src/cool/modules/basedevice/index.ts
diff --git a/src/cool/modules/device/pages/index.ts b/src/cool/modules/basedevice/pages/index.ts
similarity index 100%
rename from src/cool/modules/device/pages/index.ts
rename to src/cool/modules/basedevice/pages/index.ts
diff --git a/src/cool/modules/colletMeta/service/index.ts b/src/cool/modules/basedevice/service/index.ts
similarity index 100%
copy from src/cool/modules/colletMeta/service/index.ts
copy to src/cool/modules/basedevice/service/index.ts
diff --git a/src/cool/modules/device/store/index.ts b/src/cool/modules/basedevice/store/index.ts
similarity index 100%
rename from src/cool/modules/device/store/index.ts
rename to src/cool/modules/basedevice/store/index.ts
diff --git a/src/cool/modules/huaneng/views/huaneng.vue b/src/cool/modules/basedevice/views/basedevice_group.vue
similarity index 71%
rename from src/cool/modules/huaneng/views/huaneng.vue
rename to src/cool/modules/basedevice/views/basedevice_group.vue
index 8243663..c040d17 100644
--- a/src/cool/modules/huaneng/views/huaneng.vue
+++ b/src/cool/modules/basedevice/views/basedevice_group.vue
@@ -45,29 +45,32 @@
const upsert = reactive<Upsert>({
items: [
{
- label: "濮撳悕",
- prop: "name",
+ label: "閫昏緫ID",
+ prop: "logic_id",
+ component: {
+ name: "el-input"
+ },
+ //鏄惁涓哄繀濉」,娉細鎺ュ彛閰嶇疆瀛楁鏃舵病鏈夎缃粯璁ゅ�兼椂锛岄兘闇�瑕侀�夋嫨蹇呭～
+ required: true
+ },
+ {
+ label: "鎿嶄綔浜�",
+ prop: "configurator",
+ component: {
+ name: "el-input"
+ },
+ required: true
+ },
+ {
+ label: "澶囨敞",
+ prop: "remark",
component: {
name: "el-input"
}
},
{
- label: "鍚嶇О",
- prop: "title",
- component: {
- name: "el-input"
- }
- },
- {
- label: "搴忓彿",
- prop: "price",
- component: {
- name: "el-input"
- }
- },
- {
- label: "鍒嗙被",
- prop: "type",
+ label: "鐘舵��",
+ prop: "status",
component: {
name: "el-input"
}
@@ -83,20 +86,25 @@
align: "center"
},
{
- label: "濮撳悕",
- prop: "name"
+ label: "id",
+ prop: "id",
+ sortable: true //鏄惁鎺掑簭鍔熻兘
},
{
- label: "璁惧",
- prop: "title"
+ label: "閫昏緫ID",
+ prop: "logic_id"
},
{
- label: "搴忓彿",
- prop: "price"
+ label: "鎿嶄綔浜�",
+ prop: "configurator"
},
{
- label: "鍒嗙被",
- prop: "type"
+ label: "澶囨敞",
+ prop: "remark"
+ },
+ {
+ label: "鐘舵��",
+ prop: "status"
},
{
label: "鎿嶄綔",
@@ -107,10 +115,8 @@
// crud 鍔犺浇
function onLoad({ ctx, app }: CrudLoad) {
- console.log("service", service);
-
// 缁戝畾 service
- ctx.service(service.huaneng.huaneng).done();
+ ctx.service(service.business.devicegroup).done();
app.refresh();
}
diff --git a/src/cool/modules/deviceGroup/views/deviceGroup.vue b/src/cool/modules/basedevice/views/basedevice_info.vue
similarity index 60%
copy from src/cool/modules/deviceGroup/views/deviceGroup.vue
copy to src/cool/modules/basedevice/views/basedevice_info.vue
index b3bdba1..288c363 100644
--- a/src/cool/modules/deviceGroup/views/deviceGroup.vue
+++ b/src/cool/modules/basedevice/views/basedevice_info.vue
@@ -45,37 +45,32 @@
const upsert = reactive<Upsert>({
items: [
{
- label: "鍚嶇О",
- prop: "name",
- component: {
- name: "el-input"
- },
- //鏄惁涓哄繀濉」,娉細鎺ュ彛閰嶇疆瀛楁鏃舵病鏈夎缃粯璁ゅ�兼椂锛岄兘闇�瑕侀�夋嫨蹇呭～
- required: true
- },
- {
label: "閫昏緫ID",
prop: "logic_id",
component: {
name: "el-input"
- },
- required: true
+ }
},
{
label: "鐗╃悊ID",
prop: "device_id",
component: {
name: "el-input"
- },
- required: true
+ }
},
{
- label: "璐熻矗浜�",
- prop: "operator",
+ label: "璁惧鍚嶇О",
+ prop: "name",
component: {
name: "el-input"
- },
- required: true
+ }
+ },
+ {
+ label: "瀹夎浣嶇疆",
+ prop: "location",
+ component: {
+ name: "el-input"
+ }
},
{
label: "缁忓害",
@@ -99,15 +94,64 @@
}
},
{
- label: "瀹夎浣嶇疆",
- prop: "location",
+ label: "璁惧绮惧害",
+ prop: "dimension",
component: {
name: "el-input"
}
},
{
- label: "鐘舵��",
- prop: "status",
+ label: "鑸悜瑙�",
+ prop: "precision",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ label: "鏃嬭浆瑙�",
+ prop: "heading_angle",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ label: "淇话瑙�",
+ prop: "petch_angle",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ label: "妯粴瑙�",
+ prop: "roll_angle",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ label: "IP鍦板潃",
+ prop: "ipaddres",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ label: "绔彛",
+ prop: "device_port",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ label: "璐﹀彿",
+ prop: "device_account",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ label: "璐熻矗浜�",
+ prop: "opertator",
component: {
name: "el-input"
}
@@ -115,6 +159,13 @@
{
label: "澶囨敞",
prop: "remark",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ label: "鐘舵��",
+ prop: "status",
component: {
name: "el-input"
}
@@ -135,45 +186,76 @@
sortable: true //鏄惁鎺掑簭鍔熻兘
},
{
- label: "杩愯鐘舵��",
- prop: "status",
- filters: [
- { text: 0, value: 0 },
- { text: 1, value: 1 }
- ]
- // filters:"[{ text: '瀹�', value: '瀹�' }, { text: '鍏徃', value: '鍏徃' }]"
- },
- {
- label: "鍚嶇О",
- prop: "name"
- },
- {
- label: "浣嶇疆",
- prop: "location",
- width: 200
- },
- {
label: "閫昏緫ID",
prop: "logic_id"
},
{
label: "鐗╃悊ID",
- prop: "device_id",
- width: 100
+ prop: "device_id"
+ },
+ {
+ label: "璁惧鍚嶇О",
+ prop: "name"
+ },
+ {
+ label: "瀹夎浣嶇疆",
+ prop: "location"
},
{
label: "缁忓害",
- prop: "longitude",
- width: 150
+ prop: "longitude"
},
{
label: "绾害",
- prop: "latitude",
- width: 150
+ prop: "latitude"
},
{
label: "楂樺害",
prop: "altitude"
+ },
+ {
+ label: "璁惧绮惧害",
+ prop: "dimension"
+ },
+ {
+ label: "鑸悜瑙�",
+ prop: "precision"
+ },
+ {
+ label: "鏃嬭浆瑙�",
+ prop: "heading_angle"
+ },
+ {
+ label: "淇话瑙�",
+ prop: "petch_angle"
+ },
+ {
+ label: "妯粴瑙�",
+ prop: "roll_angle"
+ },
+ {
+ label: "IP鍦板潃",
+ prop: "ipaddres"
+ },
+ {
+ label: "绔彛",
+ prop: "device_port"
+ },
+ {
+ label: "璐﹀彿",
+ prop: "device_account"
+ },
+ {
+ label: "璐熻矗浜�",
+ prop: "opertator"
+ },
+ {
+ label: "澶囨敞",
+ prop: "remark"
+ },
+ {
+ label: "鐘舵��",
+ prop: "status"
},
{
label: "鎿嶄綔",
@@ -185,8 +267,7 @@
// crud 鍔犺浇
function onLoad({ ctx, app }: CrudLoad) {
// 缁戝畾 service
- console.log(service);
- ctx.service(service.business.devicegroup).done();
+ ctx.service(service.business.basedeviceinfo).done();
app.refresh();
}
diff --git a/src/cool/modules/device/views/index.ts b/src/cool/modules/basedevice/views/index.ts
similarity index 100%
rename from src/cool/modules/device/views/index.ts
rename to src/cool/modules/basedevice/views/index.ts
diff --git a/src/cool/modules/coalinventory/components/index.ts b/src/cool/modules/coalinventory/components/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/coalinventory/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/coalinventory/directives/index.ts b/src/cool/modules/coalinventory/directives/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/coalinventory/directives/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/coalinventory/index.ts b/src/cool/modules/coalinventory/index.ts
deleted file mode 100644
index 08b1faf..0000000
--- a/src/cool/modules/coalinventory/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import components from "./components";
-import directives from "./directives";
-import service from "./service";
-import store from "./store";
-import pages from "./pages";
-import views from "./views";
-
-export default {
- components,
- directives,
- service,
- store,
- pages,
- views
-};
diff --git a/src/cool/modules/coalinventory/pages/index.ts b/src/cool/modules/coalinventory/pages/index.ts
deleted file mode 100644
index d6d1738..0000000
--- a/src/cool/modules/coalinventory/pages/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default [];
diff --git a/src/cool/modules/coalinventory/service/index.ts b/src/cool/modules/coalinventory/service/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/coalinventory/service/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/coalinventory/store/index.ts b/src/cool/modules/coalinventory/store/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/coalinventory/store/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/coalinventory/views/coalinventory.vue b/src/cool/modules/coalinventory/views/coalinventory.vue
deleted file mode 100644
index cebc1e8..0000000
--- a/src/cool/modules/coalinventory/views/coalinventory.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
- <div>
- <h1>鐩樼叅璁″垝</h1>
- </div>
-</template>
\ No newline at end of file
diff --git a/src/cool/modules/coalinventory/views/index.ts b/src/cool/modules/coalinventory/views/index.ts
deleted file mode 100644
index d6d1738..0000000
--- a/src/cool/modules/coalinventory/views/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default [];
diff --git a/src/cool/modules/colletMeta/views/colletMeta.vue b/src/cool/modules/colletMeta/views/colletMeta.vue
deleted file mode 100644
index d606b2f..0000000
--- a/src/cool/modules/colletMeta/views/colletMeta.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
- <h1>妫�娴嬪厓鏁版嵁</h1>
-</template>
\ No newline at end of file
diff --git a/src/cool/modules/colletMetaData/components/index.ts b/src/cool/modules/colletMetaData/components/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/colletMetaData/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/colletMetaData/directives/index.ts b/src/cool/modules/colletMetaData/directives/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/colletMetaData/directives/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/colletMetaData/index.ts b/src/cool/modules/colletMetaData/index.ts
deleted file mode 100644
index 08b1faf..0000000
--- a/src/cool/modules/colletMetaData/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import components from "./components";
-import directives from "./directives";
-import service from "./service";
-import store from "./store";
-import pages from "./pages";
-import views from "./views";
-
-export default {
- components,
- directives,
- service,
- store,
- pages,
- views
-};
diff --git a/src/cool/modules/colletMetaData/pages/index.ts b/src/cool/modules/colletMetaData/pages/index.ts
deleted file mode 100644
index d6d1738..0000000
--- a/src/cool/modules/colletMetaData/pages/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default [];
diff --git a/src/cool/modules/colletMetaData/service/index.ts b/src/cool/modules/colletMetaData/service/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/colletMetaData/service/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/colletMetaData/store/index.ts b/src/cool/modules/colletMetaData/store/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/colletMetaData/store/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/colletMetaData/views/colletMetaData.vue b/src/cool/modules/colletMetaData/views/colletMetaData.vue
deleted file mode 100644
index 22f6e39..0000000
--- a/src/cool/modules/colletMetaData/views/colletMetaData.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
- <cl-crud :ref="setRefs('crud')"
- @load="onLoad">
- <el-row type="flex"
- align="middle">
- <!-- 鍒锋柊鎸夐挳 -->
- <cl-refresh-btn />
- <!-- 鏂板鎸夐挳 -->
- <cl-add-btn />
- <!-- 鍒犻櫎鎸夐挳 -->
- <cl-multi-delete-btn />
- <cl-flex1 />
- <!-- 鍏抽敭瀛楁悳绱� -->
- <cl-search-key />
- </el-row>
-
- <el-row>
- <!-- 鏁版嵁琛ㄦ牸 -->
- <cl-table :ref="setRefs('table')"
- v-bind="table" />
- </el-row>
-
- <el-row type="flex">
- <cl-flex1 />
- <!-- 鍒嗛〉鎺т欢 -->
- <cl-pagination />
- </el-row>
- <div>閲囬泦妫�娴嬪厓鏁版嵁</div>
- <!-- 鏂板銆佺紪杈� -->
- <cl-upsert :ref="setRefs('upsert')"
- v-bind="upsert" />
- </cl-crud>
-</template>
-
-<script lang="ts">
-import { defineComponent, reactive } from "vue";
-import { CrudLoad, Upsert, Table } from "@cool-vue/crud/types";
-import { useCool } from "/@/cool";
-
-export default defineComponent({
- setup() {
- const { refs, setRefs, service } = useCool();
-
- // 鏂板銆佺紪杈戦厤缃�
- const upsert = reactive<Upsert>({
- items: []
- });
-
- // 琛ㄦ牸閰嶇疆
- const table = reactive<Table>({
- columns: [
- {
- label: "鍚嶇О",
- prop: "name"
- }
- ]
- });
-
- // crud 鍔犺浇
- function onLoad({ ctx, app }: CrudLoad) {
- // 缁戝畾 service
- ctx.service(service.business.basedeviceinfo).done();
- app.refresh();
- }
-
- return {
- refs,
- setRefs,
- upsert,
- table,
- onLoad
- };
- }
-});
-</script>
diff --git a/src/cool/modules/colletMetaData/views/index.ts b/src/cool/modules/colletMetaData/views/index.ts
deleted file mode 100644
index d6d1738..0000000
--- a/src/cool/modules/colletMetaData/views/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default [];
diff --git a/src/cool/modules/device/service/device.ts b/src/cool/modules/device/service/device.ts
deleted file mode 100644
index 77cd3e0..0000000
--- a/src/cool/modules/device/service/device.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { BaseService, Service } from "/@/cool";
-
-@Service("device/device")
-class DemoDevice extends BaseService { }
-export default DemoDevice;
\ No newline at end of file
diff --git a/src/cool/modules/device/service/index.ts b/src/cool/modules/device/service/index.ts
deleted file mode 100644
index a592392..0000000
--- a/src/cool/modules/device/service/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import DemoDevice from "./device";
-
-export default {
- device: {
- device: new DemoDevice()
- }
-};
diff --git a/src/cool/modules/device/views/device.vue b/src/cool/modules/device/views/device.vue
deleted file mode 100644
index f91b1e4..0000000
--- a/src/cool/modules/device/views/device.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-<template>
- <cl-crud :ref="setRefs('crud')"
- @load="onLoad">
- <el-row type="flex"
- align="middle">
- <!-- 鍒锋柊鎸夐挳 -->
- <cl-refresh-btn />
- <!-- 鏂板鎸夐挳 -->
- <cl-add-btn />
- <!-- 鍒犻櫎鎸夐挳 -->
- <cl-multi-delete-btn />
- <cl-flex1 />
- <!-- 鍏抽敭瀛楁悳绱� -->
- <cl-search-key />
- </el-row>
-
- <el-row>
- <!-- 鏁版嵁琛ㄦ牸 -->
- <cl-table :ref="setRefs('table')"
- v-bind="table" />
- </el-row>
-
- <el-row type="flex">
- <cl-flex1 />
- <!-- 鍒嗛〉鎺т欢 -->
- <cl-pagination />
- </el-row>
-
- <!-- 鏂板銆佺紪杈� -->
- <cl-upsert :ref="setRefs('upsert')"
- v-bind="upsert" />
- </cl-crud>
-</template>
-
-<script lang="ts">
-import { defineComponent, reactive } from "vue";
-import { CrudLoad, Upsert, Table, RefreshOp } from "@cool-vue/crud/types";
-import { useCool } from "/@/cool";
-import { deepTree } from "/@/cool/utils";
-
-export default defineComponent({
- setup() {
- const { refs, setRefs, service, router } = useCool();
-
- // 鏂板銆佺紪杈戦厤缃�
- const upsert = reactive<Upsert>({
- items: [
- {
- label: "鍚嶇О",
- prop: "name",
- component: {
- name: "el-input"
- },
- //鏄惁涓哄繀濉」,娉細鎺ュ彛閰嶇疆瀛楁鏃舵病鏈夎缃粯璁ゅ�兼椂锛岄兘闇�瑕侀�夋嫨蹇呭～
- required: true
- },
- {
- label: "閫昏緫ID",
- prop: "logic_id",
- component: {
- name: "el-input"
- },
- required: true
- },
- {
- label: "鐗╃悊ID",
- prop: "device_id",
- component: {
- name: "el-input"
- },
- required: true
- },
- {
- label: "璐熻矗浜�",
- prop: "operator",
- component: {
- name: "el-input"
- },
- required: true
- },
- {
- label: "缁忓害",
- prop: "longitude",
- component: {
- name: "el-input"
- }
- },
- {
- label: "绾害",
- prop: "latitude",
- component: {
- name: "el-input"
- }
- },
- {
- label: "楂樺害",
- prop: "altitude",
- component: {
- name: "el-input"
- }
- },
- {
- label: "瀹夎浣嶇疆",
- prop: "location",
- component: {
- name: "el-input"
- }
- },
- {
- label: "鐘舵��",
- prop: "status",
- component: {
- name: "el-input"
- }
- },
- {
- label: "澶囨敞",
- prop: "remark",
- component: {
- name: "el-input"
- }
- }
- ]
- });
-
- // 琛ㄦ牸閰嶇疆
- const table = reactive<Table>({
- columns: [
- {
- type: "selection",
- align: "center"
- },
- {
- label: "id",
- prop: "id",
- sortable: true //鏄惁鎺掑簭鍔熻兘
- },
- {
- label: "杩愯鐘舵��",
- prop: "status",
- filters: [
- { text: 0, value: 0 },
- { text: 1, value: 1 }
- ]
- // filters:"[{ text: '瀹�', value: '瀹�' }, { text: '鍏徃', value: '鍏徃' }]"
- },
- {
- label: "鍚嶇О",
- prop: "name"
- },
- {
- label: "浣嶇疆",
- prop: "location",
- width: 200
- },
- {
- label: "閫昏緫ID",
- prop: "logic_id"
- },
- {
- label: "鐗╃悊ID",
- prop: "device_id",
- width: 100
- },
- {
- label: "缁忓害",
- prop: "longitude",
- width: 150
- },
- {
- label: "绾害",
- prop: "latitude",
- width: 150
- },
- {
- label: "楂樺害",
- prop: "altitude"
- },
- {
- label: "鎿嶄綔",
- type: "op"
- }
- ]
- });
-
- // crud 鍔犺浇
- function onLoad({ ctx, app }: CrudLoad) {
- // 缁戝畾 service
- console.log(service);
- ctx.service(service.business.basedeviceinfo).done();
- app.refresh();
- }
- // 鍒锋柊鐩戝惉
- function onRefresh(_: any, { render }: RefreshOp) {
- console.log("寮�濮嬫墽琛屽埛鏂�");
- service.business.basedeviceinfo.list().then((list: any[]) => {
- list.map((e) => {
- e.permList = e.perms ? e.perms.split(",") : [];
- });
- console.log("鍒锋柊鐩戝惉鍐呮墦鍗�");
-
- render(deepTree(list), {
- total: list.length
- });
- });
- }
- // 鍒锋柊
- function refresh() {
- console.log("鍒锋柊鍐呮墦鍗�");
- refs.value.crud.refresh();
- }
-
- // 璺宠浆
- function toUrl(url: string) {
- router.push(url);
- }
- return {
- refs,
- setRefs,
- onRefresh,
- refresh,
- toUrl,
- upsert,
- table,
- onLoad
- };
- }
-});
-</script>
diff --git a/src/cool/modules/deviceGroup/components/index.ts b/src/cool/modules/deviceGroup/components/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/deviceGroup/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/deviceGroup/directives/index.ts b/src/cool/modules/deviceGroup/directives/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/deviceGroup/directives/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/deviceGroup/index.ts b/src/cool/modules/deviceGroup/index.ts
deleted file mode 100644
index 08b1faf..0000000
--- a/src/cool/modules/deviceGroup/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import components from "./components";
-import directives from "./directives";
-import service from "./service";
-import store from "./store";
-import pages from "./pages";
-import views from "./views";
-
-export default {
- components,
- directives,
- service,
- store,
- pages,
- views
-};
diff --git a/src/cool/modules/deviceGroup/pages/index.ts b/src/cool/modules/deviceGroup/pages/index.ts
deleted file mode 100644
index d6d1738..0000000
--- a/src/cool/modules/deviceGroup/pages/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default [];
diff --git a/src/cool/modules/deviceGroup/service/index.ts b/src/cool/modules/deviceGroup/service/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/deviceGroup/service/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/deviceGroup/store/index.ts b/src/cool/modules/deviceGroup/store/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/deviceGroup/store/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/deviceGroup/views/index.ts b/src/cool/modules/deviceGroup/views/index.ts
deleted file mode 100644
index d6d1738..0000000
--- a/src/cool/modules/deviceGroup/views/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default [];
diff --git a/src/cool/modules/douMsg/components/index.ts b/src/cool/modules/doulunji/components/index.ts
similarity index 100%
rename from src/cool/modules/douMsg/components/index.ts
rename to src/cool/modules/doulunji/components/index.ts
diff --git a/src/cool/modules/douMsg/directives/index.ts b/src/cool/modules/doulunji/directives/index.ts
similarity index 100%
rename from src/cool/modules/douMsg/directives/index.ts
rename to src/cool/modules/doulunji/directives/index.ts
diff --git a/src/cool/modules/douMsg/index.ts b/src/cool/modules/doulunji/index.ts
similarity index 100%
rename from src/cool/modules/douMsg/index.ts
rename to src/cool/modules/doulunji/index.ts
diff --git a/src/cool/modules/douMsg/pages/index.ts b/src/cool/modules/doulunji/pages/index.ts
similarity index 100%
rename from src/cool/modules/douMsg/pages/index.ts
rename to src/cool/modules/doulunji/pages/index.ts
diff --git a/src/cool/modules/douMsg/service/index.ts b/src/cool/modules/doulunji/service/index.ts
similarity index 100%
rename from src/cool/modules/douMsg/service/index.ts
rename to src/cool/modules/doulunji/service/index.ts
diff --git a/src/cool/modules/douMsg/store/index.ts b/src/cool/modules/doulunji/store/index.ts
similarity index 100%
rename from src/cool/modules/douMsg/store/index.ts
rename to src/cool/modules/doulunji/store/index.ts
diff --git a/src/cool/modules/douMsg/views/douMsg.vue b/src/cool/modules/doulunji/views/doulunji_info.vue
similarity index 100%
rename from src/cool/modules/douMsg/views/douMsg.vue
rename to src/cool/modules/doulunji/views/doulunji_info.vue
diff --git a/src/cool/modules/douMsg/views/index.ts b/src/cool/modules/doulunji/views/index.ts
similarity index 100%
rename from src/cool/modules/douMsg/views/index.ts
rename to src/cool/modules/doulunji/views/index.ts
diff --git a/src/cool/modules/device/components/index.ts b/src/cool/modules/hntask/components/index.ts
similarity index 100%
copy from src/cool/modules/device/components/index.ts
copy to src/cool/modules/hntask/components/index.ts
diff --git a/src/cool/modules/device/directives/index.ts b/src/cool/modules/hntask/directives/index.ts
similarity index 100%
copy from src/cool/modules/device/directives/index.ts
copy to src/cool/modules/hntask/directives/index.ts
diff --git a/src/cool/modules/huaneng/index.ts b/src/cool/modules/hntask/index.ts
similarity index 100%
rename from src/cool/modules/huaneng/index.ts
rename to src/cool/modules/hntask/index.ts
diff --git a/src/cool/modules/huaneng/pages/index.ts b/src/cool/modules/hntask/pages/index.ts
similarity index 100%
rename from src/cool/modules/huaneng/pages/index.ts
rename to src/cool/modules/hntask/pages/index.ts
diff --git a/src/cool/modules/douMsg/service/index.ts b/src/cool/modules/hntask/service/index.ts
similarity index 100%
copy from src/cool/modules/douMsg/service/index.ts
copy to src/cool/modules/hntask/service/index.ts
diff --git a/src/cool/modules/huaneng/store/index.ts b/src/cool/modules/hntask/store/index.ts
similarity index 100%
rename from src/cool/modules/huaneng/store/index.ts
rename to src/cool/modules/hntask/store/index.ts
diff --git a/src/cool/modules/deviceGroup/views/deviceGroup.vue b/src/cool/modules/hntask/views/immediate_task.vue
similarity index 68%
rename from src/cool/modules/deviceGroup/views/deviceGroup.vue
rename to src/cool/modules/hntask/views/immediate_task.vue
index b3bdba1..af120c9 100644
--- a/src/cool/modules/deviceGroup/views/deviceGroup.vue
+++ b/src/cool/modules/hntask/views/immediate_task.vue
@@ -45,8 +45,8 @@
const upsert = reactive<Upsert>({
items: [
{
- label: "鍚嶇О",
- prop: "name",
+ label: "閫昏緫ID",
+ prop: "logic_ids",
component: {
name: "el-input"
},
@@ -54,60 +54,43 @@
required: true
},
{
- label: "閫昏緫ID",
- prop: "logic_id",
+ label: "浠诲姟鎸囦护",
+ prop: "task_command",
component: {
name: "el-input"
- },
- required: true
+ }
},
{
- label: "鐗╃悊ID",
- prop: "device_id",
+ label: "浠诲姟鍐呭鎻忚堪",
+ prop: "task_content",
component: {
name: "el-input"
- },
- required: true
+ }
},
{
- label: "璐熻矗浜�",
+ label: "浠诲姟鍙傛暟",
+ prop: "task_params",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ label: "浠诲姟绫诲瀷",
+ prop: "task_type",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ label: "鎿嶄綔浜�",
prop: "operator",
component: {
name: "el-input"
- },
- required: true
- },
- {
- label: "缁忓害",
- prop: "longitude",
- component: {
- name: "el-input"
}
},
{
- label: "绾害",
- prop: "latitude",
- component: {
- name: "el-input"
- }
- },
- {
- label: "楂樺害",
- prop: "altitude",
- component: {
- name: "el-input"
- }
- },
- {
- label: "瀹夎浣嶇疆",
- prop: "location",
- component: {
- name: "el-input"
- }
- },
- {
- label: "鐘舵��",
- prop: "status",
+ label: "璁剧疆鏃堕棿",
+ prop: "operate_time",
component: {
name: "el-input"
}
@@ -115,6 +98,13 @@
{
label: "澶囨敞",
prop: "remark",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ label: "鐘舵��",
+ prop: "status",
component: {
name: "el-input"
}
@@ -135,45 +125,40 @@
sortable: true //鏄惁鎺掑簭鍔熻兘
},
{
- label: "杩愯鐘舵��",
- prop: "status",
- filters: [
- { text: 0, value: 0 },
- { text: 1, value: 1 }
- ]
- // filters:"[{ text: '瀹�', value: '瀹�' }, { text: '鍏徃', value: '鍏徃' }]"
- },
- {
- label: "鍚嶇О",
- prop: "name"
- },
- {
- label: "浣嶇疆",
- prop: "location",
- width: 200
- },
- {
label: "閫昏緫ID",
- prop: "logic_id"
+ prop: "logic_ids"
},
{
- label: "鐗╃悊ID",
- prop: "device_id",
- width: 100
+ label: "浠诲姟鎸囦护",
+ prop: "task_command"
},
{
- label: "缁忓害",
- prop: "longitude",
- width: 150
+ label: "浠诲姟鍐呭鎻忚堪",
+ prop: "task_content"
},
{
- label: "绾害",
- prop: "latitude",
- width: 150
+ label: "浠诲姟鍙傛暟",
+ prop: "task_params"
},
{
- label: "楂樺害",
- prop: "altitude"
+ label: "浠诲姟绫诲瀷",
+ prop: "task_type"
+ },
+ {
+ label: "鎿嶄綔浜�",
+ prop: "operator"
+ },
+ {
+ label: "璁剧疆鏃堕棿",
+ prop: "operate_time"
+ },
+ {
+ label: "澶囨敞",
+ prop: "remark"
+ },
+ {
+ label: "鐘舵��",
+ prop: "status"
},
{
label: "鎿嶄綔",
@@ -185,8 +170,7 @@
// crud 鍔犺浇
function onLoad({ ctx, app }: CrudLoad) {
// 缁戝畾 service
- console.log(service);
- ctx.service(service.business.devicegroup).done();
+ ctx.service(service.business.taskimmediately).done();
app.refresh();
}
diff --git a/src/cool/modules/huaneng/views/index.ts b/src/cool/modules/hntask/views/index.ts
similarity index 100%
rename from src/cool/modules/huaneng/views/index.ts
rename to src/cool/modules/hntask/views/index.ts
diff --git a/src/cool/modules/taskSetting/views/taskSetting.vue b/src/cool/modules/hntask/views/periodic_task.vue
similarity index 67%
rename from src/cool/modules/taskSetting/views/taskSetting.vue
rename to src/cool/modules/hntask/views/periodic_task.vue
index 3bbfbad..1b80c6a 100644
--- a/src/cool/modules/taskSetting/views/taskSetting.vue
+++ b/src/cool/modules/hntask/views/periodic_task.vue
@@ -44,8 +44,45 @@
// 鏂板銆佺紪杈戦厤缃�
const upsert = reactive<Upsert>({
items: [
- // {
- // }
+ {
+ label: "鍛ㄦ湡浠诲姟",
+ prop: "crontab_rule",
+ component: {
+ name: "el-input"
+ },
+ //鏄惁涓哄繀濉」,娉細鎺ュ彛閰嶇疆瀛楁鏃舵病鏈夎缃粯璁ゅ�兼椂锛岄兘闇�瑕侀�夋嫨蹇呭～
+ required: true
+ },
+ {
+ label: "璁惧鍒嗙粍ID",
+ prop: "group_id",
+ component: {
+ name: "el-input"
+ },
+ required: true
+ },
+ {
+ label: "璁剧疆浜�",
+ prop: "operator",
+ component: {
+ name: "el-input"
+ },
+ required: true
+ },
+ {
+ label: "澶囨敞",
+ prop: "remark",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ label: "鐘舵��",
+ prop: "status",
+ component: {
+ name: "el-input"
+ }
+ }
]
});
@@ -53,32 +90,21 @@
const table = reactive<Table>({
columns: [
{
+ type: "selection",
+ align: "center"
+ },
+ {
label: "id",
- prop: "id"
- },
- {
- label: "璁惧鍒嗙粍ID",
- prop: "group_id"
- },
- {
- label: "浠诲姟绫诲瀷",
- prop: "task_type"
+ prop: "id",
+ sortable: true //鏄惁鎺掑簭鍔熻兘
},
{
label: "鍛ㄦ湡浠诲姟",
prop: "crontab_rule"
},
{
- label: "浠诲姟鍐呭鎻忚堪",
- prop: "task_content"
- },
- {
- label: "浠诲姟鍙傛暟",
- prop: "task_params"
- },
- {
- label: "浠诲姟鍛戒护鏍煎紡",
- prop: "task_command"
+ label: "璁惧鍒嗙粍ID",
+ prop: "group_id"
},
{
label: "璁剧疆浜�",
@@ -102,7 +128,7 @@
// crud 鍔犺浇
function onLoad({ ctx, app }: CrudLoad) {
// 缁戝畾 service
- ctx.service(service.taskSetting.taskSetting).done();
+ ctx.service(service.business.periodicsetting).done();
app.refresh();
}
diff --git a/src/cool/modules/huaneng/components/index.ts b/src/cool/modules/huaneng/components/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/huaneng/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/huaneng/directives/index.ts b/src/cool/modules/huaneng/directives/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/huaneng/directives/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/huaneng/service/huaneng.ts b/src/cool/modules/huaneng/service/huaneng.ts
deleted file mode 100644
index 570dd94..0000000
--- a/src/cool/modules/huaneng/service/huaneng.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { BaseService, Service } from "/@/cool";
-
-@Service("huaneng/huaneng")
-class DemoHuaneng extends BaseService { }
-export default DemoHuaneng;
\ No newline at end of file
diff --git a/src/cool/modules/huaneng/service/index.ts b/src/cool/modules/huaneng/service/index.ts
deleted file mode 100644
index acd6c02..0000000
--- a/src/cool/modules/huaneng/service/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import DemoHuaneng from "./huaneng";
-
-export default {
- huaneng: {
- huaneng: new DemoHuaneng()
- }
-};
diff --git a/src/cool/modules/immediateTask/components/index.ts b/src/cool/modules/immediateTask/components/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/immediateTask/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/immediateTask/directives/index.ts b/src/cool/modules/immediateTask/directives/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/immediateTask/directives/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/immediateTask/index.ts b/src/cool/modules/immediateTask/index.ts
deleted file mode 100644
index 08b1faf..0000000
--- a/src/cool/modules/immediateTask/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import components from "./components";
-import directives from "./directives";
-import service from "./service";
-import store from "./store";
-import pages from "./pages";
-import views from "./views";
-
-export default {
- components,
- directives,
- service,
- store,
- pages,
- views
-};
diff --git a/src/cool/modules/immediateTask/pages/index.ts b/src/cool/modules/immediateTask/pages/index.ts
deleted file mode 100644
index d6d1738..0000000
--- a/src/cool/modules/immediateTask/pages/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default [];
diff --git a/src/cool/modules/immediateTask/service/index.ts b/src/cool/modules/immediateTask/service/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/immediateTask/service/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/immediateTask/store/index.ts b/src/cool/modules/immediateTask/store/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/immediateTask/store/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/immediateTask/views/immediateTask.vue b/src/cool/modules/immediateTask/views/immediateTask.vue
deleted file mode 100644
index df0d115..0000000
--- a/src/cool/modules/immediateTask/views/immediateTask.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<template>
- <cl-crud :ref="setRefs('crud')"
- @load="onLoad">
- <el-row type="flex"
- align="middle">
- <!-- 鍒锋柊鎸夐挳 -->
- <cl-refresh-btn />
- <!-- 鏂板鎸夐挳 -->
- <cl-add-btn />
- <!-- 鍒犻櫎鎸夐挳 -->
- <cl-multi-delete-btn />
- <cl-flex1 />
- <!-- 鍏抽敭瀛楁悳绱� -->
- <cl-search-key />
- </el-row>
-
- <el-row>
- <!-- 鏁版嵁琛ㄦ牸 -->
- <cl-table :ref="setRefs('table')"
- v-bind="table" />
- </el-row>
-
- <el-row type="flex">
- <cl-flex1 />
- <!-- 鍒嗛〉鎺т欢 -->
- <cl-pagination />
- </el-row>
-
- <!-- 鏂板銆佺紪杈� -->
- <cl-upsert :ref="setRefs('upsert')"
- v-bind="upsert" />
- </cl-crud>
-</template>
-
-<script lang="ts">
-import { defineComponent, reactive } from "vue";
-import { CrudLoad, Upsert, Table } from "@cool-vue/crud/types";
-import { useCool } from "/@/cool";
-
-export default defineComponent({
- setup() {
- const { refs, setRefs, service } = useCool();
-
- // 鏂板銆佺紪杈戦厤缃�
- const upsert = reactive<Upsert>({
- items: []
- });
-
- // 琛ㄦ牸閰嶇疆
- const table = reactive<Table>({
- columns: []
- });
-
- // crud 鍔犺浇
- function onLoad({ ctx, app }: CrudLoad) {
- // 缁戝畾 service
- ctx.service(service.business.basedeviceinfo).done();
- app.refresh();
- }
-
- return {
- refs,
- setRefs,
- upsert,
- table,
- onLoad
- };
- }
-});
-</script>
diff --git a/src/cool/modules/immediateTask/views/index.ts b/src/cool/modules/immediateTask/views/index.ts
deleted file mode 100644
index d6d1738..0000000
--- a/src/cool/modules/immediateTask/views/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default [];
diff --git a/src/cool/modules/index.ts b/src/cool/modules/index.ts
index 7b2ccd3..b734bdf 100644
--- a/src/cool/modules/index.ts
+++ b/src/cool/modules/index.ts
@@ -17,9 +17,9 @@
}
}
},
- "huaneng",
- "device",
- "deviceGroup",
- "taskSetting",
- "business"
+ "doulunji",//鏂楄疆鏈�
+ "hntask",//浠诲姟
+ "basedevice",//閲囬泦璁惧
+ "metadata",//鍏冩暟鎹�
+ 'alarm',//鍛婅
];
diff --git a/src/cool/modules/colletMeta/components/index.ts b/src/cool/modules/metadata/components/index.ts
similarity index 100%
rename from src/cool/modules/colletMeta/components/index.ts
rename to src/cool/modules/metadata/components/index.ts
diff --git a/src/cool/modules/colletMeta/directives/index.ts b/src/cool/modules/metadata/directives/index.ts
similarity index 100%
rename from src/cool/modules/colletMeta/directives/index.ts
rename to src/cool/modules/metadata/directives/index.ts
diff --git a/src/cool/modules/colletMeta/index.ts b/src/cool/modules/metadata/index.ts
similarity index 100%
rename from src/cool/modules/colletMeta/index.ts
rename to src/cool/modules/metadata/index.ts
diff --git a/src/cool/modules/colletMeta/pages/index.ts b/src/cool/modules/metadata/pages/index.ts
similarity index 100%
rename from src/cool/modules/colletMeta/pages/index.ts
rename to src/cool/modules/metadata/pages/index.ts
diff --git a/src/cool/modules/colletMeta/service/index.ts b/src/cool/modules/metadata/service/index.ts
similarity index 100%
rename from src/cool/modules/colletMeta/service/index.ts
rename to src/cool/modules/metadata/service/index.ts
diff --git a/src/cool/modules/colletMeta/store/index.ts b/src/cool/modules/metadata/store/index.ts
similarity index 100%
rename from src/cool/modules/colletMeta/store/index.ts
rename to src/cool/modules/metadata/store/index.ts
diff --git a/src/cool/modules/colletMeta/views/index.ts b/src/cool/modules/metadata/views/index.ts
similarity index 100%
rename from src/cool/modules/colletMeta/views/index.ts
rename to src/cool/modules/metadata/views/index.ts
diff --git a/src/cool/modules/metadata/views/monitor_metadata.vue b/src/cool/modules/metadata/views/monitor_metadata.vue
new file mode 100644
index 0000000..08a75cb
--- /dev/null
+++ b/src/cool/modules/metadata/views/monitor_metadata.vue
@@ -0,0 +1,209 @@
+<template>
+ <cl-crud :ref="setRefs('crud')"
+ @load="onLoad">
+ <el-row type="flex"
+ align="middle">
+ <!-- 鍒锋柊鎸夐挳 -->
+ <cl-refresh-btn />
+ <!-- 鏂板鎸夐挳 -->
+ <cl-add-btn />
+ <!-- 鍒犻櫎鎸夐挳 -->
+ <cl-multi-delete-btn />
+ <cl-flex1 />
+ <!-- 鍏抽敭瀛楁悳绱� -->
+ <cl-search-key />
+ </el-row>
+
+ <el-row>
+ <!-- 鏁版嵁琛ㄦ牸 -->
+ <cl-table :ref="setRefs('table')"
+ v-bind="table" />
+ </el-row>
+
+ <el-row type="flex">
+ <cl-flex1 />
+ <!-- 鍒嗛〉鎺т欢 -->
+ <cl-pagination />
+ </el-row>
+
+ <!-- 鏂板銆佺紪杈� -->
+ <cl-upsert :ref="setRefs('upsert')"
+ v-bind="upsert" />
+ </cl-crud>
+</template>
+
+<script lang="ts">
+import { defineComponent, reactive } from "vue";
+import { CrudLoad, Upsert, Table } from "@cool-vue/crud/types";
+import { useCool } from "/@/cool";
+
+export default defineComponent({
+ setup() {
+ const { refs, setRefs, service } = useCool();
+
+ // 鏂板銆佺紪杈戦厤缃�
+ const upsert = reactive<Upsert>({
+ items: [
+ {
+ prop: "is_periodic",
+ value: 1,
+ label: "浠诲姟绫诲瀷",
+ span: 24,
+ component: {
+ name: "el-radio-group",
+ options: [
+ {
+ label: "鍗虫椂浠诲姟",
+ value: 0
+ },
+ {
+ label: "鍛ㄦ湡浠诲姟",
+ value: 1
+ }
+ ]
+ }
+ },
+ {
+ label: "鏁版嵁鍐呭",
+ prop: "data_content",
+ component: {
+ name: "el-input"
+ },
+ //鏄惁涓哄繀濉」,娉細鎺ュ彛閰嶇疆瀛楁鏃舵病鏈夎缃粯璁ゅ�兼椂锛岄兘闇�瑕侀�夋嫨蹇呭～
+ required: true
+ },
+ {
+ label: "澶囨敞",
+ prop: "remark",
+ component: {
+ name: "el-input"
+ }
+ },
+ {
+ prop: "status",
+ label: "鐘舵��",
+ value: 1,
+ component: {
+ name: "el-radio-group",
+ options: [
+ {
+ label: "鍚敤",
+ value: 1
+ },
+ {
+ label: "鍏抽棴",
+ value: 0
+ }
+ ]
+ }
+ }
+ ]
+ });
+
+ // 琛ㄦ牸閰嶇疆
+ const table = reactive<Table>({
+ columns: [
+ {
+ type: "selection",
+ align: "center"
+ },
+ {
+ label: "id",
+ prop: "id",
+ sortable: true //鏄惁鎺掑簭鍔熻兘
+ },
+ {
+ label: "浠诲姟ID",
+ prop: "task_id"
+ },
+ {
+ label: "浠诲姟绫诲瀷",
+ prop: "is_periodic",
+ dict: [
+ {
+ label: "鍛ㄦ湡浠诲姟",
+ value: 1,
+ type: "info" //success warning danger info鍙��
+ },
+ {
+ label: "鍗虫椂浠诲姟",
+ value: 0
+ }
+ ],
+ filters: [
+ {
+ text: "鍛ㄦ湡浠诲姟",
+ value: 1
+ },
+ {
+ text: "鍗虫椂浠诲姟",
+ value: 0
+ }
+ ],
+ width: 100
+ },
+ {
+ label: "鐩戞祴璁板綍ID",
+ prop: "task_monitor_id",
+ width: 200
+ },
+ {
+ label: "鏁版嵁鍐呭",
+ prop: "data_content"
+ },
+ {
+ label: "鏁版嵁瀛樺偍璺緞",
+ prop: "data_path",
+ width: 150
+ },
+ {
+ label: "澶囨敞",
+ prop: "remark"
+ },
+ {
+ prop: "status",
+ label: "鐘舵��",
+ minWidth: 120,
+ dict: [
+ {
+ label: "鍚敤",
+ value: 1,
+ type: "success"
+ },
+ {
+ label: "绂佺敤",
+ value: 0,
+ type: "danger"
+ }
+ ]
+ },
+ {
+ label: "鎿嶄綔",
+ type: "op"
+ }
+ ]
+ });
+
+ // crud 鍔犺浇
+ function onLoad({ ctx, app }: CrudLoad) {
+ // 缁戝畾 service
+ console.log(ctx);
+ ctx.service(service.business.colletdata).done();
+
+ app.refresh();
+ }
+ function filterHandler(value: any, row: any, column: any) {
+ const property = column["property"];
+ return row[property] === value;
+ }
+
+ return {
+ refs,
+ setRefs,
+ upsert,
+ table,
+ onLoad
+ };
+ }
+});
+</script>
diff --git a/src/cool/modules/periodictask/components/index.ts b/src/cool/modules/periodictask/components/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/periodictask/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/periodictask/directives/index.ts b/src/cool/modules/periodictask/directives/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/periodictask/directives/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/periodictask/index.ts b/src/cool/modules/periodictask/index.ts
deleted file mode 100644
index 08b1faf..0000000
--- a/src/cool/modules/periodictask/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import components from "./components";
-import directives from "./directives";
-import service from "./service";
-import store from "./store";
-import pages from "./pages";
-import views from "./views";
-
-export default {
- components,
- directives,
- service,
- store,
- pages,
- views
-};
diff --git a/src/cool/modules/periodictask/pages/index.ts b/src/cool/modules/periodictask/pages/index.ts
deleted file mode 100644
index d6d1738..0000000
--- a/src/cool/modules/periodictask/pages/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default [];
diff --git a/src/cool/modules/periodictask/service/index.ts b/src/cool/modules/periodictask/service/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/periodictask/service/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/periodictask/store/index.ts b/src/cool/modules/periodictask/store/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/periodictask/store/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/periodictask/views/index.ts b/src/cool/modules/periodictask/views/index.ts
deleted file mode 100644
index d6d1738..0000000
--- a/src/cool/modules/periodictask/views/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default [];
diff --git a/src/cool/modules/periodictask/views/periodictask.vue b/src/cool/modules/periodictask/views/periodictask.vue
deleted file mode 100644
index f915001..0000000
--- a/src/cool/modules/periodictask/views/periodictask.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
- <h1>鍛ㄦ湡浠诲姟</h1>
-</template>
\ No newline at end of file
diff --git a/src/cool/modules/taskSetting/components/index.ts b/src/cool/modules/taskSetting/components/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/taskSetting/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/taskSetting/directives/index.ts b/src/cool/modules/taskSetting/directives/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/taskSetting/directives/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/taskSetting/index.ts b/src/cool/modules/taskSetting/index.ts
deleted file mode 100644
index 08b1faf..0000000
--- a/src/cool/modules/taskSetting/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import components from "./components";
-import directives from "./directives";
-import service from "./service";
-import store from "./store";
-import pages from "./pages";
-import views from "./views";
-
-export default {
- components,
- directives,
- service,
- store,
- pages,
- views
-};
diff --git a/src/cool/modules/taskSetting/pages/index.ts b/src/cool/modules/taskSetting/pages/index.ts
deleted file mode 100644
index d6d1738..0000000
--- a/src/cool/modules/taskSetting/pages/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default [];
diff --git a/src/cool/modules/taskSetting/service/index.ts b/src/cool/modules/taskSetting/service/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/taskSetting/service/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/taskSetting/store/index.ts b/src/cool/modules/taskSetting/store/index.ts
deleted file mode 100644
index ff8b4c5..0000000
--- a/src/cool/modules/taskSetting/store/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default {};
diff --git a/src/cool/modules/taskSetting/views/index.ts b/src/cool/modules/taskSetting/views/index.ts
deleted file mode 100644
index d6d1738..0000000
--- a/src/cool/modules/taskSetting/views/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default [];
diff --git a/src/cool/modules/userInfo/views/userInfo.vue b/src/cool/modules/userInfo/views/userInfo.vue
index a3d8511..df0d115 100644
--- a/src/cool/modules/userInfo/views/userInfo.vue
+++ b/src/cool/modules/userInfo/views/userInfo.vue
@@ -1,5 +1,70 @@
<template>
- <div>
- 鐢ㄦ埛绠＄悊椤甸潰
- </div>
-</template>
\ No newline at end of file
+ <cl-crud :ref="setRefs('crud')"
+ @load="onLoad">
+ <el-row type="flex"
+ align="middle">
+ <!-- 鍒锋柊鎸夐挳 -->
+ <cl-refresh-btn />
+ <!-- 鏂板鎸夐挳 -->
+ <cl-add-btn />
+ <!-- 鍒犻櫎鎸夐挳 -->
+ <cl-multi-delete-btn />
+ <cl-flex1 />
+ <!-- 鍏抽敭瀛楁悳绱� -->
+ <cl-search-key />
+ </el-row>
+
+ <el-row>
+ <!-- 鏁版嵁琛ㄦ牸 -->
+ <cl-table :ref="setRefs('table')"
+ v-bind="table" />
+ </el-row>
+
+ <el-row type="flex">
+ <cl-flex1 />
+ <!-- 鍒嗛〉鎺т欢 -->
+ <cl-pagination />
+ </el-row>
+
+ <!-- 鏂板銆佺紪杈� -->
+ <cl-upsert :ref="setRefs('upsert')"
+ v-bind="upsert" />
+ </cl-crud>
+</template>
+
+<script lang="ts">
+import { defineComponent, reactive } from "vue";
+import { CrudLoad, Upsert, Table } from "@cool-vue/crud/types";
+import { useCool } from "/@/cool";
+
+export default defineComponent({
+ setup() {
+ const { refs, setRefs, service } = useCool();
+
+ // 鏂板銆佺紪杈戦厤缃�
+ const upsert = reactive<Upsert>({
+ items: []
+ });
+
+ // 琛ㄦ牸閰嶇疆
+ const table = reactive<Table>({
+ columns: []
+ });
+
+ // crud 鍔犺浇
+ function onLoad({ ctx, app }: CrudLoad) {
+ // 缁戝畾 service
+ ctx.service(service.business.basedeviceinfo).done();
+ app.refresh();
+ }
+
+ return {
+ refs,
+ setRefs,
+ upsert,
+ table,
+ onLoad
+ };
+ }
+});
+</script>
--
Gitblit v1.9.1