Merge branch 'dev' of https://cloud.wodcloud.com/git/smart-operation/so-manage-ui into dev

package.json

@@ -18,11 +18,14 @@
     "element-plus": "^2.2.19",
     "github-markdown-css": "^5.1.0",
     "html2canvas": "^1.4.1",
+    "lodash": "^4.17.21",
     "markdown-it": "^13.0.1",
-    "mavon-editor": "^3.0.0",
+    "mavon-editor": "^3.0.1",
     "sass": "^1.35.1",
+    "string-format": "^2.0.0",
     "uuid": "^8.3.2",
     "vue": "^3.2.31",
+    "vue-demi": "^0.14.5",
     "vue-i18n": "^9.1.7",
     "vue-router": "^4.0.10",
     "vue3-ace-editor": "^2.2.2",

src/components/gap-title.vue

+<template>
+  <div
+    class="gap-title"
+    :class="{
+      'has-line': hasLine,
+    }">
+    <span>{{ title }}</span>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: "",
+    },
+    hasLine: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  components: {},
+  data() {
+    return {};
+  },
+  watch: {},
+  computed: {},
+  created() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style scoped>
+.gap-title {
+  height: 18px;
+  font-size: 18px;
+  font-weight: 600;
+  color: #202531;
+  display: flex;
+  align-items: center;
+}
+.gap-title::before {
+  content: "";
+  display: inline-block;
+  margin-right: 8px;
+  width: 4px;
+  height: 16px;
+  background-color: #2b4695;
+  border-radius: 2px;
+}
+.gap-title.has-line::after {
+  content: "";
+  display: inline-block;
+  flex: 1;
+  border-top: 1px dashed #dadee7;
+  margin-left: 8px;
+}
+</style>

src/components/go-back/index.vue

+<template>
+  <el-button size="default" @click="goBack">返回</el-button>
+</template>
+
+<script setup>
+import { useRouter } from "vue-router";
+const router = useRouter();
+const props = defineProps({
+  href: {
+    type: Object,
+    default: null,
+  },
+});
+const goBack = () => {
+  if (props.href) {
+    router.push(props.href);
+  } else {
+    router.go(-1);
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

src/components/manual-distribution/env.js

+// 通知方式
+export const METHODS = {
+    1: '钉钉',
+    2: '短信'
+}
+
+// 可以新增的数量
+export const ADD_NUM = 5
\ No newline at end of file

src/components/warn-detail/env.js

+export const STATUS_OBJ = {
+    success: "已恢复",
+    error: '未恢复'
+}
+export const PUSH_STATUS = {
+    success: '成功',
+    error: '失败'
+}
\ No newline at end of file

src/page/main/authority/role/add/index.vue

+<!-- 角色管理新增 -->
+<template>
+  <role-form></role-form>
+</template>
+
+<script setup>
+import roleForm from "./role_form.vue";
+</script>

src/page/main/authority/role/edit/index.vue

+<!-- 角色管理编辑 -->
+<template>
+  <role-form></role-form>
+</template>
+
+<script setup>
+import roleForm from "../add/role_form.vue";
+</script>