From 0f0600f031443565a6bd9e6d773379e2548f97a9 Mon Sep 17 00:00:00 2001
From: mengyxu <kekeningxiaobai@sina.com>
Date: Fri, 15 Mar 2024 17:29:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                       |  2 +-
 packages/echarts/line/smoothed.vue | 79 ++++++++++++++++++++++++++
 packages/manage/views/config.vue   | 71 ++++++++++++++++++++++-
 plugs/api/base.ts                  | 88 +++++++++++++++++++++++++++++
 plugs/api/buffer.ts                | 46 ++-------------
 plugs/api/config.ts                |  9 +++
 plugs/api/dictionary.ts            | 50 ++--------------
 plugs/api/index.ts                 |  1 +
 plugs/api/log.ts                   | 19 +------
 plugs/api/permission.ts            | 77 ++-----------------------
 plugs/api/role.ts                  | 77 ++-----------------------
 plugs/api/user.ts                  | 91 +++---------------------------
 plugs/i18n/en.ts                   |  6 ++
 plugs/i18n/zh.ts                   |  5 ++
 14 files changed, 289 insertions(+), 332 deletions(-)
 create mode 100644 packages/echarts/line/smoothed.vue
 create mode 100644 plugs/api/base.ts
 create mode 100644 plugs/api/config.ts

diff --git a/package.json b/package.json
index d7cfacd..5dff08f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "noob-mengyxu",
-    "version": "0.3.1",
+    "version": "0.3.2",
     "main": "index.ts",
     "module": "index.ts",
     "keywords": [
diff --git a/packages/echarts/line/smoothed.vue b/packages/echarts/line/smoothed.vue
new file mode 100644
index 0000000..93aaf22
--- /dev/null
+++ b/packages/echarts/line/smoothed.vue
@@ -0,0 +1,79 @@
+<template></template>
+
+<script lang="ts" setup>
+import { useStore } from "vuex";
+import { get, post, put, delate } from "@/config/axios";
+import { reactive, onMounted, ref } from "vue";
+
+const { state, commit, dispatch } = useStore();
+
+const prop = defineProps({
+    title: {
+        type: String,
+        default: 'Smoothed Line'
+    },
+    name: {
+        type: String
+    },
+    xAxis: {
+        type: Array,
+        default: []
+    },
+    data: {
+        type: Array,
+        default: []
+    },
+    markLine: {
+        type: String
+    },
+    unit: {
+        type: String
+    }
+})
+
+const options = {
+    title: {
+        text: "",//标题
+        left: "center"
+    },
+    tooltip: {
+        trigger: "axis",
+        formatter: '{b}' + '<br>' +
+            '<span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:#5470c6"></span>'
+            + '<span style="float:right;margin-left:10px;font-size:14px;color:#666;font-weight:900"/>' + '{c}' + '次'
+    },
+    xAxis: {
+        type: "category",
+        data: []
+    },
+    yAxis: {
+        type: "value"
+    },
+    series: [
+        {
+            data: [],
+            type: "line",
+            smooth: true,
+            markLine: {
+                symbol: 'none', //['none']表示是一条横线；['arrow', 'none']表示线的左边是箭头，右边没右箭头；['none','arrow']表示线的左边没有箭头，右边有箭头
+                label: {
+                    position: "end" //将警示值放在哪个位置，三个值“start”,"middle","end" 开始 中点 结束
+                },
+                data: [{
+                    silent: false, //鼠标悬停事件 true没有，false有
+                    lineStyle: { //警戒线的样式 ，虚实 颜色
+                        type: "solid", //样式  ‘solid’和'dotted'
+                        color: "#FA3934"
+                    },
+                    yAxis: 22 // 警戒线的标注值，可以有多个yAxis,多条警示线 或者采用 {type : 'average', name: '平均值'}，type值有 max min average，分为最大，最小，平均值
+                }]
+            }
+        },
+    ],
+};
+
+onMounted(() => { });
+</script>
+<style lang="scss" scoped>
+//@import url(); 引入公共css类
+</style>
\ No newline at end of file
diff --git a/packages/manage/views/config.vue b/packages/manage/views/config.vue
index 9bd2fc0..cd859e7 100644
--- a/packages/manage/views/config.vue
+++ b/packages/manage/views/config.vue
@@ -1,14 +1,79 @@
 <template>
+    <SearchRow :title="t('config.title')" :del="false" :add="false" @query="query"></SearchRow>
+
+    <ListTable @query="query" :props="props" :example="example" :page="true" :data="result">
+        <template #action="{ row }">
+            <TableAction @modify="modify(row)" :del="false">
+            </TableAction>
+        </template>
+    </ListTable>
+
+    <el-dialog :title="t('base.modify') + t('config.name')" v-model="flag.modify" :close-on-click-modal="false"
+        top="15vh" width="40%" @keydown.enter.native="confirm">
+        <ModifyForm ref="form" :param="config" :rules="rules" :items="items" @confirm="confirm" :width="100"
+            @cancel="flag.modify = false">
+        </ModifyForm>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup>
 import { useStore } from "vuex";
 import { reactive, onMounted, ref } from "vue";
+import { Api, ListTable, SearchRow, NoobInput, TableAction, NoobSelect, NoobButton, ModifyForm, Element, PageResult, PageExample } from "noob-mengyxu";
+import { useI18n } from "vue3-i18n";
+const { t } = useI18n();
 
 const { state, commit, dispatch } = useStore();
+const { list, set } = Api.config;
+const { SimpleRequired } = Element;
+const result = ref(new PageResult());
+const example = reactive<any>(new PageExample());
+const flag = reactive({
+    modify: false,
+})
+const form = ref();
+const config = ref<any>();
+
+const props = [
+    { i18n: 'config.prop.0', code: 'cfgKey', width: 120 },
+    { i18n: 'config.prop.1', code: 'cfgName', width: 120 },
+    { i18n: 'config.prop.2', code: 'cfgValue', width: 120 },
+    { i18n: 'config.prop.3', code: 'cfgType', width: 120 },
+    { i18n: 'config.prop.4', code: 'cfgDesc', width: 180 },
+    { i18n: 'config.prop.5', code: 'cfgStatus', width: 180, dict: 'active_status' },
+    { i18n: 'config.prop.6', code: 'updateTime', width: 180 },
+    { i18n: 'config.prop.7', code: 'updateUser', width: 180, },
+    { i18n: 'config.prop.8', code: 'action', slot: true, width: 120, fixed: 'right' }
+]
+
+const rules = {
+    cfgValue: [new SimpleRequired('config.prop.2')]
+}
+
+const items = [
+    { i18n: 'config.prop.2', code: 'cfgValue' },
+];
+
+const query = () => {
+    flag.modify = false;
+    list(example).then((rsp: any) => result.value = rsp)
+}
+
+
+const modify = row => {
+    config.value = JSON.parse(JSON.stringify(row))
+    form.value?.clearValidate();
+    flag.modify = true;
+}
+
+const confirm = () => {
+    set(config.value).then(query)
+}
 
-onMounted(() => {});
+onMounted(() => {
+    query();
+    dispatch("getDictMap", ['active_status'])
+});
 </script>
 <style lang="scss" scoped>
-//@import url(); 引入公共css类
-</style>
\ No newline at end of file
+//@import url(); 引入公共css类</style>
\ No newline at end of file
diff --git a/plugs/api/base.ts b/plugs/api/base.ts
new file mode 100644
index 0000000..4f71469
--- /dev/null
+++ b/plugs/api/base.ts
@@ -0,0 +1,88 @@
+import { get, post, put, delate } from '../http/axios';
+import { PageResult } from '../constant';
+const pageResult = new PageResult();
+
+export const queryPage = (url, example) => {
+  return new Promise((resolve, reject) => {
+    get(url, example).then(
+      (rsp: any) => {
+        if (rsp) {
+          resolve(rsp);
+        } else {
+          resolve(pageResult);
+        }
+      },
+      (err) => {
+        resolve(pageResult);
+      }
+    );
+  });
+};
+
+export const queryList = (url, example?) => {
+  return new Promise((resolve, reject) => {
+    get(url, example).then(
+      (rsp: any) => {
+        if (rsp) {
+          resolve(rsp);
+        } else {
+          resolve([]);
+        }
+      },
+      (err) => {
+        resolve([]);
+      }
+    );
+  });
+};
+
+export const save = (url, role) => {
+  return new Promise((resolve, reject) => {
+    post(url, role).then(
+      (rsp: any) => {
+        if (rsp) {
+          resolve(rsp);
+        } else {
+          resolve(false);
+        }
+      },
+      (err) => {
+        resolve(false);
+      }
+    );
+  });
+};
+
+export const update = (url, role) => {
+  return new Promise((resolve, reject) => {
+    put(url, role).then(
+      (rsp: any) => {
+        if (rsp) {
+          resolve(rsp);
+        } else {
+          resolve(false);
+        }
+      },
+      (err) => {
+        resolve(false);
+      }
+    );
+  });
+};
+
+export const deleteById = (url, id) => {
+  return new Promise((resolve, reject) => {
+    delate(url + '/' + id).then(
+      (rsp: any) => {
+        if (rsp) {
+          resolve(rsp);
+        } else {
+          resolve(false);
+        }
+      },
+      (err) => {
+        resolve(false);
+      }
+    );
+  });
+};
diff --git a/plugs/api/buffer.ts b/plugs/api/buffer.ts
index e4fe622..ca02bf9 100644
--- a/plugs/api/buffer.ts
+++ b/plugs/api/buffer.ts
@@ -1,21 +1,9 @@
-import { get, post, put, delate } from '../http/axios';
-const root = 'memory/buffer';
+import { delate } from '../http/axios';
+import { queryList, update, deleteById } from './base';
+const root = 'buffer';
 
 export const list = () => {
-  return new Promise((resolve, reject) => {
-    get(root).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve([]);
-        }
-      },
-      (err) => {
-        resolve([]);
-      }
-    );
-  });
+  return queryList(root);
 };
 
 export const clean = () => {
@@ -36,31 +24,9 @@ export const clean = () => {
 };
 
 export const set = (buffer) => {
-  return new Promise((resolve, reject) => {
-    put(root, buffer).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        }
-      },
-      (err) => {}
-    );
-  });
+  return update(root, buffer);
 };
 
 export const del = (buffer) => {
-  return new Promise((resolve, reject) => {
-    delate(root + '/' + buffer.key).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return deleteById(root, buffer.key);
 };
diff --git a/plugs/api/config.ts b/plugs/api/config.ts
new file mode 100644
index 0000000..fb761d2
--- /dev/null
+++ b/plugs/api/config.ts
@@ -0,0 +1,9 @@
+import { queryPage, update } from './base';
+const root = 'config';
+export const list = (example) => {
+  return queryPage(root, example);
+};
+
+export const set = (config) => {
+  return update(root, config);
+};
diff --git a/plugs/api/dictionary.ts b/plugs/api/dictionary.ts
index c5c274c..91141ce 100644
--- a/plugs/api/dictionary.ts
+++ b/plugs/api/dictionary.ts
@@ -1,57 +1,17 @@
-import { get, post, put, delate } from '../http/axios';
-import { PageResult } from '../constant';
-const pageResult = new PageResult();
+import { delate } from '../http/axios';
+import { queryPage, save, update } from './base';
 const root = 'dict';
 
 export const list = (example) => {
-  return new Promise((resolve, reject) => {
-    get(root, example).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(pageResult);
-        }
-      },
-      (err) => {
-        resolve(pageResult);
-      }
-    );
-  });
+  return queryPage(root, example);
 };
 
 export const add = (dictionary) => {
-  return new Promise((resolve, reject) => {
-    post(root, dictionary).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return save(root, dictionary);
 };
 
 export const set = (dictionary) => {
-  return new Promise((resolve, reject) => {
-    put(root, dictionary).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return update(root, dictionary);
 };
 
 export const del = (dictionary) => {
diff --git a/plugs/api/index.ts b/plugs/api/index.ts
index a82dc26..5b3b3a7 100644
--- a/plugs/api/index.ts
+++ b/plugs/api/index.ts
@@ -4,4 +4,5 @@ export * as permission from './permission';
 export * as role from './role';
 export * as user from './user';
 export * as buffer from './buffer';
+export * as config from './config';
 export * as pub from './public';
diff --git a/plugs/api/log.ts b/plugs/api/log.ts
index 99ba7e6..dc83e38 100644
--- a/plugs/api/log.ts
+++ b/plugs/api/log.ts
@@ -1,20 +1,5 @@
-import { get } from '../http/axios';
-import { PageResult } from '../constant';
-const pageResult = new PageResult();
+import { queryPage } from './base';
 const root = 'log/action';
 export const list = (example) => {
-  return new Promise((resolve, reject) => {
-    get(root, example).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(pageResult);
-        }
-      },
-      (err) => {
-        resolve(pageResult);
-      }
-    );
-  });
+  return queryPage(root, example);
 };
diff --git a/plugs/api/permission.ts b/plugs/api/permission.ts
index 191e333..a196d8f 100644
--- a/plugs/api/permission.ts
+++ b/plugs/api/permission.ts
@@ -1,88 +1,23 @@
-import { get, post, put, delate } from '../http/axios';
+import { queryList, save, update, deleteById } from './base';
 const root = 'permission';
 const publik = 'public/permission';
 
 export const list = (example) => {
-  return new Promise((resolve, reject) => {
-    get(root, example).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve([]);
-        }
-      },
-      (err) => {
-        resolve([]);
-      }
-    );
-  });
+  return queryList(root, example);
 };
 
 export const add = (permission) => {
-  return new Promise((resolve, reject) => {
-    post(root, permission).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return save(root, permission);
 };
 
 export const set = (permission) => {
-  return new Promise((resolve, reject) => {
-    put(root, permission).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return update(root, permission);
 };
 
 export const del = (permission) => {
-  return new Promise((resolve, reject) => {
-    delate(root + '/' + permission.id).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return deleteById(root, permission.id);
 };
 
 export const tree = () => {
-  return new Promise((resolve, reject) => {
-    get(publik).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve([]);
-        }
-      },
-      (err) => {
-        resolve([]);
-      }
-    );
-  });
+  return queryList(publik);
 };
diff --git a/plugs/api/role.ts b/plugs/api/role.ts
index 02ffb8e..25be1ed 100644
--- a/plugs/api/role.ts
+++ b/plugs/api/role.ts
@@ -1,88 +1,23 @@
-import { get, post, put, delate } from '../http/axios';
+import { queryList, save, update, deleteById } from './base';
 const root = 'role';
 const publik = 'public/roles';
 
 export const list = (example) => {
-  return new Promise((resolve, reject) => {
-    get(root, example).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve([]);
-        }
-      },
-      (err) => {
-        resolve([]);
-      }
-    );
-  });
+  return queryList(root, example);
 };
 
 export const mapping = () => {
-  return new Promise((resolve, reject) => {
-    get(publik).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve([]);
-        }
-      },
-      (err) => {
-        resolve([]);
-      }
-    );
-  });
+  return queryList(publik);
 };
 
 export const add = (role) => {
-  return new Promise((resolve, reject) => {
-    post(root, role).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return save(root, role);
 };
 
 export const set = (role) => {
-  return new Promise((resolve, reject) => {
-    put(root, role).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return update(root, role);
 };
 
 export const del = (role) => {
-  return new Promise((resolve, reject) => {
-    delate(root + '/' + role.roleCode).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return deleteById(root, role.roleCode);
 };
diff --git a/plugs/api/user.ts b/plugs/api/user.ts
index b82cb0d..86a0531 100644
--- a/plugs/api/user.ts
+++ b/plugs/api/user.ts
@@ -1,105 +1,28 @@
 import { get, post, put, delate } from '../http/axios';
+import { queryList, save, update, deleteById } from './base';
 const root = 'user';
 const pwdUrl = 'user/password';
 
 export const list = (example) => {
-  return new Promise((resolve, reject) => {
-    get(root, example).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve([]);
-        }
-      },
-      (err) => {
-        resolve([]);
-      }
-    );
-  });
+  return queryList(root, example);
 };
 
 export const add = (user) => {
-  return new Promise((resolve, reject) => {
-    post(root, user).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return save(root, user);
 };
 
 export const updatePwd = (pwd) => {
-  return new Promise((resolve, reject) => {
-    put(pwdUrl, pwd).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return update(pwdUrl, pwd);
 };
 
 export const set = (user) => {
-  return new Promise((resolve, reject) => {
-    put(root, user).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return update(root, user);
 };
 
 export const del = (user) => {
-  return new Promise((resolve, reject) => {
-    delate(root + '/' + user.userId).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return deleteById(root, user.userId);
 };
 
 export const reset = (user) => {
-  return new Promise((resolve, reject) => {
-    put(root + '/' + user.userId).then(
-      (rsp: any) => {
-        if (rsp) {
-          resolve(rsp);
-        } else {
-          resolve(false);
-        }
-      },
-      (err) => {
-        resolve(false);
-      }
-    );
-  });
+  return update(root + '/' + user.userId, {});
 };
diff --git a/plugs/i18n/en.ts b/plugs/i18n/en.ts
index 87ee934..a660171 100644
--- a/plugs/i18n/en.ts
+++ b/plugs/i18n/en.ts
@@ -142,4 +142,10 @@ export default class English {
     delete: ['Are you sure you want to delete this cache?', 'Tips'],
     delay: ['Please enter an expiration time(yyyy-MM-dd HH:mm:ss)', 'Modify'],
   };
+
+  config = {
+    title: 'Config manage',
+    name: 'config',
+    prop: ['Key', 'Name', 'Value', 'Type', 'Descript', 'Status', 'Last Time', 'Last User', 'Action'],
+  };
 }
diff --git a/plugs/i18n/zh.ts b/plugs/i18n/zh.ts
index 29807fe..368aefb 100644
--- a/plugs/i18n/zh.ts
+++ b/plugs/i18n/zh.ts
@@ -138,4 +138,9 @@ export default class Zh {
     delete: ['确定要删除此条缓存吗？', '提示'],
     delay: ['请输入失效时间(yyyy-MM-dd HH:mm:ss)', '修改'],
   };
+  config = {
+    title: '配置管理',
+    name: '配置',
+    prop: ['配置编码', '配置名称', '配置值', '配置类型', '配置描述', '配置状态', '最后修改时间', '最后修改用户', '操作'],
+  };
 }