From 985f239d5f93ee847f195614b4891b8965231ed2 Mon Sep 17 00:00:00 2001
From: "chenxiaofeng@yzbdl.ac.cn" <chenxiaofeng@yzbdl.ac.cn>
Date: Thu, 18 Aug 2022 09:54:50 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/pagination.vue          | 110 ++++
 .../Admin/SystemManagement/User/User.vue      |   2 +-
 .../User/components/operation.vue             | 144 +++++
 src/views/SystemManage/Log/Log.vue            |   2 +-
 src/views/SystemManage/Log/log.vue            | 164 +++++
 .../UserManage/components/operation.vue       | 225 +++++++
 .../TaskArrangement/components/operation.vue  | 589 ++++++++++++++++++
 .../TaskResources/components/operation.vue    | 378 +++++++++++
 8 files changed, 1612 insertions(+), 2 deletions(-)
 create mode 100644 src/components/common/pagination.vue
 create mode 100644 src/views/Admin/SystemManagement/User/components/operation.vue
 create mode 100644 src/views/SystemManage/Log/log.vue
 create mode 100644 src/views/SystemManage/UserManage/components/operation.vue
 create mode 100644 src/views/TaskSchedule/TaskArrangement/components/operation.vue
 create mode 100644 src/views/TaskSchedule/TaskResources/components/operation.vue

diff --git a/src/components/common/pagination.vue b/src/components/common/pagination.vue
new file mode 100644
index 0000000..b868dfa
--- /dev/null
+++ b/src/components/common/pagination.vue
@@ -0,0 +1,110 @@
+<!-- Copyright (c) 2022 渝州大数据实验室
+ *
+ * Lanius is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *
+ *     http://license.coscl.org.cn/MulanPSL2
+ *
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ -->
+<!-- 
+* @desc:日志分页公共组件
+* @fileName:LogsPagination.vue
+* @author:chenxiaofeng@yzbdl.ac.cn
+* @date:2022-4-7
+!-->
+<script setup lang="ts">
+import { ref } from "vue";
+import zhCn from "element-plus/lib/locale/lang/zh-cn";
+const props = defineProps({
+  // 当前分页页面传递
+  getCurrentPageNumber: Function,
+  // 每页显示条数
+  pageSize: {
+    type: Number,
+    default: 10,
+  },
+  // 总数
+  total: {
+    type: Number,
+    default: 100,
+  },
+});
+// 选中页数
+const currentPage = ref(1);
+
+//定义中文zh-cn
+const locale = zhCn;
+
+/**
+ * 改变每页条数方法
+ * @param pageNumber 每页显示条数
+ * @reture viod
+ */
+const handleSizeChange = (pageNumber: number) => {
+  console.log(`${pageNumber} items per page`);
+};
+
+/**
+ * 选中页码方法
+ * @param pageNumber 每页显示条数
+ * @reture viod
+ */
+const handleCurrentChange = (pageNumber: number) => {
+  props.getCurrentPageNumber?.(pageNumber);
+};
+</script>
+
+<template>
+  <!-- 分页 -->
+  <div class="page-pagination">
+    <el-config-provider :locale="locale">
+      <el-pagination
+        v-model:currentPage="currentPage"
+        background
+        :page-size="props.pageSize"
+        layout="prev, pager, next, total"
+        :total="props.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        prev-text="上一页"
+        next-text="下一页"
+      />
+    </el-config-provider>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.page-pagination {
+  margin-top: 15px;
+  display: flex;
+  justify-content: end;
+  :deep(.number) {
+    padding: 0 !important;
+    background-color: unset !important;
+  }
+  :deep(.btn-prev) {
+    color: #000;
+    padding: 0 10px;
+    background-color: #f2f2f6 !important;
+    border-radius: 2px;
+  }
+  :deep(.btn-next) {
+    color: #000;
+    background-color: #f2f2f6 !important;
+    border-radius: 2px;
+    padding: 0 10px;
+  }
+  :deep(.el-pagination__total) {
+    margin-left: 10px;
+  }
+  :deep(.more) {
+    background-color: unset !important;
+  }
+}
+:deep(.number.is-active) {
+  background-color: #5473e6 !important;
+}
+</style>
diff --git a/src/views/Admin/SystemManagement/User/User.vue b/src/views/Admin/SystemManagement/User/User.vue
index 235d56e..6e46327 100644
--- a/src/views/Admin/SystemManagement/User/User.vue
+++ b/src/views/Admin/SystemManagement/User/User.vue
@@ -21,7 +21,7 @@ import { ElMessage } from "element-plus";
 import UserSearch from "./components/user-search.vue";
 import UserDetails from "./components/user-details.vue";
 import UserPagination from "@/components/common/pagination.vue";
-import OperationDialog from "./components/Operation.vue";
+import OperationDialog from "./components/operation.vue";
 import { getCurrentInstance } from "vue";
 const { proxy } = getCurrentInstance() as any;
 
diff --git a/src/views/Admin/SystemManagement/User/components/operation.vue b/src/views/Admin/SystemManagement/User/components/operation.vue
new file mode 100644
index 0000000..5e81e36
--- /dev/null
+++ b/src/views/Admin/SystemManagement/User/components/operation.vue
@@ -0,0 +1,144 @@
+<!-- Copyright (c) 2022 渝州大数据实验室
+ *
+ * Lanius is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *
+ *     http://license.coscl.org.cn/MulanPSL2
+ *
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+-->
+<!-- 
+* @desc:任务编排新增弹窗
+* @fileName:Operation.vue
+* @author:chenxiaofeng@yzbdl.ac.cn
+* @date:2022-4-15
+!-->
+<script setup lang="ts">
+import { reactive, ref } from "vue";
+import type { FormInstance } from "element-plus";
+import { checkPassword } from "../../../../../services/common/tool";
+// 接受父组件传回
+const props = defineProps({
+  // 角色下拉下拉值
+  roleList: Array as any,
+  saveUser: Function as any,
+  oneUserInfo: Object,
+});
+
+const formSize: any = ref("default");
+const ruleFormRef = ref<FormInstance>();
+const ruleForm = reactive({
+  userName: "",
+  password: "",
+});
+const labelPosition = ref("top");
+
+/**
+ * 密码验证正则
+ */
+const validatePass = (rule: any, value: any, callback: any) => {
+  if (value === "") {
+    callback(new Error("请输入密码"));
+  } else if (!checkPassword(value)) {
+    callback(
+      new Error("密码必须包含英文大小写，数字，特殊字符，字符数量为6-20位")
+    );
+  } else {
+    callback();
+  }
+};
+
+/**
+ * 定义校验规则
+ */
+const rules = reactive({
+  userName: [{ required: true, message: "请输入用户账号", trigger: "blur" }],
+  password: [{ validator: validatePass, required: true, trigger: "blur" }],
+});
+
+/**
+ * 提交表单
+ * @reture viod
+ */
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      let saveObj = {
+        password: ruleForm.password,
+        userName: ruleForm.userName,
+      };
+      props.saveUser(saveObj);
+    } else {
+      console.log("error submit!", fields);
+    }
+  });
+};
+</script>
+
+<template>
+  <div class="operation">
+    <el-form
+      ref="ruleFormRef"
+      :model="ruleForm"
+      :rules="rules"
+      :label-position="labelPosition"
+      label-width="120px"
+      class="demo-ruleForm"
+      :size="formSize"
+    >
+      <el-form-item label="用户账号" prop="userName">
+        <el-input
+          v-model="ruleForm.userName"
+          size="large"
+          placeholder="请输入用户账号"
+        />
+      </el-form-item>
+      <el-form-item label="账号密码" prop="password">
+        <el-input
+          v-model="ruleForm.password"
+          type="password"
+          size="large"
+          placeholder="请输入账号密码"
+        />
+      </el-form-item>
+      <el-form-item class="ClickButton">
+        <el-button @click="submitForm(ruleFormRef)">确定</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<style scoped lang="scss">
+:deep(.el-form-item__label) {
+  font-family: PingFang SC;
+  font-weight: 700;
+  color: #000000;
+  font-size: 14px;
+}
+:deep(.el-input) {
+  height: 40px;
+  background-color: #ffffff;
+}
+:deep(.el-textarea) {
+  height: 100px;
+  background-color: #ffffff;
+  .el-textarea__inner {
+    height: 100px;
+  }
+}
+.ClickButton {
+  :deep(.el-form-item__content) {
+    display: flex;
+    justify-content: flex-end;
+    .el-button {
+      height: 40px;
+      background-color: #ffffff;
+      border: 1px solid;
+      border-color: #cccccc;
+    }
+  }
+}
+</style>
diff --git a/src/views/SystemManage/Log/Log.vue b/src/views/SystemManage/Log/Log.vue
index 8b13f93..2d52190 100644
--- a/src/views/SystemManage/Log/Log.vue
+++ b/src/views/SystemManage/Log/Log.vue
@@ -19,7 +19,7 @@
 import { onMounted, reactive, getCurrentInstance } from "vue";
 import LogSearch from "./components/log-search.vue";
 import LogDetails from "./components/log-details.vue";
-import LogPagination from "@/components/common/Pagination.vue";
+import LogPagination from "@/components/common/pagination.vue";
 import { showErrorMessage } from "../../../common/message";
 const { proxy } = getCurrentInstance() as any;
 
diff --git a/src/views/SystemManage/Log/log.vue b/src/views/SystemManage/Log/log.vue
new file mode 100644
index 0000000..2d52190
--- /dev/null
+++ b/src/views/SystemManage/Log/log.vue
@@ -0,0 +1,164 @@
+<!-- Copyright (c) 2022 渝州大数据实验室
+ *
+ * Lanius is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *
+ *     http://license.coscl.org.cn/MulanPSL2
+ *
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+-->
+<!-- 
+* @desc:日志管理
+* @fileName:Logs.vue
+* @author:chenxiaofeng@yzbdl.ac.cn
+* @date:2022-4-6
+!-->
+<script setup lang="ts">
+import { onMounted, reactive, getCurrentInstance } from "vue";
+import LogSearch from "./components/log-search.vue";
+import LogDetails from "./components/log-details.vue";
+import LogPagination from "@/components/common/pagination.vue";
+import { showErrorMessage } from "../../../common/message";
+const { proxy } = getCurrentInstance() as any;
+
+const listData = reactive({
+  // 列表数据
+  tableData: [],
+  // 日志类型
+  logEventData: [],
+  // 列表总数
+  total: 0,
+  // 列表加载动画
+  isListLoading: false,
+  // 查询加载动画
+  isSearchLoading: false,
+});
+
+/**
+ * 定义请求数据
+ */
+let reqData = {
+  nickName: "",
+  beginTime: "",
+  endTime: "",
+  eventName: "",
+  page: 1,
+};
+
+/**
+ * 查询方法
+ * @param filter 查询条件对象
+ * @reture viod
+ */
+const searchFunc = (filter: any) => {
+  listData.isSearchLoading = true;
+  reqData.nickName = filter.nickName;
+  reqData.beginTime = filter.beginTime;
+  reqData.endTime = filter.endTime;
+  reqData.eventName = filter.eventValue;
+  reqTableList();
+};
+
+/**
+ * 根据页码跳转页面
+ * @param pageNumber 页码
+ * @reture viod
+ */
+const getCurrentPageNumber = (pageNumber: number) => {
+  reqData.page = pageNumber;
+  reqTableList();
+};
+
+/**
+ * 获取列表
+ * @reture viod
+ */
+const reqTableList = () => {
+  listData.isListLoading = true;
+  const res = proxy.$HTTP.post({
+    url: `/opr/query`,
+    params: {
+      page: reqData.page,
+      size: 10,
+    },
+    data: {
+      nickName: reqData.nickName,
+      beginTime: reqData.beginTime,
+      endTime: reqData.endTime,
+      eventName: reqData.eventName,
+    },
+  });
+  res
+    .then((res: any) => {
+      if (res.isOk) {
+        listData.tableData = res.data.records;
+        listData.total = Number(res.data.total);
+      }
+      listData.isListLoading = false;
+      listData.isSearchLoading = false;
+    })
+    .catch((response: any) => {
+      showErrorMessage({ message: response.data });
+      listData.isListLoading = false;
+      listData.isSearchLoading = false;
+    });
+};
+
+/**
+ * 获取所有日志事件
+ * @reture viod
+ */
+const reqEventDataList = () => {
+  const res = proxy.$HTTP.get({
+    url: `/opr/event`,
+  });
+  res
+    .then((res: any) => {
+      if (res.isOk) {
+        listData.logEventData = res.data;
+      }
+    })
+    .catch((response: any) => {
+      showErrorMessage({ message: response.data });
+    });
+};
+
+onMounted(() => {
+  // 初始化加载树形结构
+  reqTableList();
+  // 获取所有日志事件
+  reqEventDataList();
+});
+</script>
+
+<template>
+  <div class="page-list">
+    <!-- 查询 -->
+    <log-search
+      :searchFunc="searchFunc"
+      :eventData="listData.logEventData"
+      :isSearchLoading="listData.isSearchLoading"
+    ></log-search>
+    <!-- 列表详情 -->
+    <log-details
+      :tableData="listData.tableData"
+      :isListLoading="listData.isListLoading"
+    ></log-details>
+    <!-- 分页 -->
+    <log-pagination
+      :total="listData.total"
+      :getCurrentPageNumber="getCurrentPageNumber"
+    ></log-pagination>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.page-list {
+  position: relative;
+  background-color: #fff;
+  padding: 15px;
+  height: calc(100vh - 130px);
+}
+</style>
diff --git a/src/views/SystemManage/UserManage/components/operation.vue b/src/views/SystemManage/UserManage/components/operation.vue
new file mode 100644
index 0000000..4c02e7a
--- /dev/null
+++ b/src/views/SystemManage/UserManage/components/operation.vue
@@ -0,0 +1,225 @@
+<!-- Copyright (c) 2022 渝州大数据实验室
+ *
+ * Lanius is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *
+ *     http://license.coscl.org.cn/MulanPSL2
+ *
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+-->
+<!-- 
+* @desc:用户管理新增or编辑弹窗
+* @fileName:Operation.vue
+* @author:chenxiaofeng@yzbdl.ac.cn
+* @date:2022-4-15
+!-->
+<script setup lang="ts">
+import { onMounted, reactive, ref } from "vue";
+import { checkPassword } from "../../../../services/common/tool";
+import type { FormInstance } from "element-plus";
+// 接受父组件传回
+const props = defineProps({
+  // 角色下拉下拉值
+  roleList: Array as any,
+  // 新增用户方法回调
+  saveUser: Function as any,
+  // 修改用户方法回调
+  editUser: Function as any,
+  // 修改用户当前行数据
+  oneUserInfo: Object as any,
+  // 新增或修改文字
+  addOrEdit: String,
+});
+
+const formSize: any = ref("default");
+const ruleFormRef = ref<FormInstance>();
+const labelPosition = ref("top");
+
+/**
+ * 表单数据
+ */
+const ruleForm = reactive({
+  userName: "",
+  password: "",
+  nickName: "",
+  role: [],
+  chief: false,
+});
+
+/**
+ * 密码验证正则
+ */
+const validatePass = (rule: any, value: any, callback: any) => {
+  if (value === "") {
+    callback(new Error("请输入密码"));
+  } else if (!checkPassword(value)) {
+    callback(
+      new Error("密码必须包含英文大小写，数字，特殊字符，字符数量为6-20位")
+    );
+  } else {
+    callback();
+  }
+};
+
+/**
+ * 定义校验规则
+ */
+const rules: any = reactive({
+  userName: [
+    { required: true, message: "请输入用户账号", trigger: "blur" },
+    { max: 64, message: "用户账号不能超过64个字符", trigger: "blur" },
+  ],
+  password: [{ validator: validatePass, required: true, trigger: "blur" }],
+  nickName: [
+    { required: true, message: "请输入用户昵称", trigger: "blur" },
+    { max: 64, message: "用户昵称不能超过64个字符", trigger: "blur" },
+  ],
+});
+
+/**
+ * 提交表单
+ * @reture viod
+ */
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (props.addOrEdit === "新增") {
+        let saveObj = {
+          nickName: ruleForm.nickName,
+          password: ruleForm.password,
+          roleIds: ruleForm.role,
+          chief: ruleForm.chief,
+          userName: ruleForm.userName,
+        };
+        props.saveUser(saveObj);
+      } else {
+        let editObj = {
+          id: props.oneUserInfo.id,
+          nickName: ruleForm.nickName,
+          chief: ruleForm.chief,
+          roleIds: ruleForm.role,
+        };
+        props.editUser(editObj);
+      }
+    } else {
+      console.log("error submit!", fields);
+    }
+  });
+};
+
+onMounted(() => {
+  let userInfo = { ...props.oneUserInfo };
+  if (JSON.stringify(props.oneUserInfo) !== "{}") {
+    ruleForm.userName = userInfo.userName;
+    ruleForm.nickName = userInfo.nickName;
+    ruleForm.chief = userInfo.chief;
+    ruleForm.role = userInfo.roles.map((item: any) => {
+      return item.id;
+    });
+  }
+});
+</script>
+
+<template>
+  <div class="operation">
+    <el-form
+      ref="ruleFormRef"
+      :model="ruleForm"
+      :rules="rules"
+      :label-position="labelPosition"
+      label-width="120px"
+      class="demo-ruleForm"
+      :size="formSize"
+    >
+      <el-form-item label="用户账号" prop="userName">
+        <el-input
+          v-model="ruleForm.userName"
+          :disabled="props.addOrEdit !== '新增'"
+          size="large"
+          placeholder="请输入用户账号"
+        />
+      </el-form-item>
+      <el-form-item
+        label="账号密码"
+        prop="password"
+        v-if="props.addOrEdit === '新增'"
+      >
+        <el-input
+          v-model="ruleForm.password"
+          type="password"
+          size="large"
+          show-password
+          placeholder="请输入账号密码"
+        />
+      </el-form-item>
+      <el-form-item label="用户昵称" prop="nickName">
+        <el-input
+          v-model="ruleForm.nickName"
+          size="large"
+          placeholder="请输入用户昵称"
+        />
+      </el-form-item>
+      <el-form-item label="用户所属角色" prop="role">
+        <el-select
+          v-model="ruleForm.role"
+          size="large"
+          multiple
+          collapse-tags
+          collapse-tags-tooltip
+          style="width: 100%"
+        >
+          <el-option
+            v-for="item in props.roleList"
+            :key="item.id"
+            :label="item.roleName"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否为组织管理员" prop="chief">
+        <el-radio-group v-model="ruleForm.chief">
+          <el-radio :label="true">是</el-radio>
+          <el-radio :label="false">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item class="ClickButton">
+        <el-button @click="submitForm(ruleFormRef)">确定</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<style scoped lang="scss">
+:deep(.el-form-item__label) {
+  font-family: PingFang SC;
+  font-weight: 700;
+  color: #000000;
+  font-size: 14px;
+}
+:deep(.el-input) {
+  height: 40px;
+  background-color: #ffffff;
+}
+:deep(.el-textarea) {
+  height: 100px;
+  background-color: #ffffff;
+  .el-textarea__inner {
+    height: 100px;
+  }
+}
+.ClickButton {
+  :deep(.el-form-item__content) {
+    display: flex;
+    justify-content: flex-end;
+    .el-button {
+      height: 40px;
+      background-color: #ffffff;
+      border: 1px solid;
+      border-color: #cccccc;
+    }
+  }
+}
+</style>
diff --git a/src/views/TaskSchedule/TaskArrangement/components/operation.vue b/src/views/TaskSchedule/TaskArrangement/components/operation.vue
new file mode 100644
index 0000000..f3f85aa
--- /dev/null
+++ b/src/views/TaskSchedule/TaskArrangement/components/operation.vue
@@ -0,0 +1,589 @@
+<!-- Copyright (c) 2022 渝州大数据实验室
+ *
+ * Lanius is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *
+ *     http://license.coscl.org.cn/MulanPSL2
+ *
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+-->
+<!-- 
+* @desc:任务编排新增弹窗
+* @fileName:Operation.vue
+* @author:chenxiaofeng@yzbdl.ac.cn
+* @date:2022-4-15
+!-->
+<script setup lang="ts">
+import { onMounted, reactive, ref } from "vue";
+import { ElMessage, FormInstance } from "element-plus";
+import { Delete } from "@element-plus/icons-vue";
+import { getCurrentInstance } from "vue";
+const { proxy } = getCurrentInstance() as any;
+
+const props = defineProps({
+  // 保存方法回调
+  saveArrangement: Function as any,
+  // 编辑方法回调
+  editArrangement: Function as any,
+  // 新增或修改标识
+  addOrEdit: String,
+  // 点击修改后的单条数据值
+  oneUserInfo: Object,
+});
+
+const listData = reactive({
+  serverNodeList: [] as any, //服务节点下拉选项列表值
+  groupTree: [] as any, //资源树下拉选项值
+  resouceList: [] as any, //资源列表选项值
+  taskList: [] as any, //任务配置参数列表
+  groupOptions: [], //分组下拉数据
+  groupTreeValue: "", //任务资源
+});
+
+/**
+ * 定义任务资源参数类型
+ */
+const paramTypeList = [
+  { name: "字符串", value: "String" },
+  { name: "数字", value: "Number" },
+  { name: "JSON对象", value: "JsonObject" },
+  { name: "数组", value: "Arr" },
+  { name: "布尔", value: "Boolean" },
+  { name: "Null", value: "Null" },
+];
+
+/**
+ * 定义日志等级枚举
+ */
+const logLevel = [
+  { name: "基本(Basic)", value: 3 },
+  { name: "详细(Detailed)", value: 4 },
+  { name: "调试(Debug)", value: 5 },
+  { name: "行级(Row level)", value: 6 },
+  { name: "最小(Minimal)", value: 2 },
+  { name: "错误(ERROR)", value: 1 },
+  { name: "无(Nothing)", value: 0 },
+];
+const formSize: any = ref("default");
+const ruleFormRef = ref<FormInstance>();
+/**
+ * 表单数据
+ */
+let ruleForm: any = reactive({
+  taskName: "",
+  taskCron: "",
+  serverProgramId: "",
+  taskResourceId: "",
+  jsonConfig: "",
+  groupId: "",
+  logLevel: "",
+  remark: "",
+  status: 2,
+});
+
+const labelPosition = ref("top");
+
+/**
+ * 定义校验规则
+ */
+const rules: any = reactive({
+  taskName: [
+    { required: true, message: "请输入任务名称", trigger: "blur" },
+    { max: 64, message: "任务名称最多能输入64个字符", trigger: "blur" },
+  ],
+  taskCron: [
+    { required: true, message: "cron表达式不能为空", trigger: "change" },
+  ],
+  serverProgramId: [
+    { required: true, message: "请选择服务节点", trigger: "change" },
+  ],
+  taskResourceId: [
+    { required: true, message: "请选择任务资源", trigger: "change" },
+  ],
+  groupId: [{ required: true, message: "请选择所在分组", trigger: "change" }],
+  logLevel: [{ required: true, message: "请选择日志等级", trigger: "change" }],
+  status: [{ required: true, message: "请选择启用状态", trigger: "change" }],
+});
+
+/**
+ * 提交表单
+ * @reture viod
+ */
+const submitForm = async (formEl: FormInstance | undefined) => {
+  listData.taskList.length === 0
+    ? (ruleForm.jsonConfig = "")
+    : (ruleForm.jsonConfig = JSON.stringify(listData.taskList));
+  if (!formEl) return;
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      props.addOrEdit === "新增"
+        ? props.saveArrangement(ruleForm)
+        : props.editArrangement(ruleForm);
+    } else {
+      console.log("error submit!", fields);
+    }
+  });
+};
+
+/**
+ * 获取服务节点
+ * @reture viod
+ */
+const getServerNodeList = () => {
+  const res = proxy.$HTTP.get({
+    url: `/task/plan/serverProgramList`,
+  });
+  res
+    .then((res: any) => {
+      if (res.isOk) {
+        listData.serverNodeList = res.data;
+      }
+    })
+    .catch((response: any) => {
+      ElMessage.error(response.data);
+    });
+};
+
+/**
+ * 获取资源树
+ * @reture viod
+ */
+const getGroupTree = () => {
+  const res = proxy.$HTTP.get({
+    url: `/task/plan/taskResourceGroupTree`,
+  });
+  res
+    .then((res: any) => {
+      if (res.isOk) {
+        listData.groupTree = res.data;
+      }
+    })
+    .catch((response: any) => {
+      ElMessage.error(response.data);
+    });
+};
+
+/**
+ * 任务资源下拉选择，根据资源分组ID获取资源列表
+ * @param data 选择中树的节点信息
+ * @reture viod
+ */
+const getGroupOne = (data: any) => {
+  listData.resouceList = [];
+  ruleForm.taskResourceId = "";
+  const res = proxy.$HTTP.get({
+    url: `/task/plan/taskResourceList/` + data.id,
+  });
+  res
+    .then((res: any) => {
+      if (res.isOk) {
+        listData.resouceList = res.data;
+      }
+    })
+    .catch((response: any) => {
+      ElMessage.error(response.data);
+    });
+};
+
+/**
+ * 添加一行任务配置
+ * @reture viod
+ */
+const addConfigOne = () => {
+  let json = { paramName: "", paramType: "", paramValue: "" };
+  listData.taskList.push(json);
+};
+
+/**
+ * 删除任务配置
+ * @param index 删除任务的下标
+ * @reture viod
+ */
+const delConfigONe = (index: number) => {
+  listData.taskList.splice(index, 1);
+};
+
+/**
+ * 获取分组
+ * @reture viod
+ */
+const getGroupList = () => {
+  const res = proxy.$HTTP.get({
+    url: `/task/plan/group/tree`,
+  });
+  res
+    .then((res: any) => {
+      if (res.isOk) {
+        listData.groupOptions = res.data;
+      }
+    })
+    .catch((response: any) => {
+      ElMessage.error(response.data);
+    });
+};
+
+/**
+ * 获取分组值
+ * @param id 删除任务的下标
+ * @reture viod
+ */
+const getGroupValue = (id: string) => {
+  ruleForm.groupId = id;
+};
+
+/**
+ * 根据状态返回中文
+ * @param s 状态数字
+ * @reture 状态中文
+ */
+const showStatus = (s: number) => {
+  if (s === 1) {
+    return "运行中";
+  } else if (s === 2) {
+    return "异常";
+  } else {
+    return "停止";
+  }
+};
+
+/**
+ * 初始化加载
+ */
+onMounted(() => {
+  // 获取服务节点下拉选项值
+  getServerNodeList();
+  // 获取资源分组树下拉选项值
+  getGroupTree();
+  // 获取所在分组下拉选项值
+  getGroupList();
+  // 点击修改单条数据时，回显
+  setTimeout(() => {
+    let userInfo = { ...props.oneUserInfo };
+    if (JSON.stringify(props.oneUserInfo) !== "{}") {
+      getGroupOne({ id: userInfo.taskResourceGroupId });
+      userInfo.jsonConfig === ""
+        ? (ruleForm.taskName = [])
+        : (ruleForm.taskName = JSON.parse(userInfo.jsonConfig));
+      ruleForm.taskName = userInfo.taskName;
+      ruleForm.taskCron = userInfo.taskCron;
+      ruleForm.serverProgramId = userInfo.serverProgramId;
+      ruleForm.taskResourceId = userInfo.taskResourceId;
+      ruleForm.jsonConfig = userInfo.jsonConfig;
+      ruleForm.groupId = userInfo.groupId;
+      ruleForm.logLevel = userInfo.logLevel;
+      ruleForm.remark = userInfo.remark;
+      ruleForm.status = Number(userInfo.status);
+      ruleForm.id = userInfo.id;
+      listData.groupTreeValue = userInfo.taskResourceGroupId;
+      listData.taskList = JSON.parse(userInfo.jsonConfig);
+    }
+  }, 500);
+});
+
+const treeProps = {
+  label: "groupName",
+  value: "id",
+  children: "children",
+};
+
+const groupProps = {
+  label: "groupName",
+  value: "id",
+  children: "children",
+};
+const state = reactive({
+  cronPopover: false,
+  cron: "",
+});
+const changeCron = (val: string) => {
+  if (typeof val !== "string") return false;
+  ruleForm.taskCron = val;
+};
+const togglePopover = (bol: boolean) => {
+  state.cronPopover = bol;
+};
+</script>
+
+<template>
+  <div class="operation">
+    <el-form
+      ref="ruleFormRef"
+      :model="ruleForm"
+      :rules="rules"
+      :label-position="labelPosition"
+      label-width="120px"
+      class="demo-ruleForm"
+      :size="formSize"
+    >
+      <el-form-item label="任务名称" prop="taskName">
+        <el-input
+          v-model="ruleForm.taskName"
+          size="large"
+          maxlength="50"
+          placeholder="请输入任务名称"
+        />
+      </el-form-item>
+      <el-form-item label="执行周期" prop="taskCron">
+        <div class="cron">
+          <el-popover v-model:visible="state.cronPopover" width="700px">
+            <vue3Cron
+              @change="changeCron"
+              @close="togglePopover(false)"
+              max-height="400px"
+              i18n="cn"
+            ></vue3Cron>
+            <template #reference>
+              <el-input
+                @focus="togglePopover(true)"
+                v-model="ruleForm.taskCron"
+                clearable
+                size="large"
+                placeholder="请选择执行周期"
+              ></el-input>
+            </template>
+          </el-popover>
+        </div>
+      </el-form-item>
+      <el-form-item label="服务节点" prop="serverProgramId">
+        <el-select
+          v-model="ruleForm.serverProgramId"
+          class="m-2"
+          placeholder="请选择服务节点"
+          size="large"
+        >
+          <el-option
+            v-for="item in listData.serverNodeList"
+            :key="item.id"
+            :label="item.programName"
+            :value="item.id"
+            :disabled="item.status !== 1"
+          >
+            <span class="options-label">{{ item.programName }}</span
+            ><span class="options-status">{{ showStatus(item.status) }}</span>
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任务资源" prop="taskResourceId">
+        <template #default="scope">
+          <div class="task-resource">
+            <el-tree-select
+              check-strictly
+              :props="treeProps"
+              node-key="id"
+              clearable
+              :data="listData.groupTree"
+              :default-expand-all="true"
+              v-model="listData.groupTreeValue"
+              class="task-resource-select"
+              placeholder="请选择分组资源"
+              @node-click="getGroupOne"
+            />
+            <el-select
+              v-model="ruleForm.taskResourceId"
+              class="task-resource-select"
+              placeholder="请选择资源"
+              size="large"
+            >
+              <el-option
+                v-for="item in listData.resouceList"
+                :key="item.id"
+                :label="item.resourceName"
+                :value="item.id"
+              />
+            </el-select>
+          </div>
+        </template>
+      </el-form-item>
+      <el-form-item
+        label="任务配置"
+        prop="jsonConfig"
+        :inline-message="false"
+        :show-message="false"
+      >
+        <template #default="scope">
+          <div class="config">
+            <div
+              class="task-config"
+              v-for="(item, indx) in listData.taskList"
+              :key="indx"
+            >
+              <el-input
+                v-model="item.paramName"
+                class="w-1"
+                clearable
+                maxlength="50"
+                size="large"
+                placeholder="请输入参数名称"
+              ></el-input>
+              <el-select
+                v-model="item.paramType"
+                class="w-1"
+                clearable
+                placeholder="请选择数据类型"
+                size="large"
+              >
+                <el-option
+                  v-for="item in paramTypeList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+              <el-input
+                size="large"
+                clearable
+                class="w-2"
+                maxlength="50"
+                v-model="item.paramValue"
+                placeholder="请输入参数值"
+              ></el-input>
+              <div @click="delConfigONe(indx)" class="op-icon">
+                <el-icon><delete /></el-icon>
+              </div>
+            </div>
+            <div class="op-icon add" @click="addConfigOne">+</div>
+          </div>
+        </template>
+      </el-form-item>
+      <el-form-item label="所在分组" prop="groupId">
+        <el-tree-select
+          check-strictly
+          :props="groupProps"
+          node-key="id"
+          clearable
+          :data="listData.groupOptions"
+          :default-expand-all="true"
+          v-model="ruleForm.groupId"
+          class="task-resource-select"
+          placeholder="请选择所在分组"
+          @node-click="getGroupValue"
+        />
+      </el-form-item>
+      <el-form-item label="日志等级" prop="logLevel">
+        <el-select
+          v-model="ruleForm.logLevel"
+          class="m-2"
+          clearable
+          placeholder="请选择资源"
+          size="large"
+        >
+          <el-option
+            v-for="item in logLevel"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任务状态" prop="status">
+        <el-radio-group v-model="ruleForm.status">
+          <el-radio :label="2">启用</el-radio>
+          <el-radio :label="1">禁用</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="ruleForm.remark"
+          clearable
+          maxlength="500"
+          type="textarea"
+          size="large"
+          placeholder="请输入备注"
+        />
+      </el-form-item>
+      <el-form-item class="ClickButton">
+        <el-button @click="submitForm(ruleFormRef)">确定</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<style>
+.el-dialog__header {
+  border-bottom: 1px solid #dedede;
+  margin-right: 0;
+}
+</style>
+<style scoped lang="scss">
+.task-resource {
+  display: flex;
+  width: 100%;
+  .task-resource-select {
+    flex: 1;
+    &:nth-of-type(1) {
+      margin-right: 5px;
+    }
+    &:nth-of-type(2) {
+      margin-left: 5px;
+    }
+  }
+}
+.cron {
+  width: 100%;
+}
+.options-label {
+  float: left;
+}
+.options-status {
+  float: right;
+  color: #999;
+  font-size: 12px;
+}
+.w-1 {
+  width: 200px !important;
+  margin-right: 10px;
+  margin-bottom: 10px;
+}
+.w-2 {
+  width: 220px;
+  margin-right: 10px;
+}
+.op-icon {
+  border: 1px solid #ccc;
+  width: 40px;
+  height: 38px;
+  text-align: center;
+  line-height: 38px;
+  cursor: pointer;
+  &.add {
+    font-size: 22px;
+  }
+}
+.task-config {
+  display: flex;
+}
+.el-select {
+  width: 100%;
+}
+:deep(.el-form-item__label) {
+  font-family: PingFang SC;
+  font-weight: 700;
+  color: #000000;
+  font-size: 14px;
+}
+:deep(.el-input) {
+  height: 40px;
+  background-color: #ffffff;
+}
+:deep(.el-textarea) {
+  height: 100px;
+  background-color: #ffffff;
+  .el-textarea__inner {
+    height: 100px;
+  }
+}
+.ClickButton {
+  :deep(.el-form-item__content) {
+    display: flex;
+    justify-content: flex-end;
+    .el-button {
+      height: 40px;
+      background-color: #ffffff;
+      border: 1px solid;
+      border-color: #cccccc;
+    }
+  }
+}
+</style>
diff --git a/src/views/TaskSchedule/TaskResources/components/operation.vue b/src/views/TaskSchedule/TaskResources/components/operation.vue
new file mode 100644
index 0000000..4356d29
--- /dev/null
+++ b/src/views/TaskSchedule/TaskResources/components/operation.vue
@@ -0,0 +1,378 @@
+<!-- Copyright (c) 2022 渝州大数据实验室
+ *
+ * Lanius is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *
+ *     http://license.coscl.org.cn/MulanPSL2
+ *
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+-->
+<!-- 
+* @desc:任务编排新增弹窗
+* @fileName:Operation.vue
+* @author:chenxiaofeng@yzbdl.ac.cn
+* @date:2022-4-15
+!-->
+<script setup lang="ts">
+import { onMounted, reactive, ref } from "vue";
+import { ElMessage, FormInstance } from "element-plus";
+import TreeDialog from "./tree-dialog.vue";
+import { showErrorMessage } from "../../../../common/message";
+import { getCurrentInstance } from "vue";
+const { proxy } = getCurrentInstance() as any;
+
+const props = defineProps({
+  // 保存方法回调
+  saveResource: Function as any,
+  // 修改方法回调
+  editResource: Function as any,
+  // 新增或编辑文字
+  addOrEdit: String,
+  // 编辑时传回的当前行数据
+  oneUserInfo: Object,
+});
+
+// 资源类型值
+let resourceLib: any = [];
+
+/**
+ * 任务资源数据
+ */
+const groupTreeList = reactive({
+  treeList: [] as any,
+  treeDialog: false,
+  resourceValue: "",
+  resourceLibOptions: [] as any,
+});
+
+const formSize: any = ref("default");
+const editId = ref("");
+const ruleFormRef = ref<FormInstance>();
+
+/**
+ * 表单数据
+ */
+const ruleForm = reactive({
+  resourceType: "",
+  resourceConfigId: "",
+  groupId: "",
+  resourceName: "",
+  resourcePath: "",
+  resourceAccountName: "",
+  resourcePassword: "",
+});
+const labelPosition = ref("top");
+
+/**
+ * 定义校验规则
+ */
+const rules: any = reactive({
+  resourceName: [
+    { required: true, message: "请输入资源名称", trigger: "blur" },
+    { max: 64, message: "资源名称最多能输入64个字符", trigger: "blur" },
+  ],
+  resourceConfigId: [
+    { required: true, message: "请选择资源库", trigger: "blur" },
+  ],
+  resourceType: [
+    { required: true, message: "请选择资源类型", trigger: "blur" },
+  ],
+  resourcePath: [{ required: true, message: "请选择资源", trigger: "blur" }],
+  resourceAccountName: [
+    { required: true, message: "请输入任务资源账户名", trigger: "blur" },
+    { max: 64, message: "任务资源账户名最多能输入64个字符", trigger: "blur" },
+  ],
+  resourcePassword: [
+    { required: true, message: "请输入任务资源密码", trigger: "blur" },
+    {
+      min: 1,
+      max: 20,
+      message: "任务资源密码位数必须是1-20个字符",
+      trigger: "blur",
+    },
+  ],
+});
+
+/**
+ * 提交表单
+ * @reture viod
+ */
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      let saveObj: { [key: string]: any } = {
+        resourceType: ruleForm.resourceType,
+        resourceConfigId: ruleForm.resourceConfigId,
+        groupId: ruleForm.groupId,
+        resourceName: ruleForm.resourceName,
+        resourcePath: ruleForm.resourcePath,
+        resourceAccountName: ruleForm.resourceAccountName,
+        resourcePassword: ruleForm.resourcePassword,
+      };
+      if (props.addOrEdit === "新增") {
+        props.saveResource(saveObj);
+      } else {
+        saveObj.id = editId.value;
+        props.editResource(saveObj);
+      }
+    } else {
+      console.log("error submit!", fields);
+    }
+  });
+};
+
+/**
+ * 获取资源库列表
+ * @reture viod
+ */
+const getResourceLibList = () => {
+  const res = proxy.$HTTP.post({
+    url: "/resource/taskResourceConfig/query",
+    params: {
+      page: 1,
+      size: 500,
+    },
+    data: {
+      connectName: "",
+      status: "1",
+    },
+  });
+  res
+    .then((res: any) => {
+      if (res.isOk) {
+        resourceLib = res.data.records;
+        groupTreeList.resourceLibOptions = resourceLib.map((item: any) => ({
+          value: item.id,
+          label: item.connectName,
+        }));
+      }
+    })
+    .catch((response: any) => {
+      showErrorMessage({ message: response.data });
+    });
+};
+
+/**
+ * 获取资源配置列表
+ * @param id 资源ID
+ * @reture viod
+ */
+const getGroupList = (id: string) => {
+  ruleForm.resourcePath = "";
+  const res = proxy.$HTTP.get({
+    url: "/resource/taskResource/getExternalResourceTree",
+    params: {
+      resourceConfigId: id,
+    },
+  });
+  res
+    .then((res: any) => {
+      if (res.code === 200) {
+        groupTreeList.treeList = res.data;
+        const nodeData: any = {
+          id: "0",
+          nodeName: "根节点任务资源",
+          path: "",
+          children: [],
+        };
+        groupTreeList.treeList.unshift(nodeData);
+      }
+    })
+    .catch((response: any) => {
+      showErrorMessage({ message: response.data });
+    });
+};
+
+/**
+ * 获取资源路径数据
+ * @param path 资源路径
+ * @reture viod
+ */
+const getGroupInfo = (path: string) => {
+  ruleForm.resourcePath = path;
+  groupTreeList.treeDialog = false;
+};
+
+/**
+ * 打开选择资源弹窗
+ * @reture viod
+ */
+const chooseResource = () => {
+  if (ruleForm.resourceConfigId === "") {
+    ElMessage.info("请先选择资源库!");
+  } else {
+    groupTreeList.treeDialog = true;
+  }
+};
+
+onMounted(() => {
+  getResourceLibList();
+  let userInfo = { ...props.oneUserInfo };
+  if (JSON.stringify(props.oneUserInfo) !== "{}") {
+    getGroupList(userInfo.resourceConfigId);
+    editId.value = userInfo.id;
+    ruleForm.resourceType = userInfo.resourceType.toString();
+    ruleForm.resourceConfigId = userInfo.resourceConfigId;
+    ruleForm.groupId = userInfo.groupId;
+    ruleForm.resourceAccountName = JSON.parse(
+      userInfo.resourceContent
+    ).repo_account;
+    ruleForm.resourcePassword = JSON.parse(
+      userInfo.resourceContent
+    ).repo_password;
+    ruleForm.resourceName = userInfo.resourceName;
+    ruleForm.resourcePath = JSON.parse(userInfo.resourceContent).repo_entrance;
+    groupTreeList.resourceValue = JSON.parse(userInfo.resourceContent)
+      .repo_entrance.split(".")[0]
+      .split("/")
+      .pop();
+  }
+});
+</script>
+
+<template>
+  <div class="operation">
+    <el-form
+      ref="ruleFormRef"
+      :model="ruleForm"
+      :rules="rules"
+      :label-position="labelPosition"
+      label-width="120px"
+      class="demo-ruleForm"
+      :size="formSize"
+    >
+      <el-form-item label="资源名称" prop="resourceName">
+        <el-input
+          v-model="ruleForm.resourceName"
+          size="large"
+          placeholder="请输入资源名称"
+        />
+      </el-form-item>
+      <el-form-item label="资源库" prop="resourceConfigId">
+        <el-select-v2
+          v-model="ruleForm.resourceConfigId"
+          size="large"
+          placeholder="请选择资源库"
+          @change="getGroupList"
+          :options="groupTreeList.resourceLibOptions"
+        ></el-select-v2>
+      </el-form-item>
+      <el-form-item label="资源类型" prop="resourceType">
+        <el-select
+          v-model="ruleForm.resourceType"
+          size="large"
+          clearable
+          placeholder="请选择资源类型"
+          @change="ruleForm.resourcePath = ''"
+        >
+          <el-option label="作业" value="1"></el-option>
+          <el-option label="转换" value="2"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="任务资源账户名"
+        v-show="ruleForm.resourceType !== ''"
+        prop="resourceAccountName"
+      >
+        <el-input
+          v-model="ruleForm.resourceAccountName"
+          size="large"
+          placeholder="请输入任务资源账户名"
+        />
+      </el-form-item>
+      <el-form-item
+        label="任务资源密码"
+        v-show="ruleForm.resourceType !== ''"
+        prop="resourcePassword"
+      >
+        <el-input
+          v-model="ruleForm.resourcePassword"
+          size="large"
+          type="password"
+          placeholder="请输入任务资源密码"
+        />
+      </el-form-item>
+      <el-form-item label="资源" prop="resourcePath" :inline-message="true">
+        <el-col :span="20">
+          <el-input
+            v-model="ruleForm.resourcePath"
+            :disabled="true"
+            placeholder="请选择资源"
+            size="large"
+          ></el-input>
+        </el-col>
+        <el-col :span="4" class="tar">
+          <el-button size="large" @click="chooseResource">选择资源</el-button>
+        </el-col>
+      </el-form-item>
+      <el-form-item class="ClickButton">
+        <el-button @click="submitForm(ruleFormRef)">确定</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+  <!-- 操作弹窗 -->
+  <el-dialog
+    v-model="groupTreeList.treeDialog"
+    v-if="groupTreeList.treeDialog"
+    title="选择资源"
+    :width="740"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
+    <TreeDialog
+      :groupTreeList="groupTreeList.treeList"
+      :resourceConfigId="ruleForm.resourceConfigId"
+      :resourceType="ruleForm.resourceType"
+      :resourceValue="groupTreeList.resourceValue"
+      :getGroupInfo="getGroupInfo"
+    />
+  </el-dialog>
+</template>
+
+<style>
+.el-dialog__header {
+  border-bottom: 1px solid #dedede;
+  margin-right: 0;
+}
+</style>
+<style scoped lang="scss">
+.tar {
+  text-align: right;
+}
+:deep(.el-form-item__label) {
+  font-family: PingFang SC;
+  font-weight: 700;
+  color: #000000;
+  font-size: 14px;
+}
+:deep(.el-input) {
+  height: 40px;
+  background-color: #ffffff;
+}
+:deep(.el-textarea) {
+  height: 100px;
+  background-color: #ffffff;
+  .el-textarea__inner {
+    height: 100px;
+  }
+}
+.ClickButton {
+  :deep(.el-form-item__content) {
+    display: flex;
+    justify-content: flex-end;
+    .el-button {
+      height: 40px;
+      background-color: #ffffff;
+      border: 1px solid;
+      border-color: #cccccc;
+    }
+  }
+}
+.el-select,
+.el-select-v2 {
+  width: 100%;
+}
+</style>
-- 
Gitee


From 74ddafb32c0df5e73dd71f4a73357290bef7d0c5 Mon Sep 17 00:00:00 2001
From: "chenxiaofeng@yzbdl.ac.cn" <chenxiaofeng@yzbdl.ac.cn>
Date: Thu, 18 Aug 2022 09:57:37 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/tree.vue | 547 +++++++++++++++++++++++++++++++++
 1 file changed, 547 insertions(+)
 create mode 100644 src/components/common/tree.vue

diff --git a/src/components/common/tree.vue b/src/components/common/tree.vue
new file mode 100644
index 0000000..6c7c7c2
--- /dev/null
+++ b/src/components/common/tree.vue
@@ -0,0 +1,547 @@
+<!-- Copyright (c) 2022 渝州大数据实验室
+ *
+ * Lanius is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ *
+ *     http://license.coscl.org.cn/MulanPSL2
+ *
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ -->
+<!-- 
+* @desc:树形菜单
+* @fileName:Tree.vue
+* @author:chenxiaofeng@yzbdl.ac.cn
+* @date:2022-4-8
+!-->
+<script setup lang="ts">
+import { onMounted, ref, watch } from "vue";
+import {
+  Search,
+  CircleCheckFilled,
+  Plus,
+  EditPen,
+  Delete,
+} from "@element-plus/icons-vue";
+import type Node from "element-plus/es/components/tree/src/model/node";
+import { ElMessage, ElTree } from "element-plus";
+import { TreeNodeData } from "element-plus/lib/components/tree/src/tree.type";
+import "element-plus/theme-chalk/el-tree.css";
+
+const props = defineProps({
+  // 树数据
+  dataSource: {
+    type: Array as any,
+    default: [],
+  },
+  // 回传选中的节点ID
+  getTableList: Function as any,
+  // 树加载动画
+  isTreeLoading: {
+    type: Boolean,
+    default: false,
+  },
+  //添加节点方法实现
+  addNode: Function,
+  //删除节点方法实现
+  delNode: Function,
+  //修改节点方法实现
+  editNode: Function,
+});
+// 定义树形菜单数据类型
+interface Tree {
+  id: number;
+  groupName: string;
+  children?: Tree[];
+}
+
+// 定义搜索名称
+const searchValue = ref("");
+const treeRef = ref<InstanceType<typeof ElTree>>();
+// 添加节点输入框值
+let addOrEdit = ref("");
+// 添加框隐藏显示标识
+let isAdd = ref(false);
+// 子节点ID存放变量-供添加节点使用
+let childNodeId = ref(0);
+// 子节点内容变量
+let childNodeValue = ref("");
+// 新增子节点，存放父节点信息
+let childPid = ref("");
+// 子节点ID存放变量-供修改节点使用
+let editChildNOdeId = ref(0);
+// 编辑标识
+let isEdit = ref(true);
+// 编辑节点值存放变量
+let editChildValue = ref("");
+// 点击树每一行存当前ID
+let iconShowId = ref(0);
+
+/**
+ * 监听输入值的改变
+ */
+watch(searchValue, (val) => {
+  treeRef.value!.filter(val);
+});
+
+/**
+ * 关闭已经显示的增加节点输入框
+ */
+document.addEventListener("click", (e: any) => {
+  if (e.target.className === "el-input__inner") return;
+  isAdd.value = false;
+  childNodeId.value = 0;
+  editChildNOdeId.value = 0;
+});
+
+/**
+ * 通过过滤的值筛选树形菜单
+ * @param value 关键词
+ * @param data 树数据
+ * @reture 已过滤数据
+ */
+const filterNode = (value: string, data: TreeNodeData) => {
+  if (!value) return true;
+  return data.groupName.includes(value);
+};
+
+/**
+ * 根节点内容添加
+ * @reture viod
+ */
+const addRootNode = () => {
+  if (addOrEdit.value === "") {
+    ElMessage({
+      message: "节点内容不能为空",
+      type: "info",
+    });
+  } else {
+    isAdd.value = false;
+    const item = {
+      groupName: addOrEdit.value,
+      pid: "",
+    };
+    props.addNode?.(item);
+  }
+};
+
+/**
+ * 子节点内容添加
+ * @reture viod
+ */
+const addChileNode = () => {
+  if (childNodeValue.value === "") {
+    ElMessage.error("节点内容不能为空");
+  } else {
+    const item = {
+      groupName: childNodeValue.value,
+      pid: childPid.value,
+    };
+    props.addNode?.(item);
+  }
+  childNodeId.value = 0;
+};
+
+/**
+ * 添加方法
+ * @param data 当前行数据
+ * @reture viod
+ */
+const append = (data: Tree) => {
+  childPid.value = data.id.toString();
+  childNodeValue.value = "";
+  childNodeId.value = data.id;
+};
+
+/**
+ * 编辑方法
+ * @param node 当前节点信息
+ * @param data 当前行数据
+ * @reture viod
+ */
+const edit = (node: Node, data: Tree) => {
+  editChildNOdeId.value = data.id;
+  isEdit.value = true;
+  editChildValue.value = data.groupName.split("(")[0];
+};
+
+/**
+ * 移除方法
+ * @param data 当前行数据
+ * @reture viod
+ */
+const remove = (data: any) => {
+  props.delNode?.(data.id);
+};
+
+/**
+ * 修改节点方法
+ * @reture viod
+ */
+const editNodeSubmit = () => {
+  if (editChildValue.value === "") {
+    ElMessage.info("节点内容不能为空!");
+    return;
+  }
+  let item = {
+    groupName: editChildValue.value,
+    id: editChildNOdeId.value,
+  };
+  props.editNode?.(item);
+  editChildNOdeId.value = 0;
+  isEdit.value = true;
+  editChildValue.value = "";
+};
+
+const defaultProps = {
+  children: "children",
+  label: "groupName",
+};
+
+/**
+ * 节点点击方法
+ * @param data 节点数据
+ * @reture viod
+ */
+const nodeClick = (data: Tree) => {
+  iconShowId.value = data.id;
+  props.getTableList(data.id);
+};
+
+/**
+ * 根据等级截取显示长度
+ * @param data 节点数据
+ * @reture viod
+ */
+const ellicpis = (data: any) => {
+  if (!data.groupName) return "";
+  if (data.level === 1 && data.groupName.length >= 13) {
+    return data.groupName.slice(0, 13) + "...";
+  } else if (data.level === 2 && data.groupName.length >= 12) {
+    return data.groupName.slice(0, 12) + "...";
+  }
+  if (data.level === 3 && data.groupName.length >= 10) {
+    return data.groupName.slice(0, 10) + "...";
+  }
+  if (data.level === 4 && data.groupName.length >= 9) {
+    return data.groupName.slice(0, 9) + "...";
+  }
+  if (data.level === 5 && data.groupName.length >= 8) {
+    return data.groupName.slice(0, 8) + "...";
+  }
+  return data.groupName;
+};
+
+onMounted(() => {
+  setTimeout(() => {
+    if (props.dataSource.length < 1) return;
+    treeRef.value?.setCurrentKey(props.dataSource[0].id);
+    iconShowId.value = props.dataSource[0].id;
+  }, 100);
+});
+</script>
+
+<template>
+  <!-- 操作区域 -->
+  <div class="opration">
+    <el-input
+      class="search-input"
+      v-model="searchValue"
+      placeholder="请输入分组名称"
+      :suffix-icon="Search"
+    ></el-input>
+    <el-button
+      class="add-btn"
+      @click.stop="
+        isAdd = true;
+        addOrEdit = '';
+      "
+      :icon="Plus"
+      >新增</el-button
+    >
+  </div>
+  <!-- 新增、编辑 -->
+  <div class="flex add-root-node" v-if="isAdd">
+    <img class="folder" src="../../assets/img/task-resource/folder.png" />
+    <el-input
+      v-model="addOrEdit"
+      placeholder="请输入根节点"
+      maxlength="64"
+    ></el-input>
+    <span @click="addRootNode" class="add-submit"
+      ><el-icon class="sub"><circle-check-filled /></el-icon
+    ></span>
+  </div>
+  <!-- 树形页面 -->
+  <div class="the-tree">
+    <el-tree
+      ref="treeRef"
+      v-loading="props.isTreeLoading"
+      :data="props.dataSource"
+      :props="defaultProps"
+      node-key="id"
+      :highlight-current="true"
+      default-expand-all
+      :filter-node-method="filterNode"
+      :expand-on-click-node="false"
+      v-if="props.dataSource.length > 0"
+    >
+      <template #default="{ node, data }">
+        <!-- 树形菜单自定义dom -->
+        <span
+          class="custom-tree-node"
+          @click="nodeClick(data)"
+          :class="iconShowId === data.id ? 'actived' : ''"
+        >
+          <!-- 正常显示节点内容 -->
+          <span class="word" v-if="data.id !== editChildNOdeId && isEdit"
+            ><img
+              class="folder"
+              src="../../assets/img/task-resource/folder.png"
+            />
+            <lanius-tooltip :content="node.label">
+              {{ ellicpis(data) }}</lanius-tooltip
+            ></span
+          >
+          <!-- 点击编辑后显示输入框 -->
+          <span v-if="data.id === editChildNOdeId && isEdit">
+            <img
+              class="folder"
+              src="../../assets/img/task-resource/folder.png"
+            />
+            <el-input
+              class="edit-root-name"
+              maxlength="64"
+              v-model="editChildValue"
+            ></el-input>
+            <span class="add-submit" @click="editNodeSubmit"
+              ><el-icon class="sub"><circle-check-filled /></el-icon
+            ></span>
+          </span>
+          <span class="custom-tree-opration">
+            <!-- 添加节点 -->
+            <a
+              class="opration-icon plus"
+              v-if="data.level !== 5"
+              @click.stop="append(data)"
+            >
+              <el-icon class="custom-icon-plus"><plus /></el-icon>
+            </a>
+            <!-- 编辑节点 -->
+            <a class="opration-icon edit-pen" @click.stop="edit(node, data)">
+              <el-icon class="custom-icon-edit"><EditPen /></el-icon>
+            </a>
+            <!-- 删除节点 -->
+            <lanius-pop-confirm
+              title="删除提示"
+              :content="'确定删除分组?'"
+              @confirm="remove(data)"
+            >
+              <div style="display: inline">
+                <span class="opration-icon delete">
+                  <el-icon class="custom-icon-delete"><delete /></el-icon>
+                </span>
+              </div>
+            </lanius-pop-confirm>
+          </span>
+        </span>
+        <!-- 子节点添加dom -->
+        <div class="no-flex" v-if="data.id === childNodeId">
+          <img class="folder" src="../../assets/img/task-resource/folder.png" />
+          <el-input
+            class="edit-root-name"
+            maxlength="64"
+            v-model="childNodeValue"
+          ></el-input>
+          <span @click="addChileNode"
+            ><el-icon class="sub"><circle-check-filled /></el-icon
+          ></span>
+        </div>
+      </template>
+    </el-tree>
+    <!-- 数据为空显示 -->
+    <template v-if="props.dataSource.length === 0" slot="empty">
+      <el-empty description="暂无数据" />
+    </template>
+  </div>
+</template>
+
+<sytle lang="scss">
+.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+  background-color: #f5f7fa !important;
+}
+</sytle>
+
+<style scoped lang="scss">
+.opration-icon {
+  background-color: #f1f1f1;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 20px;
+  margin-right: 5px;
+  display: inline-block;
+  .el-icon {
+    color: #6a6a6a;
+    font-size: 12px;
+  }
+}
+.delete {
+  margin-right: 0;
+}
+.actived {
+  .custom-tree-opration {
+    display: inline-block !important;
+  }
+}
+.custom-tree-node {
+  min-width: 200px;
+  .plus {
+    &:hover {
+      background-color: #5473e6 !important;
+      .el-icon {
+        color: #fff;
+      }
+    }
+  }
+  .edit-pen {
+    &:hover {
+      background-color: #f5b900 !important;
+      .el-icon {
+        color: #fff;
+      }
+    }
+  }
+  .delete {
+    &:hover {
+      background-color: #e85a5a !important;
+      .el-icon {
+        color: #fff;
+      }
+    }
+  }
+  .custom-tree-opration {
+    display: none;
+  }
+}
+.edit-root-name {
+  width: 150px;
+}
+.sub {
+  color: #55d66b;
+  margin-left: 5px;
+}
+.add-root-node {
+  margin-top: 10px;
+  height: 30px;
+  line-height: 30px;
+  img {
+    position: relative;
+    top: 5px;
+  }
+  :deep(.el-input__inner) {
+    height: 30px;
+    line-height: 30px;
+  }
+}
+:deep(.el-tree-node__content) {
+  height: auto;
+  flex-wrap: wrap;
+  line-height: 30px;
+}
+.no-flex {
+  flex-direction: column;
+  width: 65%;
+  img {
+    margin-left: 42px;
+  }
+  span {
+    margin-left: 5px;
+  }
+}
+.flex {
+  display: flex;
+  .add-submit {
+    cursor: pointer;
+  }
+}
+.opration {
+  display: flex;
+  .el-input {
+    :deep(.el-input__inner) {
+      height: 30px;
+      line-height: 30px;
+      border-radius: 0;
+      border-color: #ccc;
+    }
+    :deep(.el-input__suffix) {
+      right: 18px;
+      color: #000;
+    }
+  }
+  .icon {
+    width: 12px;
+    height: 12px;
+    margin-right: 10px;
+  }
+  .search-input {
+    flex: 1;
+  }
+  .el-button {
+    width: 70px;
+    height: 30px;
+    border-radius: 0;
+    color: #000;
+    border-color: #ccc;
+  }
+}
+
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  color: rgba($color: #000000, $alpha: 0.5);
+  .last.icon {
+    margin-right: 0;
+  }
+}
+
+.the-tree {
+  margin-top: 15px;
+}
+
+.folder {
+  width: 20px;
+  height: 16px;
+  margin-right: 5px;
+  position: relative;
+  top: 2px;
+}
+
+.add-btn {
+  margin-left: 10px;
+  width: 70px;
+  height: 30px;
+  border-radius: 0;
+  background-color: #f2f2f6;
+  color: #000;
+  border: 0;
+  &:hover {
+    background-color: #5473e6;
+    color: #fff;
+  }
+}
+
+.search-input {
+  :deep(.el-input__wrapper) {
+    height: 30px;
+    border-radius: 0;
+    background-color: #f2f2f6 !important;
+    box-shadow: unset !important;
+  }
+}
+</style>
-- 
Gitee


From ec345138900a81f3618216c1f5499dacc3972eb3 Mon Sep 17 00:00:00 2001
From: chenxiaofeng <chenxiaofeng@yzbdl.ac.cn>
Date: Thu, 18 Aug 2022 02:06:58 +0000
Subject: [PATCH 3/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20src/?=
 =?UTF-8?q?views/TaskSchedule/TaskResources/components/Operation.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskResources/components/Operation.vue    | 378 ------------------
 1 file changed, 378 deletions(-)
 delete mode 100644 src/views/TaskSchedule/TaskResources/components/Operation.vue

diff --git a/src/views/TaskSchedule/TaskResources/components/Operation.vue b/src/views/TaskSchedule/TaskResources/components/Operation.vue
deleted file mode 100644
index 4356d29..0000000
--- a/src/views/TaskSchedule/TaskResources/components/Operation.vue
+++ /dev/null
@@ -1,378 +0,0 @@
-<!-- Copyright (c) 2022 渝州大数据实验室
- *
- * Lanius is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- *
- *     http://license.coscl.org.cn/MulanPSL2
- *
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
--->
-<!-- 
-* @desc:任务编排新增弹窗
-* @fileName:Operation.vue
-* @author:chenxiaofeng@yzbdl.ac.cn
-* @date:2022-4-15
-!-->
-<script setup lang="ts">
-import { onMounted, reactive, ref } from "vue";
-import { ElMessage, FormInstance } from "element-plus";
-import TreeDialog from "./tree-dialog.vue";
-import { showErrorMessage } from "../../../../common/message";
-import { getCurrentInstance } from "vue";
-const { proxy } = getCurrentInstance() as any;
-
-const props = defineProps({
-  // 保存方法回调
-  saveResource: Function as any,
-  // 修改方法回调
-  editResource: Function as any,
-  // 新增或编辑文字
-  addOrEdit: String,
-  // 编辑时传回的当前行数据
-  oneUserInfo: Object,
-});
-
-// 资源类型值
-let resourceLib: any = [];
-
-/**
- * 任务资源数据
- */
-const groupTreeList = reactive({
-  treeList: [] as any,
-  treeDialog: false,
-  resourceValue: "",
-  resourceLibOptions: [] as any,
-});
-
-const formSize: any = ref("default");
-const editId = ref("");
-const ruleFormRef = ref<FormInstance>();
-
-/**
- * 表单数据
- */
-const ruleForm = reactive({
-  resourceType: "",
-  resourceConfigId: "",
-  groupId: "",
-  resourceName: "",
-  resourcePath: "",
-  resourceAccountName: "",
-  resourcePassword: "",
-});
-const labelPosition = ref("top");
-
-/**
- * 定义校验规则
- */
-const rules: any = reactive({
-  resourceName: [
-    { required: true, message: "请输入资源名称", trigger: "blur" },
-    { max: 64, message: "资源名称最多能输入64个字符", trigger: "blur" },
-  ],
-  resourceConfigId: [
-    { required: true, message: "请选择资源库", trigger: "blur" },
-  ],
-  resourceType: [
-    { required: true, message: "请选择资源类型", trigger: "blur" },
-  ],
-  resourcePath: [{ required: true, message: "请选择资源", trigger: "blur" }],
-  resourceAccountName: [
-    { required: true, message: "请输入任务资源账户名", trigger: "blur" },
-    { max: 64, message: "任务资源账户名最多能输入64个字符", trigger: "blur" },
-  ],
-  resourcePassword: [
-    { required: true, message: "请输入任务资源密码", trigger: "blur" },
-    {
-      min: 1,
-      max: 20,
-      message: "任务资源密码位数必须是1-20个字符",
-      trigger: "blur",
-    },
-  ],
-});
-
-/**
- * 提交表单
- * @reture viod
- */
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return;
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      let saveObj: { [key: string]: any } = {
-        resourceType: ruleForm.resourceType,
-        resourceConfigId: ruleForm.resourceConfigId,
-        groupId: ruleForm.groupId,
-        resourceName: ruleForm.resourceName,
-        resourcePath: ruleForm.resourcePath,
-        resourceAccountName: ruleForm.resourceAccountName,
-        resourcePassword: ruleForm.resourcePassword,
-      };
-      if (props.addOrEdit === "新增") {
-        props.saveResource(saveObj);
-      } else {
-        saveObj.id = editId.value;
-        props.editResource(saveObj);
-      }
-    } else {
-      console.log("error submit!", fields);
-    }
-  });
-};
-
-/**
- * 获取资源库列表
- * @reture viod
- */
-const getResourceLibList = () => {
-  const res = proxy.$HTTP.post({
-    url: "/resource/taskResourceConfig/query",
-    params: {
-      page: 1,
-      size: 500,
-    },
-    data: {
-      connectName: "",
-      status: "1",
-    },
-  });
-  res
-    .then((res: any) => {
-      if (res.isOk) {
-        resourceLib = res.data.records;
-        groupTreeList.resourceLibOptions = resourceLib.map((item: any) => ({
-          value: item.id,
-          label: item.connectName,
-        }));
-      }
-    })
-    .catch((response: any) => {
-      showErrorMessage({ message: response.data });
-    });
-};
-
-/**
- * 获取资源配置列表
- * @param id 资源ID
- * @reture viod
- */
-const getGroupList = (id: string) => {
-  ruleForm.resourcePath = "";
-  const res = proxy.$HTTP.get({
-    url: "/resource/taskResource/getExternalResourceTree",
-    params: {
-      resourceConfigId: id,
-    },
-  });
-  res
-    .then((res: any) => {
-      if (res.code === 200) {
-        groupTreeList.treeList = res.data;
-        const nodeData: any = {
-          id: "0",
-          nodeName: "根节点任务资源",
-          path: "",
-          children: [],
-        };
-        groupTreeList.treeList.unshift(nodeData);
-      }
-    })
-    .catch((response: any) => {
-      showErrorMessage({ message: response.data });
-    });
-};
-
-/**
- * 获取资源路径数据
- * @param path 资源路径
- * @reture viod
- */
-const getGroupInfo = (path: string) => {
-  ruleForm.resourcePath = path;
-  groupTreeList.treeDialog = false;
-};
-
-/**
- * 打开选择资源弹窗
- * @reture viod
- */
-const chooseResource = () => {
-  if (ruleForm.resourceConfigId === "") {
-    ElMessage.info("请先选择资源库!");
-  } else {
-    groupTreeList.treeDialog = true;
-  }
-};
-
-onMounted(() => {
-  getResourceLibList();
-  let userInfo = { ...props.oneUserInfo };
-  if (JSON.stringify(props.oneUserInfo) !== "{}") {
-    getGroupList(userInfo.resourceConfigId);
-    editId.value = userInfo.id;
-    ruleForm.resourceType = userInfo.resourceType.toString();
-    ruleForm.resourceConfigId = userInfo.resourceConfigId;
-    ruleForm.groupId = userInfo.groupId;
-    ruleForm.resourceAccountName = JSON.parse(
-      userInfo.resourceContent
-    ).repo_account;
-    ruleForm.resourcePassword = JSON.parse(
-      userInfo.resourceContent
-    ).repo_password;
-    ruleForm.resourceName = userInfo.resourceName;
-    ruleForm.resourcePath = JSON.parse(userInfo.resourceContent).repo_entrance;
-    groupTreeList.resourceValue = JSON.parse(userInfo.resourceContent)
-      .repo_entrance.split(".")[0]
-      .split("/")
-      .pop();
-  }
-});
-</script>
-
-<template>
-  <div class="operation">
-    <el-form
-      ref="ruleFormRef"
-      :model="ruleForm"
-      :rules="rules"
-      :label-position="labelPosition"
-      label-width="120px"
-      class="demo-ruleForm"
-      :size="formSize"
-    >
-      <el-form-item label="资源名称" prop="resourceName">
-        <el-input
-          v-model="ruleForm.resourceName"
-          size="large"
-          placeholder="请输入资源名称"
-        />
-      </el-form-item>
-      <el-form-item label="资源库" prop="resourceConfigId">
-        <el-select-v2
-          v-model="ruleForm.resourceConfigId"
-          size="large"
-          placeholder="请选择资源库"
-          @change="getGroupList"
-          :options="groupTreeList.resourceLibOptions"
-        ></el-select-v2>
-      </el-form-item>
-      <el-form-item label="资源类型" prop="resourceType">
-        <el-select
-          v-model="ruleForm.resourceType"
-          size="large"
-          clearable
-          placeholder="请选择资源类型"
-          @change="ruleForm.resourcePath = ''"
-        >
-          <el-option label="作业" value="1"></el-option>
-          <el-option label="转换" value="2"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        label="任务资源账户名"
-        v-show="ruleForm.resourceType !== ''"
-        prop="resourceAccountName"
-      >
-        <el-input
-          v-model="ruleForm.resourceAccountName"
-          size="large"
-          placeholder="请输入任务资源账户名"
-        />
-      </el-form-item>
-      <el-form-item
-        label="任务资源密码"
-        v-show="ruleForm.resourceType !== ''"
-        prop="resourcePassword"
-      >
-        <el-input
-          v-model="ruleForm.resourcePassword"
-          size="large"
-          type="password"
-          placeholder="请输入任务资源密码"
-        />
-      </el-form-item>
-      <el-form-item label="资源" prop="resourcePath" :inline-message="true">
-        <el-col :span="20">
-          <el-input
-            v-model="ruleForm.resourcePath"
-            :disabled="true"
-            placeholder="请选择资源"
-            size="large"
-          ></el-input>
-        </el-col>
-        <el-col :span="4" class="tar">
-          <el-button size="large" @click="chooseResource">选择资源</el-button>
-        </el-col>
-      </el-form-item>
-      <el-form-item class="ClickButton">
-        <el-button @click="submitForm(ruleFormRef)">确定</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-  <!-- 操作弹窗 -->
-  <el-dialog
-    v-model="groupTreeList.treeDialog"
-    v-if="groupTreeList.treeDialog"
-    title="选择资源"
-    :width="740"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <TreeDialog
-      :groupTreeList="groupTreeList.treeList"
-      :resourceConfigId="ruleForm.resourceConfigId"
-      :resourceType="ruleForm.resourceType"
-      :resourceValue="groupTreeList.resourceValue"
-      :getGroupInfo="getGroupInfo"
-    />
-  </el-dialog>
-</template>
-
-<style>
-.el-dialog__header {
-  border-bottom: 1px solid #dedede;
-  margin-right: 0;
-}
-</style>
-<style scoped lang="scss">
-.tar {
-  text-align: right;
-}
-:deep(.el-form-item__label) {
-  font-family: PingFang SC;
-  font-weight: 700;
-  color: #000000;
-  font-size: 14px;
-}
-:deep(.el-input) {
-  height: 40px;
-  background-color: #ffffff;
-}
-:deep(.el-textarea) {
-  height: 100px;
-  background-color: #ffffff;
-  .el-textarea__inner {
-    height: 100px;
-  }
-}
-.ClickButton {
-  :deep(.el-form-item__content) {
-    display: flex;
-    justify-content: flex-end;
-    .el-button {
-      height: 40px;
-      background-color: #ffffff;
-      border: 1px solid;
-      border-color: #cccccc;
-    }
-  }
-}
-.el-select,
-.el-select-v2 {
-  width: 100%;
-}
-</style>
-- 
Gitee


From 51521f56f84e63a58a403ca89614efc00466666c Mon Sep 17 00:00:00 2001
From: chenxiaofeng <chenxiaofeng@yzbdl.ac.cn>
Date: Thu, 18 Aug 2022 02:07:26 +0000
Subject: [PATCH 4/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20src/?=
 =?UTF-8?q?components/common/Pagination.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Pagination.vue | 110 ---------------------------
 1 file changed, 110 deletions(-)
 delete mode 100644 src/components/common/Pagination.vue

diff --git a/src/components/common/Pagination.vue b/src/components/common/Pagination.vue
deleted file mode 100644
index b868dfa..0000000
--- a/src/components/common/Pagination.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<!-- Copyright (c) 2022 渝州大数据实验室
- *
- * Lanius is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- *
- *     http://license.coscl.org.cn/MulanPSL2
- *
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
- -->
-<!-- 
-* @desc:日志分页公共组件
-* @fileName:LogsPagination.vue
-* @author:chenxiaofeng@yzbdl.ac.cn
-* @date:2022-4-7
-!-->
-<script setup lang="ts">
-import { ref } from "vue";
-import zhCn from "element-plus/lib/locale/lang/zh-cn";
-const props = defineProps({
-  // 当前分页页面传递
-  getCurrentPageNumber: Function,
-  // 每页显示条数
-  pageSize: {
-    type: Number,
-    default: 10,
-  },
-  // 总数
-  total: {
-    type: Number,
-    default: 100,
-  },
-});
-// 选中页数
-const currentPage = ref(1);
-
-//定义中文zh-cn
-const locale = zhCn;
-
-/**
- * 改变每页条数方法
- * @param pageNumber 每页显示条数
- * @reture viod
- */
-const handleSizeChange = (pageNumber: number) => {
-  console.log(`${pageNumber} items per page`);
-};
-
-/**
- * 选中页码方法
- * @param pageNumber 每页显示条数
- * @reture viod
- */
-const handleCurrentChange = (pageNumber: number) => {
-  props.getCurrentPageNumber?.(pageNumber);
-};
-</script>
-
-<template>
-  <!-- 分页 -->
-  <div class="page-pagination">
-    <el-config-provider :locale="locale">
-      <el-pagination
-        v-model:currentPage="currentPage"
-        background
-        :page-size="props.pageSize"
-        layout="prev, pager, next, total"
-        :total="props.total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        prev-text="上一页"
-        next-text="下一页"
-      />
-    </el-config-provider>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.page-pagination {
-  margin-top: 15px;
-  display: flex;
-  justify-content: end;
-  :deep(.number) {
-    padding: 0 !important;
-    background-color: unset !important;
-  }
-  :deep(.btn-prev) {
-    color: #000;
-    padding: 0 10px;
-    background-color: #f2f2f6 !important;
-    border-radius: 2px;
-  }
-  :deep(.btn-next) {
-    color: #000;
-    background-color: #f2f2f6 !important;
-    border-radius: 2px;
-    padding: 0 10px;
-  }
-  :deep(.el-pagination__total) {
-    margin-left: 10px;
-  }
-  :deep(.more) {
-    background-color: unset !important;
-  }
-}
-:deep(.number.is-active) {
-  background-color: #5473e6 !important;
-}
-</style>
-- 
Gitee


From df40f756f1b50050e703eae6669ee984f36f850c Mon Sep 17 00:00:00 2001
From: chenxiaofeng <chenxiaofeng@yzbdl.ac.cn>
Date: Thu, 18 Aug 2022 02:10:14 +0000
Subject: [PATCH 5/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20src/?=
 =?UTF-8?q?components/common/Tree.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Tree.vue | 547 ---------------------------------
 1 file changed, 547 deletions(-)
 delete mode 100644 src/components/common/Tree.vue

diff --git a/src/components/common/Tree.vue b/src/components/common/Tree.vue
deleted file mode 100644
index 6c7c7c2..0000000
--- a/src/components/common/Tree.vue
+++ /dev/null
@@ -1,547 +0,0 @@
-<!-- Copyright (c) 2022 渝州大数据实验室
- *
- * Lanius is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- *
- *     http://license.coscl.org.cn/MulanPSL2
- *
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
- -->
-<!-- 
-* @desc:树形菜单
-* @fileName:Tree.vue
-* @author:chenxiaofeng@yzbdl.ac.cn
-* @date:2022-4-8
-!-->
-<script setup lang="ts">
-import { onMounted, ref, watch } from "vue";
-import {
-  Search,
-  CircleCheckFilled,
-  Plus,
-  EditPen,
-  Delete,
-} from "@element-plus/icons-vue";
-import type Node from "element-plus/es/components/tree/src/model/node";
-import { ElMessage, ElTree } from "element-plus";
-import { TreeNodeData } from "element-plus/lib/components/tree/src/tree.type";
-import "element-plus/theme-chalk/el-tree.css";
-
-const props = defineProps({
-  // 树数据
-  dataSource: {
-    type: Array as any,
-    default: [],
-  },
-  // 回传选中的节点ID
-  getTableList: Function as any,
-  // 树加载动画
-  isTreeLoading: {
-    type: Boolean,
-    default: false,
-  },
-  //添加节点方法实现
-  addNode: Function,
-  //删除节点方法实现
-  delNode: Function,
-  //修改节点方法实现
-  editNode: Function,
-});
-// 定义树形菜单数据类型
-interface Tree {
-  id: number;
-  groupName: string;
-  children?: Tree[];
-}
-
-// 定义搜索名称
-const searchValue = ref("");
-const treeRef = ref<InstanceType<typeof ElTree>>();
-// 添加节点输入框值
-let addOrEdit = ref("");
-// 添加框隐藏显示标识
-let isAdd = ref(false);
-// 子节点ID存放变量-供添加节点使用
-let childNodeId = ref(0);
-// 子节点内容变量
-let childNodeValue = ref("");
-// 新增子节点，存放父节点信息
-let childPid = ref("");
-// 子节点ID存放变量-供修改节点使用
-let editChildNOdeId = ref(0);
-// 编辑标识
-let isEdit = ref(true);
-// 编辑节点值存放变量
-let editChildValue = ref("");
-// 点击树每一行存当前ID
-let iconShowId = ref(0);
-
-/**
- * 监听输入值的改变
- */
-watch(searchValue, (val) => {
-  treeRef.value!.filter(val);
-});
-
-/**
- * 关闭已经显示的增加节点输入框
- */
-document.addEventListener("click", (e: any) => {
-  if (e.target.className === "el-input__inner") return;
-  isAdd.value = false;
-  childNodeId.value = 0;
-  editChildNOdeId.value = 0;
-});
-
-/**
- * 通过过滤的值筛选树形菜单
- * @param value 关键词
- * @param data 树数据
- * @reture 已过滤数据
- */
-const filterNode = (value: string, data: TreeNodeData) => {
-  if (!value) return true;
-  return data.groupName.includes(value);
-};
-
-/**
- * 根节点内容添加
- * @reture viod
- */
-const addRootNode = () => {
-  if (addOrEdit.value === "") {
-    ElMessage({
-      message: "节点内容不能为空",
-      type: "info",
-    });
-  } else {
-    isAdd.value = false;
-    const item = {
-      groupName: addOrEdit.value,
-      pid: "",
-    };
-    props.addNode?.(item);
-  }
-};
-
-/**
- * 子节点内容添加
- * @reture viod
- */
-const addChileNode = () => {
-  if (childNodeValue.value === "") {
-    ElMessage.error("节点内容不能为空");
-  } else {
-    const item = {
-      groupName: childNodeValue.value,
-      pid: childPid.value,
-    };
-    props.addNode?.(item);
-  }
-  childNodeId.value = 0;
-};
-
-/**
- * 添加方法
- * @param data 当前行数据
- * @reture viod
- */
-const append = (data: Tree) => {
-  childPid.value = data.id.toString();
-  childNodeValue.value = "";
-  childNodeId.value = data.id;
-};
-
-/**
- * 编辑方法
- * @param node 当前节点信息
- * @param data 当前行数据
- * @reture viod
- */
-const edit = (node: Node, data: Tree) => {
-  editChildNOdeId.value = data.id;
-  isEdit.value = true;
-  editChildValue.value = data.groupName.split("(")[0];
-};
-
-/**
- * 移除方法
- * @param data 当前行数据
- * @reture viod
- */
-const remove = (data: any) => {
-  props.delNode?.(data.id);
-};
-
-/**
- * 修改节点方法
- * @reture viod
- */
-const editNodeSubmit = () => {
-  if (editChildValue.value === "") {
-    ElMessage.info("节点内容不能为空!");
-    return;
-  }
-  let item = {
-    groupName: editChildValue.value,
-    id: editChildNOdeId.value,
-  };
-  props.editNode?.(item);
-  editChildNOdeId.value = 0;
-  isEdit.value = true;
-  editChildValue.value = "";
-};
-
-const defaultProps = {
-  children: "children",
-  label: "groupName",
-};
-
-/**
- * 节点点击方法
- * @param data 节点数据
- * @reture viod
- */
-const nodeClick = (data: Tree) => {
-  iconShowId.value = data.id;
-  props.getTableList(data.id);
-};
-
-/**
- * 根据等级截取显示长度
- * @param data 节点数据
- * @reture viod
- */
-const ellicpis = (data: any) => {
-  if (!data.groupName) return "";
-  if (data.level === 1 && data.groupName.length >= 13) {
-    return data.groupName.slice(0, 13) + "...";
-  } else if (data.level === 2 && data.groupName.length >= 12) {
-    return data.groupName.slice(0, 12) + "...";
-  }
-  if (data.level === 3 && data.groupName.length >= 10) {
-    return data.groupName.slice(0, 10) + "...";
-  }
-  if (data.level === 4 && data.groupName.length >= 9) {
-    return data.groupName.slice(0, 9) + "...";
-  }
-  if (data.level === 5 && data.groupName.length >= 8) {
-    return data.groupName.slice(0, 8) + "...";
-  }
-  return data.groupName;
-};
-
-onMounted(() => {
-  setTimeout(() => {
-    if (props.dataSource.length < 1) return;
-    treeRef.value?.setCurrentKey(props.dataSource[0].id);
-    iconShowId.value = props.dataSource[0].id;
-  }, 100);
-});
-</script>
-
-<template>
-  <!-- 操作区域 -->
-  <div class="opration">
-    <el-input
-      class="search-input"
-      v-model="searchValue"
-      placeholder="请输入分组名称"
-      :suffix-icon="Search"
-    ></el-input>
-    <el-button
-      class="add-btn"
-      @click.stop="
-        isAdd = true;
-        addOrEdit = '';
-      "
-      :icon="Plus"
-      >新增</el-button
-    >
-  </div>
-  <!-- 新增、编辑 -->
-  <div class="flex add-root-node" v-if="isAdd">
-    <img class="folder" src="../../assets/img/task-resource/folder.png" />
-    <el-input
-      v-model="addOrEdit"
-      placeholder="请输入根节点"
-      maxlength="64"
-    ></el-input>
-    <span @click="addRootNode" class="add-submit"
-      ><el-icon class="sub"><circle-check-filled /></el-icon
-    ></span>
-  </div>
-  <!-- 树形页面 -->
-  <div class="the-tree">
-    <el-tree
-      ref="treeRef"
-      v-loading="props.isTreeLoading"
-      :data="props.dataSource"
-      :props="defaultProps"
-      node-key="id"
-      :highlight-current="true"
-      default-expand-all
-      :filter-node-method="filterNode"
-      :expand-on-click-node="false"
-      v-if="props.dataSource.length > 0"
-    >
-      <template #default="{ node, data }">
-        <!-- 树形菜单自定义dom -->
-        <span
-          class="custom-tree-node"
-          @click="nodeClick(data)"
-          :class="iconShowId === data.id ? 'actived' : ''"
-        >
-          <!-- 正常显示节点内容 -->
-          <span class="word" v-if="data.id !== editChildNOdeId && isEdit"
-            ><img
-              class="folder"
-              src="../../assets/img/task-resource/folder.png"
-            />
-            <lanius-tooltip :content="node.label">
-              {{ ellicpis(data) }}</lanius-tooltip
-            ></span
-          >
-          <!-- 点击编辑后显示输入框 -->
-          <span v-if="data.id === editChildNOdeId && isEdit">
-            <img
-              class="folder"
-              src="../../assets/img/task-resource/folder.png"
-            />
-            <el-input
-              class="edit-root-name"
-              maxlength="64"
-              v-model="editChildValue"
-            ></el-input>
-            <span class="add-submit" @click="editNodeSubmit"
-              ><el-icon class="sub"><circle-check-filled /></el-icon
-            ></span>
-          </span>
-          <span class="custom-tree-opration">
-            <!-- 添加节点 -->
-            <a
-              class="opration-icon plus"
-              v-if="data.level !== 5"
-              @click.stop="append(data)"
-            >
-              <el-icon class="custom-icon-plus"><plus /></el-icon>
-            </a>
-            <!-- 编辑节点 -->
-            <a class="opration-icon edit-pen" @click.stop="edit(node, data)">
-              <el-icon class="custom-icon-edit"><EditPen /></el-icon>
-            </a>
-            <!-- 删除节点 -->
-            <lanius-pop-confirm
-              title="删除提示"
-              :content="'确定删除分组?'"
-              @confirm="remove(data)"
-            >
-              <div style="display: inline">
-                <span class="opration-icon delete">
-                  <el-icon class="custom-icon-delete"><delete /></el-icon>
-                </span>
-              </div>
-            </lanius-pop-confirm>
-          </span>
-        </span>
-        <!-- 子节点添加dom -->
-        <div class="no-flex" v-if="data.id === childNodeId">
-          <img class="folder" src="../../assets/img/task-resource/folder.png" />
-          <el-input
-            class="edit-root-name"
-            maxlength="64"
-            v-model="childNodeValue"
-          ></el-input>
-          <span @click="addChileNode"
-            ><el-icon class="sub"><circle-check-filled /></el-icon
-          ></span>
-        </div>
-      </template>
-    </el-tree>
-    <!-- 数据为空显示 -->
-    <template v-if="props.dataSource.length === 0" slot="empty">
-      <el-empty description="暂无数据" />
-    </template>
-  </div>
-</template>
-
-<sytle lang="scss">
-.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
-  background-color: #f5f7fa !important;
-}
-</sytle>
-
-<style scoped lang="scss">
-.opration-icon {
-  background-color: #f1f1f1;
-  width: 20px;
-  height: 20px;
-  border-radius: 50%;
-  text-align: center;
-  line-height: 20px;
-  margin-right: 5px;
-  display: inline-block;
-  .el-icon {
-    color: #6a6a6a;
-    font-size: 12px;
-  }
-}
-.delete {
-  margin-right: 0;
-}
-.actived {
-  .custom-tree-opration {
-    display: inline-block !important;
-  }
-}
-.custom-tree-node {
-  min-width: 200px;
-  .plus {
-    &:hover {
-      background-color: #5473e6 !important;
-      .el-icon {
-        color: #fff;
-      }
-    }
-  }
-  .edit-pen {
-    &:hover {
-      background-color: #f5b900 !important;
-      .el-icon {
-        color: #fff;
-      }
-    }
-  }
-  .delete {
-    &:hover {
-      background-color: #e85a5a !important;
-      .el-icon {
-        color: #fff;
-      }
-    }
-  }
-  .custom-tree-opration {
-    display: none;
-  }
-}
-.edit-root-name {
-  width: 150px;
-}
-.sub {
-  color: #55d66b;
-  margin-left: 5px;
-}
-.add-root-node {
-  margin-top: 10px;
-  height: 30px;
-  line-height: 30px;
-  img {
-    position: relative;
-    top: 5px;
-  }
-  :deep(.el-input__inner) {
-    height: 30px;
-    line-height: 30px;
-  }
-}
-:deep(.el-tree-node__content) {
-  height: auto;
-  flex-wrap: wrap;
-  line-height: 30px;
-}
-.no-flex {
-  flex-direction: column;
-  width: 65%;
-  img {
-    margin-left: 42px;
-  }
-  span {
-    margin-left: 5px;
-  }
-}
-.flex {
-  display: flex;
-  .add-submit {
-    cursor: pointer;
-  }
-}
-.opration {
-  display: flex;
-  .el-input {
-    :deep(.el-input__inner) {
-      height: 30px;
-      line-height: 30px;
-      border-radius: 0;
-      border-color: #ccc;
-    }
-    :deep(.el-input__suffix) {
-      right: 18px;
-      color: #000;
-    }
-  }
-  .icon {
-    width: 12px;
-    height: 12px;
-    margin-right: 10px;
-  }
-  .search-input {
-    flex: 1;
-  }
-  .el-button {
-    width: 70px;
-    height: 30px;
-    border-radius: 0;
-    color: #000;
-    border-color: #ccc;
-  }
-}
-
-.custom-tree-node {
-  flex: 1;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  font-size: 14px;
-  color: rgba($color: #000000, $alpha: 0.5);
-  .last.icon {
-    margin-right: 0;
-  }
-}
-
-.the-tree {
-  margin-top: 15px;
-}
-
-.folder {
-  width: 20px;
-  height: 16px;
-  margin-right: 5px;
-  position: relative;
-  top: 2px;
-}
-
-.add-btn {
-  margin-left: 10px;
-  width: 70px;
-  height: 30px;
-  border-radius: 0;
-  background-color: #f2f2f6;
-  color: #000;
-  border: 0;
-  &:hover {
-    background-color: #5473e6;
-    color: #fff;
-  }
-}
-
-.search-input {
-  :deep(.el-input__wrapper) {
-    height: 30px;
-    border-radius: 0;
-    background-color: #f2f2f6 !important;
-    box-shadow: unset !important;
-  }
-}
-</style>
-- 
Gitee


From 95ac4661976f425d0489a936938017d391f2db48 Mon Sep 17 00:00:00 2001
From: chenxiaofeng <chenxiaofeng@yzbdl.ac.cn>
Date: Thu, 18 Aug 2022 02:11:36 +0000
Subject: [PATCH 6/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20src/?=
 =?UTF-8?q?views/TaskSchedule/TaskArrangement/components/Operation.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskArrangement/components/Operation.vue  | 589 ------------------
 1 file changed, 589 deletions(-)
 delete mode 100644 src/views/TaskSchedule/TaskArrangement/components/Operation.vue

diff --git a/src/views/TaskSchedule/TaskArrangement/components/Operation.vue b/src/views/TaskSchedule/TaskArrangement/components/Operation.vue
deleted file mode 100644
index f3f85aa..0000000
--- a/src/views/TaskSchedule/TaskArrangement/components/Operation.vue
+++ /dev/null
@@ -1,589 +0,0 @@
-<!-- Copyright (c) 2022 渝州大数据实验室
- *
- * Lanius is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- *
- *     http://license.coscl.org.cn/MulanPSL2
- *
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
--->
-<!-- 
-* @desc:任务编排新增弹窗
-* @fileName:Operation.vue
-* @author:chenxiaofeng@yzbdl.ac.cn
-* @date:2022-4-15
-!-->
-<script setup lang="ts">
-import { onMounted, reactive, ref } from "vue";
-import { ElMessage, FormInstance } from "element-plus";
-import { Delete } from "@element-plus/icons-vue";
-import { getCurrentInstance } from "vue";
-const { proxy } = getCurrentInstance() as any;
-
-const props = defineProps({
-  // 保存方法回调
-  saveArrangement: Function as any,
-  // 编辑方法回调
-  editArrangement: Function as any,
-  // 新增或修改标识
-  addOrEdit: String,
-  // 点击修改后的单条数据值
-  oneUserInfo: Object,
-});
-
-const listData = reactive({
-  serverNodeList: [] as any, //服务节点下拉选项列表值
-  groupTree: [] as any, //资源树下拉选项值
-  resouceList: [] as any, //资源列表选项值
-  taskList: [] as any, //任务配置参数列表
-  groupOptions: [], //分组下拉数据
-  groupTreeValue: "", //任务资源
-});
-
-/**
- * 定义任务资源参数类型
- */
-const paramTypeList = [
-  { name: "字符串", value: "String" },
-  { name: "数字", value: "Number" },
-  { name: "JSON对象", value: "JsonObject" },
-  { name: "数组", value: "Arr" },
-  { name: "布尔", value: "Boolean" },
-  { name: "Null", value: "Null" },
-];
-
-/**
- * 定义日志等级枚举
- */
-const logLevel = [
-  { name: "基本(Basic)", value: 3 },
-  { name: "详细(Detailed)", value: 4 },
-  { name: "调试(Debug)", value: 5 },
-  { name: "行级(Row level)", value: 6 },
-  { name: "最小(Minimal)", value: 2 },
-  { name: "错误(ERROR)", value: 1 },
-  { name: "无(Nothing)", value: 0 },
-];
-const formSize: any = ref("default");
-const ruleFormRef = ref<FormInstance>();
-/**
- * 表单数据
- */
-let ruleForm: any = reactive({
-  taskName: "",
-  taskCron: "",
-  serverProgramId: "",
-  taskResourceId: "",
-  jsonConfig: "",
-  groupId: "",
-  logLevel: "",
-  remark: "",
-  status: 2,
-});
-
-const labelPosition = ref("top");
-
-/**
- * 定义校验规则
- */
-const rules: any = reactive({
-  taskName: [
-    { required: true, message: "请输入任务名称", trigger: "blur" },
-    { max: 64, message: "任务名称最多能输入64个字符", trigger: "blur" },
-  ],
-  taskCron: [
-    { required: true, message: "cron表达式不能为空", trigger: "change" },
-  ],
-  serverProgramId: [
-    { required: true, message: "请选择服务节点", trigger: "change" },
-  ],
-  taskResourceId: [
-    { required: true, message: "请选择任务资源", trigger: "change" },
-  ],
-  groupId: [{ required: true, message: "请选择所在分组", trigger: "change" }],
-  logLevel: [{ required: true, message: "请选择日志等级", trigger: "change" }],
-  status: [{ required: true, message: "请选择启用状态", trigger: "change" }],
-});
-
-/**
- * 提交表单
- * @reture viod
- */
-const submitForm = async (formEl: FormInstance | undefined) => {
-  listData.taskList.length === 0
-    ? (ruleForm.jsonConfig = "")
-    : (ruleForm.jsonConfig = JSON.stringify(listData.taskList));
-  if (!formEl) return;
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      props.addOrEdit === "新增"
-        ? props.saveArrangement(ruleForm)
-        : props.editArrangement(ruleForm);
-    } else {
-      console.log("error submit!", fields);
-    }
-  });
-};
-
-/**
- * 获取服务节点
- * @reture viod
- */
-const getServerNodeList = () => {
-  const res = proxy.$HTTP.get({
-    url: `/task/plan/serverProgramList`,
-  });
-  res
-    .then((res: any) => {
-      if (res.isOk) {
-        listData.serverNodeList = res.data;
-      }
-    })
-    .catch((response: any) => {
-      ElMessage.error(response.data);
-    });
-};
-
-/**
- * 获取资源树
- * @reture viod
- */
-const getGroupTree = () => {
-  const res = proxy.$HTTP.get({
-    url: `/task/plan/taskResourceGroupTree`,
-  });
-  res
-    .then((res: any) => {
-      if (res.isOk) {
-        listData.groupTree = res.data;
-      }
-    })
-    .catch((response: any) => {
-      ElMessage.error(response.data);
-    });
-};
-
-/**
- * 任务资源下拉选择，根据资源分组ID获取资源列表
- * @param data 选择中树的节点信息
- * @reture viod
- */
-const getGroupOne = (data: any) => {
-  listData.resouceList = [];
-  ruleForm.taskResourceId = "";
-  const res = proxy.$HTTP.get({
-    url: `/task/plan/taskResourceList/` + data.id,
-  });
-  res
-    .then((res: any) => {
-      if (res.isOk) {
-        listData.resouceList = res.data;
-      }
-    })
-    .catch((response: any) => {
-      ElMessage.error(response.data);
-    });
-};
-
-/**
- * 添加一行任务配置
- * @reture viod
- */
-const addConfigOne = () => {
-  let json = { paramName: "", paramType: "", paramValue: "" };
-  listData.taskList.push(json);
-};
-
-/**
- * 删除任务配置
- * @param index 删除任务的下标
- * @reture viod
- */
-const delConfigONe = (index: number) => {
-  listData.taskList.splice(index, 1);
-};
-
-/**
- * 获取分组
- * @reture viod
- */
-const getGroupList = () => {
-  const res = proxy.$HTTP.get({
-    url: `/task/plan/group/tree`,
-  });
-  res
-    .then((res: any) => {
-      if (res.isOk) {
-        listData.groupOptions = res.data;
-      }
-    })
-    .catch((response: any) => {
-      ElMessage.error(response.data);
-    });
-};
-
-/**
- * 获取分组值
- * @param id 删除任务的下标
- * @reture viod
- */
-const getGroupValue = (id: string) => {
-  ruleForm.groupId = id;
-};
-
-/**
- * 根据状态返回中文
- * @param s 状态数字
- * @reture 状态中文
- */
-const showStatus = (s: number) => {
-  if (s === 1) {
-    return "运行中";
-  } else if (s === 2) {
-    return "异常";
-  } else {
-    return "停止";
-  }
-};
-
-/**
- * 初始化加载
- */
-onMounted(() => {
-  // 获取服务节点下拉选项值
-  getServerNodeList();
-  // 获取资源分组树下拉选项值
-  getGroupTree();
-  // 获取所在分组下拉选项值
-  getGroupList();
-  // 点击修改单条数据时，回显
-  setTimeout(() => {
-    let userInfo = { ...props.oneUserInfo };
-    if (JSON.stringify(props.oneUserInfo) !== "{}") {
-      getGroupOne({ id: userInfo.taskResourceGroupId });
-      userInfo.jsonConfig === ""
-        ? (ruleForm.taskName = [])
-        : (ruleForm.taskName = JSON.parse(userInfo.jsonConfig));
-      ruleForm.taskName = userInfo.taskName;
-      ruleForm.taskCron = userInfo.taskCron;
-      ruleForm.serverProgramId = userInfo.serverProgramId;
-      ruleForm.taskResourceId = userInfo.taskResourceId;
-      ruleForm.jsonConfig = userInfo.jsonConfig;
-      ruleForm.groupId = userInfo.groupId;
-      ruleForm.logLevel = userInfo.logLevel;
-      ruleForm.remark = userInfo.remark;
-      ruleForm.status = Number(userInfo.status);
-      ruleForm.id = userInfo.id;
-      listData.groupTreeValue = userInfo.taskResourceGroupId;
-      listData.taskList = JSON.parse(userInfo.jsonConfig);
-    }
-  }, 500);
-});
-
-const treeProps = {
-  label: "groupName",
-  value: "id",
-  children: "children",
-};
-
-const groupProps = {
-  label: "groupName",
-  value: "id",
-  children: "children",
-};
-const state = reactive({
-  cronPopover: false,
-  cron: "",
-});
-const changeCron = (val: string) => {
-  if (typeof val !== "string") return false;
-  ruleForm.taskCron = val;
-};
-const togglePopover = (bol: boolean) => {
-  state.cronPopover = bol;
-};
-</script>
-
-<template>
-  <div class="operation">
-    <el-form
-      ref="ruleFormRef"
-      :model="ruleForm"
-      :rules="rules"
-      :label-position="labelPosition"
-      label-width="120px"
-      class="demo-ruleForm"
-      :size="formSize"
-    >
-      <el-form-item label="任务名称" prop="taskName">
-        <el-input
-          v-model="ruleForm.taskName"
-          size="large"
-          maxlength="50"
-          placeholder="请输入任务名称"
-        />
-      </el-form-item>
-      <el-form-item label="执行周期" prop="taskCron">
-        <div class="cron">
-          <el-popover v-model:visible="state.cronPopover" width="700px">
-            <vue3Cron
-              @change="changeCron"
-              @close="togglePopover(false)"
-              max-height="400px"
-              i18n="cn"
-            ></vue3Cron>
-            <template #reference>
-              <el-input
-                @focus="togglePopover(true)"
-                v-model="ruleForm.taskCron"
-                clearable
-                size="large"
-                placeholder="请选择执行周期"
-              ></el-input>
-            </template>
-          </el-popover>
-        </div>
-      </el-form-item>
-      <el-form-item label="服务节点" prop="serverProgramId">
-        <el-select
-          v-model="ruleForm.serverProgramId"
-          class="m-2"
-          placeholder="请选择服务节点"
-          size="large"
-        >
-          <el-option
-            v-for="item in listData.serverNodeList"
-            :key="item.id"
-            :label="item.programName"
-            :value="item.id"
-            :disabled="item.status !== 1"
-          >
-            <span class="options-label">{{ item.programName }}</span
-            ><span class="options-status">{{ showStatus(item.status) }}</span>
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="任务资源" prop="taskResourceId">
-        <template #default="scope">
-          <div class="task-resource">
-            <el-tree-select
-              check-strictly
-              :props="treeProps"
-              node-key="id"
-              clearable
-              :data="listData.groupTree"
-              :default-expand-all="true"
-              v-model="listData.groupTreeValue"
-              class="task-resource-select"
-              placeholder="请选择分组资源"
-              @node-click="getGroupOne"
-            />
-            <el-select
-              v-model="ruleForm.taskResourceId"
-              class="task-resource-select"
-              placeholder="请选择资源"
-              size="large"
-            >
-              <el-option
-                v-for="item in listData.resouceList"
-                :key="item.id"
-                :label="item.resourceName"
-                :value="item.id"
-              />
-            </el-select>
-          </div>
-        </template>
-      </el-form-item>
-      <el-form-item
-        label="任务配置"
-        prop="jsonConfig"
-        :inline-message="false"
-        :show-message="false"
-      >
-        <template #default="scope">
-          <div class="config">
-            <div
-              class="task-config"
-              v-for="(item, indx) in listData.taskList"
-              :key="indx"
-            >
-              <el-input
-                v-model="item.paramName"
-                class="w-1"
-                clearable
-                maxlength="50"
-                size="large"
-                placeholder="请输入参数名称"
-              ></el-input>
-              <el-select
-                v-model="item.paramType"
-                class="w-1"
-                clearable
-                placeholder="请选择数据类型"
-                size="large"
-              >
-                <el-option
-                  v-for="item in paramTypeList"
-                  :key="item.value"
-                  :label="item.name"
-                  :value="item.value"
-                />
-              </el-select>
-              <el-input
-                size="large"
-                clearable
-                class="w-2"
-                maxlength="50"
-                v-model="item.paramValue"
-                placeholder="请输入参数值"
-              ></el-input>
-              <div @click="delConfigONe(indx)" class="op-icon">
-                <el-icon><delete /></el-icon>
-              </div>
-            </div>
-            <div class="op-icon add" @click="addConfigOne">+</div>
-          </div>
-        </template>
-      </el-form-item>
-      <el-form-item label="所在分组" prop="groupId">
-        <el-tree-select
-          check-strictly
-          :props="groupProps"
-          node-key="id"
-          clearable
-          :data="listData.groupOptions"
-          :default-expand-all="true"
-          v-model="ruleForm.groupId"
-          class="task-resource-select"
-          placeholder="请选择所在分组"
-          @node-click="getGroupValue"
-        />
-      </el-form-item>
-      <el-form-item label="日志等级" prop="logLevel">
-        <el-select
-          v-model="ruleForm.logLevel"
-          class="m-2"
-          clearable
-          placeholder="请选择资源"
-          size="large"
-        >
-          <el-option
-            v-for="item in logLevel"
-            :key="item.value"
-            :label="item.name"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="任务状态" prop="status">
-        <el-radio-group v-model="ruleForm.status">
-          <el-radio :label="2">启用</el-radio>
-          <el-radio :label="1">禁用</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="ruleForm.remark"
-          clearable
-          maxlength="500"
-          type="textarea"
-          size="large"
-          placeholder="请输入备注"
-        />
-      </el-form-item>
-      <el-form-item class="ClickButton">
-        <el-button @click="submitForm(ruleFormRef)">确定</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<style>
-.el-dialog__header {
-  border-bottom: 1px solid #dedede;
-  margin-right: 0;
-}
-</style>
-<style scoped lang="scss">
-.task-resource {
-  display: flex;
-  width: 100%;
-  .task-resource-select {
-    flex: 1;
-    &:nth-of-type(1) {
-      margin-right: 5px;
-    }
-    &:nth-of-type(2) {
-      margin-left: 5px;
-    }
-  }
-}
-.cron {
-  width: 100%;
-}
-.options-label {
-  float: left;
-}
-.options-status {
-  float: right;
-  color: #999;
-  font-size: 12px;
-}
-.w-1 {
-  width: 200px !important;
-  margin-right: 10px;
-  margin-bottom: 10px;
-}
-.w-2 {
-  width: 220px;
-  margin-right: 10px;
-}
-.op-icon {
-  border: 1px solid #ccc;
-  width: 40px;
-  height: 38px;
-  text-align: center;
-  line-height: 38px;
-  cursor: pointer;
-  &.add {
-    font-size: 22px;
-  }
-}
-.task-config {
-  display: flex;
-}
-.el-select {
-  width: 100%;
-}
-:deep(.el-form-item__label) {
-  font-family: PingFang SC;
-  font-weight: 700;
-  color: #000000;
-  font-size: 14px;
-}
-:deep(.el-input) {
-  height: 40px;
-  background-color: #ffffff;
-}
-:deep(.el-textarea) {
-  height: 100px;
-  background-color: #ffffff;
-  .el-textarea__inner {
-    height: 100px;
-  }
-}
-.ClickButton {
-  :deep(.el-form-item__content) {
-    display: flex;
-    justify-content: flex-end;
-    .el-button {
-      height: 40px;
-      background-color: #ffffff;
-      border: 1px solid;
-      border-color: #cccccc;
-    }
-  }
-}
-</style>
-- 
Gitee


From d33e54e1a3d2f2a300d44b654b8430b77f94bed3 Mon Sep 17 00:00:00 2001
From: chenxiaofeng <chenxiaofeng@yzbdl.ac.cn>
Date: Thu, 18 Aug 2022 02:12:18 +0000
Subject: [PATCH 7/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20src/?=
 =?UTF-8?q?views/SystemManage/Log/Log.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/SystemManage/Log/Log.vue | 164 -----------------------------
 1 file changed, 164 deletions(-)
 delete mode 100644 src/views/SystemManage/Log/Log.vue

diff --git a/src/views/SystemManage/Log/Log.vue b/src/views/SystemManage/Log/Log.vue
deleted file mode 100644
index 2d52190..0000000
--- a/src/views/SystemManage/Log/Log.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<!-- Copyright (c) 2022 渝州大数据实验室
- *
- * Lanius is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- *
- *     http://license.coscl.org.cn/MulanPSL2
- *
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
--->
-<!-- 
-* @desc:日志管理
-* @fileName:Logs.vue
-* @author:chenxiaofeng@yzbdl.ac.cn
-* @date:2022-4-6
-!-->
-<script setup lang="ts">
-import { onMounted, reactive, getCurrentInstance } from "vue";
-import LogSearch from "./components/log-search.vue";
-import LogDetails from "./components/log-details.vue";
-import LogPagination from "@/components/common/pagination.vue";
-import { showErrorMessage } from "../../../common/message";
-const { proxy } = getCurrentInstance() as any;
-
-const listData = reactive({
-  // 列表数据
-  tableData: [],
-  // 日志类型
-  logEventData: [],
-  // 列表总数
-  total: 0,
-  // 列表加载动画
-  isListLoading: false,
-  // 查询加载动画
-  isSearchLoading: false,
-});
-
-/**
- * 定义请求数据
- */
-let reqData = {
-  nickName: "",
-  beginTime: "",
-  endTime: "",
-  eventName: "",
-  page: 1,
-};
-
-/**
- * 查询方法
- * @param filter 查询条件对象
- * @reture viod
- */
-const searchFunc = (filter: any) => {
-  listData.isSearchLoading = true;
-  reqData.nickName = filter.nickName;
-  reqData.beginTime = filter.beginTime;
-  reqData.endTime = filter.endTime;
-  reqData.eventName = filter.eventValue;
-  reqTableList();
-};
-
-/**
- * 根据页码跳转页面
- * @param pageNumber 页码
- * @reture viod
- */
-const getCurrentPageNumber = (pageNumber: number) => {
-  reqData.page = pageNumber;
-  reqTableList();
-};
-
-/**
- * 获取列表
- * @reture viod
- */
-const reqTableList = () => {
-  listData.isListLoading = true;
-  const res = proxy.$HTTP.post({
-    url: `/opr/query`,
-    params: {
-      page: reqData.page,
-      size: 10,
-    },
-    data: {
-      nickName: reqData.nickName,
-      beginTime: reqData.beginTime,
-      endTime: reqData.endTime,
-      eventName: reqData.eventName,
-    },
-  });
-  res
-    .then((res: any) => {
-      if (res.isOk) {
-        listData.tableData = res.data.records;
-        listData.total = Number(res.data.total);
-      }
-      listData.isListLoading = false;
-      listData.isSearchLoading = false;
-    })
-    .catch((response: any) => {
-      showErrorMessage({ message: response.data });
-      listData.isListLoading = false;
-      listData.isSearchLoading = false;
-    });
-};
-
-/**
- * 获取所有日志事件
- * @reture viod
- */
-const reqEventDataList = () => {
-  const res = proxy.$HTTP.get({
-    url: `/opr/event`,
-  });
-  res
-    .then((res: any) => {
-      if (res.isOk) {
-        listData.logEventData = res.data;
-      }
-    })
-    .catch((response: any) => {
-      showErrorMessage({ message: response.data });
-    });
-};
-
-onMounted(() => {
-  // 初始化加载树形结构
-  reqTableList();
-  // 获取所有日志事件
-  reqEventDataList();
-});
-</script>
-
-<template>
-  <div class="page-list">
-    <!-- 查询 -->
-    <log-search
-      :searchFunc="searchFunc"
-      :eventData="listData.logEventData"
-      :isSearchLoading="listData.isSearchLoading"
-    ></log-search>
-    <!-- 列表详情 -->
-    <log-details
-      :tableData="listData.tableData"
-      :isListLoading="listData.isListLoading"
-    ></log-details>
-    <!-- 分页 -->
-    <log-pagination
-      :total="listData.total"
-      :getCurrentPageNumber="getCurrentPageNumber"
-    ></log-pagination>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.page-list {
-  position: relative;
-  background-color: #fff;
-  padding: 15px;
-  height: calc(100vh - 130px);
-}
-</style>
-- 
Gitee


From 0ba0a3fc26e479297641a2b1c8724ac304d5eafd Mon Sep 17 00:00:00 2001
From: chenxiaofeng <chenxiaofeng@yzbdl.ac.cn>
Date: Thu, 18 Aug 2022 02:13:44 +0000
Subject: [PATCH 8/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20src/?=
 =?UTF-8?q?views/Admin/SystemManagement/User/components/Operation.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../User/components/Operation.vue             | 144 ------------------
 1 file changed, 144 deletions(-)
 delete mode 100644 src/views/Admin/SystemManagement/User/components/Operation.vue

diff --git a/src/views/Admin/SystemManagement/User/components/Operation.vue b/src/views/Admin/SystemManagement/User/components/Operation.vue
deleted file mode 100644
index 5e81e36..0000000
--- a/src/views/Admin/SystemManagement/User/components/Operation.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<!-- Copyright (c) 2022 渝州大数据实验室
- *
- * Lanius is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- *
- *     http://license.coscl.org.cn/MulanPSL2
- *
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
--->
-<!-- 
-* @desc:任务编排新增弹窗
-* @fileName:Operation.vue
-* @author:chenxiaofeng@yzbdl.ac.cn
-* @date:2022-4-15
-!-->
-<script setup lang="ts">
-import { reactive, ref } from "vue";
-import type { FormInstance } from "element-plus";
-import { checkPassword } from "../../../../../services/common/tool";
-// 接受父组件传回
-const props = defineProps({
-  // 角色下拉下拉值
-  roleList: Array as any,
-  saveUser: Function as any,
-  oneUserInfo: Object,
-});
-
-const formSize: any = ref("default");
-const ruleFormRef = ref<FormInstance>();
-const ruleForm = reactive({
-  userName: "",
-  password: "",
-});
-const labelPosition = ref("top");
-
-/**
- * 密码验证正则
- */
-const validatePass = (rule: any, value: any, callback: any) => {
-  if (value === "") {
-    callback(new Error("请输入密码"));
-  } else if (!checkPassword(value)) {
-    callback(
-      new Error("密码必须包含英文大小写，数字，特殊字符，字符数量为6-20位")
-    );
-  } else {
-    callback();
-  }
-};
-
-/**
- * 定义校验规则
- */
-const rules = reactive({
-  userName: [{ required: true, message: "请输入用户账号", trigger: "blur" }],
-  password: [{ validator: validatePass, required: true, trigger: "blur" }],
-});
-
-/**
- * 提交表单
- * @reture viod
- */
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return;
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      let saveObj = {
-        password: ruleForm.password,
-        userName: ruleForm.userName,
-      };
-      props.saveUser(saveObj);
-    } else {
-      console.log("error submit!", fields);
-    }
-  });
-};
-</script>
-
-<template>
-  <div class="operation">
-    <el-form
-      ref="ruleFormRef"
-      :model="ruleForm"
-      :rules="rules"
-      :label-position="labelPosition"
-      label-width="120px"
-      class="demo-ruleForm"
-      :size="formSize"
-    >
-      <el-form-item label="用户账号" prop="userName">
-        <el-input
-          v-model="ruleForm.userName"
-          size="large"
-          placeholder="请输入用户账号"
-        />
-      </el-form-item>
-      <el-form-item label="账号密码" prop="password">
-        <el-input
-          v-model="ruleForm.password"
-          type="password"
-          size="large"
-          placeholder="请输入账号密码"
-        />
-      </el-form-item>
-      <el-form-item class="ClickButton">
-        <el-button @click="submitForm(ruleFormRef)">确定</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<style scoped lang="scss">
-:deep(.el-form-item__label) {
-  font-family: PingFang SC;
-  font-weight: 700;
-  color: #000000;
-  font-size: 14px;
-}
-:deep(.el-input) {
-  height: 40px;
-  background-color: #ffffff;
-}
-:deep(.el-textarea) {
-  height: 100px;
-  background-color: #ffffff;
-  .el-textarea__inner {
-    height: 100px;
-  }
-}
-.ClickButton {
-  :deep(.el-form-item__content) {
-    display: flex;
-    justify-content: flex-end;
-    .el-button {
-      height: 40px;
-      background-color: #ffffff;
-      border: 1px solid;
-      border-color: #cccccc;
-    }
-  }
-}
-</style>
-- 
Gitee


From c196df2dcf8c6c462a2034a7b583148a4302f532 Mon Sep 17 00:00:00 2001
From: chenxiaofeng <chenxiaofeng@yzbdl.ac.cn>
Date: Thu, 18 Aug 2022 02:15:49 +0000
Subject: [PATCH 9/9] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20src/?=
 =?UTF-8?q?views/SystemManage/UserManage/components/Operation.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserManage/components/Operation.vue       | 225 ------------------
 1 file changed, 225 deletions(-)
 delete mode 100644 src/views/SystemManage/UserManage/components/Operation.vue

diff --git a/src/views/SystemManage/UserManage/components/Operation.vue b/src/views/SystemManage/UserManage/components/Operation.vue
deleted file mode 100644
index 4c02e7a..0000000
--- a/src/views/SystemManage/UserManage/components/Operation.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-<!-- Copyright (c) 2022 渝州大数据实验室
- *
- * Lanius is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- *
- *     http://license.coscl.org.cn/MulanPSL2
- *
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
--->
-<!-- 
-* @desc:用户管理新增or编辑弹窗
-* @fileName:Operation.vue
-* @author:chenxiaofeng@yzbdl.ac.cn
-* @date:2022-4-15
-!-->
-<script setup lang="ts">
-import { onMounted, reactive, ref } from "vue";
-import { checkPassword } from "../../../../services/common/tool";
-import type { FormInstance } from "element-plus";
-// 接受父组件传回
-const props = defineProps({
-  // 角色下拉下拉值
-  roleList: Array as any,
-  // 新增用户方法回调
-  saveUser: Function as any,
-  // 修改用户方法回调
-  editUser: Function as any,
-  // 修改用户当前行数据
-  oneUserInfo: Object as any,
-  // 新增或修改文字
-  addOrEdit: String,
-});
-
-const formSize: any = ref("default");
-const ruleFormRef = ref<FormInstance>();
-const labelPosition = ref("top");
-
-/**
- * 表单数据
- */
-const ruleForm = reactive({
-  userName: "",
-  password: "",
-  nickName: "",
-  role: [],
-  chief: false,
-});
-
-/**
- * 密码验证正则
- */
-const validatePass = (rule: any, value: any, callback: any) => {
-  if (value === "") {
-    callback(new Error("请输入密码"));
-  } else if (!checkPassword(value)) {
-    callback(
-      new Error("密码必须包含英文大小写，数字，特殊字符，字符数量为6-20位")
-    );
-  } else {
-    callback();
-  }
-};
-
-/**
- * 定义校验规则
- */
-const rules: any = reactive({
-  userName: [
-    { required: true, message: "请输入用户账号", trigger: "blur" },
-    { max: 64, message: "用户账号不能超过64个字符", trigger: "blur" },
-  ],
-  password: [{ validator: validatePass, required: true, trigger: "blur" }],
-  nickName: [
-    { required: true, message: "请输入用户昵称", trigger: "blur" },
-    { max: 64, message: "用户昵称不能超过64个字符", trigger: "blur" },
-  ],
-});
-
-/**
- * 提交表单
- * @reture viod
- */
-const submitForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) return;
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      if (props.addOrEdit === "新增") {
-        let saveObj = {
-          nickName: ruleForm.nickName,
-          password: ruleForm.password,
-          roleIds: ruleForm.role,
-          chief: ruleForm.chief,
-          userName: ruleForm.userName,
-        };
-        props.saveUser(saveObj);
-      } else {
-        let editObj = {
-          id: props.oneUserInfo.id,
-          nickName: ruleForm.nickName,
-          chief: ruleForm.chief,
-          roleIds: ruleForm.role,
-        };
-        props.editUser(editObj);
-      }
-    } else {
-      console.log("error submit!", fields);
-    }
-  });
-};
-
-onMounted(() => {
-  let userInfo = { ...props.oneUserInfo };
-  if (JSON.stringify(props.oneUserInfo) !== "{}") {
-    ruleForm.userName = userInfo.userName;
-    ruleForm.nickName = userInfo.nickName;
-    ruleForm.chief = userInfo.chief;
-    ruleForm.role = userInfo.roles.map((item: any) => {
-      return item.id;
-    });
-  }
-});
-</script>
-
-<template>
-  <div class="operation">
-    <el-form
-      ref="ruleFormRef"
-      :model="ruleForm"
-      :rules="rules"
-      :label-position="labelPosition"
-      label-width="120px"
-      class="demo-ruleForm"
-      :size="formSize"
-    >
-      <el-form-item label="用户账号" prop="userName">
-        <el-input
-          v-model="ruleForm.userName"
-          :disabled="props.addOrEdit !== '新增'"
-          size="large"
-          placeholder="请输入用户账号"
-        />
-      </el-form-item>
-      <el-form-item
-        label="账号密码"
-        prop="password"
-        v-if="props.addOrEdit === '新增'"
-      >
-        <el-input
-          v-model="ruleForm.password"
-          type="password"
-          size="large"
-          show-password
-          placeholder="请输入账号密码"
-        />
-      </el-form-item>
-      <el-form-item label="用户昵称" prop="nickName">
-        <el-input
-          v-model="ruleForm.nickName"
-          size="large"
-          placeholder="请输入用户昵称"
-        />
-      </el-form-item>
-      <el-form-item label="用户所属角色" prop="role">
-        <el-select
-          v-model="ruleForm.role"
-          size="large"
-          multiple
-          collapse-tags
-          collapse-tags-tooltip
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in props.roleList"
-            :key="item.id"
-            :label="item.roleName"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="是否为组织管理员" prop="chief">
-        <el-radio-group v-model="ruleForm.chief">
-          <el-radio :label="true">是</el-radio>
-          <el-radio :label="false">否</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item class="ClickButton">
-        <el-button @click="submitForm(ruleFormRef)">确定</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<style scoped lang="scss">
-:deep(.el-form-item__label) {
-  font-family: PingFang SC;
-  font-weight: 700;
-  color: #000000;
-  font-size: 14px;
-}
-:deep(.el-input) {
-  height: 40px;
-  background-color: #ffffff;
-}
-:deep(.el-textarea) {
-  height: 100px;
-  background-color: #ffffff;
-  .el-textarea__inner {
-    height: 100px;
-  }
-}
-.ClickButton {
-  :deep(.el-form-item__content) {
-    display: flex;
-    justify-content: flex-end;
-    .el-button {
-      height: 40px;
-      background-color: #ffffff;
-      border: 1px solid;
-      border-color: #cccccc;
-    }
-  }
-}
-</style>
-- 
Gitee