Merge remote-tracking branch 'remotes/origin/AR/dcTom_closeCircle_202505_lqy' into dev

package.json

@@ -14,6 +14,7 @@
     "echarts": "^5.6.0",
     "element-plus": "^2.9.10",
     "js-cookie": "^3.0.5",
+    "moment": "^2.30.1",
     "nprogress": "^0.2.0",
     "path": "^0.12.7",
     "pinia": "^3.0.2",

src/main.js

@@ -8,7 +8,7 @@ import ElementPlus from "element-plus";
 import "element-plus/dist/index.css";
 import * as ElementPlusIconsVue from "@element-plus/icons-vue";
 import { createPinia } from "pinia";
-
+import moment from 'moment';
 const app = createApp(App);
 for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
   app.component(key, component);
@@ -16,5 +16,6 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 app
   .use(router)
   .use(ElementPlus, { locale: zhCustom })
+  .use(moment)
   .use(createPinia())
   .mount("#app");

src/router/index.js

@@ -8,7 +8,8 @@ import User from '../views/user.vue'
 import Layout from '../layout/index.vue'
 import Login from '../views/login/index.vue'
 import equipmentManagement from '../views/equipmentManagement/index.vue'
-
+import myAgency from '@/views/closeManage/myAgency.vue';
+import myDone from '@/views/closeManage/myDone.vue';
 const routes = [
     {
         path: '/',
@@ -44,13 +45,13 @@ const routes = [
             meta: { title: '我的闭环' },
             children: [
               {
-                path: '/my-loop/profile',
-                component: HomeView,
+                path: '/my-loop/myAgency',
+                component: myAgency,
                 meta: { title: '我的待办' },
               },
               {
-                path: '/my-loop/posts',
-                component: AboutView,
+                path: '/my-loop/myDone',
+                component: myDone,
                 meta: { title: '我的已办' },
               },
             ]

src/views/closeManage/components/dialog.vue

+<template>
+  <el-dialog
+      :model-value="showDialog"
+      :title="title"
+      :width="width"
+      @close="closeDialog"
+  >
+    <div>
+      <slot name="content"></slot>
+      <slot></slot>
+    </div>
+    <template #footer>
+      <div class="dialog-footer" v-if="btnGroup.length">
+        <div v-for="item in btnGroup" class="real-btn" :key="item.attrKey" @click="handleBtn(item.attrKey)">
+          {{ item.label }}
+        </div>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { defineProps, defineEmits, ref, reactive,watch,onMounted } from 'vue';
+
+const props = defineProps({
+  showDialog: {
+    type: Boolean,
+    default: false
+  },
+  title: {
+    type: String,
+    default: '弹框标题'
+  },
+  width: {
+    type: String,
+    default: '40%'
+  },
+  btnGroup: {
+    type: Array,
+    default: () => ([])
+  }
+});
+const emit = defineEmits(['close:showDialog', 'handleBtn']);
+/**
+ * @Description: 弹框关闭回调
+ * @author liqiuyu
+ * @date 2025/5/21
+ */
+const closeDialog = () => {
+  emit('close:showDialog', false);
+};
+
+/**
+ * @Description: 弹框底部按钮方法回调
+ * @author liqiuyu
+ * @date 2025/5/21
+ */
+const handleBtn = (key) => {
+  emit('handleBtn', key);
+};
+</script>
+
+<style scoped lang="scss">
+:deep(.el-dialog) {
+  background: rgb(34, 43, 69);
+  .el-dialog__title {
+    color: #f5f6f9;
+  }
+  .table {
+    height: calc(100vh - 420px) !important;
+  }
+  .el-dialog__body {
+    padding: 16px;
+  }
+  .el-dialog__footer {
+    padding: 0;
+  }
+}
+.dialog-footer {
+  display: flex;
+  justify-content:center;
+  width: 100%;
+  .real-btn {
+    width: auto;
+    height: 28px;
+    background: rgb(64, 158, 255);
+    border: 1px solid rgb(64, 158, 255);
+    border-radius: 4px;
+    box-shadow: 0 1px 9px 0 rgba(12, 123, 255, 0.3) inset;
+    text-align: center;
+    padding: 0 16px;
+    line-height: 28px;
+    color: rgba(255, 255, 255, 0.85);
+    margin-right: 16px;
+    cursor: pointer;
+  }
+}
+</style>
\ No newline at end of file

src/views/closeManage/myDone.vue

+<script setup>
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file