1

src/components/Editor/TinymceEditor.vue

@@ -27,7 +27,7 @@ const props = defineProps({
   },
   plugins: {
     type: [String, Array],
-    default: "lists link image table code help wordcount",
+    default: "lists link image table code help wordcount autoresize",
   }, //必填
   toolbar: {
     type: [String, Array],

src/views/XMHJC/aboutUs/culture/index.vue

@@ -18,7 +18,7 @@
       ]"
         @get-list="getList">
     </byTable>
-    <el-dialog z-index="100" :title="modalType == 'add' ? '添加企业文化' : '编辑企业文化'" v-if="dialogVisible" v-model="dialogVisible" width="600" v-loading="loading">
+    <el-dialog z-index="1100" :title="modalType == 'add' ? '添加企业文化' : '编辑企业文化'" v-if="dialogVisible" v-model="dialogVisible" width="80%" v-loading="loading">
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
         <template #subtitle>
           <el-row style="width: 100%;margin-bottom: 10px"   v-for="(row, index) in formData.data.subTitleList" ref="sort">
@@ -91,7 +91,7 @@ let modalType = ref("add");
 let rules = ref({
   title: [{ required: true, message: "请输入企业文化标题", trigger: "blur" }],
   status: [{ required: true, message: "请选择启用状态", trigger: "change" }],
-  type: [{ required: true, message: "请输入跳转类型", trigger: "change" }],
+  type: [{ required: true, message: "请选择跳转类型", trigger: "change" }],
   toUrl: [{ required: true, message: "请输入第三方链接", trigger: "blur" }],
   sort: [{ required: true, message: "请输入排序", trigger: "blur" }],
   value: [{ required: true, message: "请输入子标题", trigger: "blur" }],

src/views/XMHJC/aboutUs/honor/index.vue

@@ -18,7 +18,7 @@
       ]"
         @get-list="getList">
     </byTable>
-    <el-dialog z-index="100" :title="modalType == 'add' ? '添加荣誉资质' : '编辑荣誉资质'" v-if="dialogVisible" v-model="dialogVisible" width="600" v-loading="loading">
+    <el-dialog z-index="1100" :title="modalType == 'add' ? '添加荣誉资质' : '编辑荣誉资质'" v-if="dialogVisible" v-model="dialogVisible" width="90%" v-loading="loading">
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
         <template #honorCover>
           <el-row style="width: 100%">
@@ -100,7 +100,7 @@ let modalType = ref("add");
 let rules = ref({
   honorName: [{ required: true, message: "请输入荣誉名称", trigger: "blur" }],
   status: [{ required: true, message: "请选择启用状态", trigger: "change" }],
-  type: [{ required: true, message: "请输入跳转类型", trigger: "change" }],
+  type: [{ required: true, message: "请选择跳转类型", trigger: "change" }],
   toUrl: [{ required: true, message: "请输入第三方链接", trigger: "blur" }],
   sort: [{ required: true, message: "请输入排序", trigger: "blur" }],
 });

src/views/XMHJC/column/article.vue

@@ -19,7 +19,7 @@
         @get-list="getList">
 
     </byTable>
-    <el-dialog z-index="100" :title="modalType == 'add' ? '添加栏目文章' : '编辑栏目文章'" v-if="dialogVisible" v-model="dialogVisible" width="600" v-loading="loading">
+    <el-dialog z-index="1100" :title="modalType == 'add' ? '添加栏目文章' : '编辑栏目文章'" v-if="dialogVisible" v-model="dialogVisible" width="80%" v-loading="loading">
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
         <template #columnSlot>
           <el-row >
@@ -28,9 +28,10 @@
                 <el-select
                     v-model="formData.data.columnId"
                     :rule="rules.columnId"
+                    style="width: 1000px"
                     placeholder="请选择菜单"
                     no-data-text="无数据，请到栏目菜单添加"
-                    @change="(val) => getSubMenuList(val)"
+                    @change="(val) => getSubMenuListSelect(val)"
                 >
                   <el-option
                       v-for="item in columnListData"
@@ -42,9 +43,9 @@
 
               </el-form-item>
             </el-col>
-            <el-col :span="1"></el-col>
+            <el-col :span="1" ></el-col>
             <el-col :span="9">
-              <el-form-item prop="subId">
+              <el-form-item prop="subId" v-if="subFlag">
                 <el-select
                     v-model="formData.data.subId"
                     :rule="rules.subId"
@@ -173,13 +174,14 @@ const sourceList = ref({
   },
 });
 let dialogVisible = ref(false);
+let subFlag = ref(false);
 let modalType = ref("add");
 
 let rules = ref({
   title: [{ required: true, message: "请输入标题", trigger: "blur" }],
   subTitle: [{ required: true, message: "请输入副标题", trigger: "blur" }],
   briefly: [{ required: true, message: "请输入简述", trigger: "blur" }],
-  bodyType: [{ required: true, message: "请输入列表类型", trigger: "change" }],
+  bodyType: [{ required: true, message: "请选择列表类型", trigger: "change" }],
   videoUrl: [{ required: true, message: "请输入第三方链接", trigger: "blur" }],
   sort: [{ required: true, message: "请输入排序", trigger: "blur" }],
   status: [{ required: true, message: "请选择启用状态", trigger: "change" }],
@@ -190,6 +192,7 @@ const { proxy } = getCurrentInstance();
 const bodyListType = ref([]);
 const enableStatus = ref([]);
 const columnListData = ref([]);
+const columnListDataOld = ref([]);
 const subColumnListData = ref([]);
 
 
@@ -590,14 +593,32 @@ const videoListSuccess = (response, uploadFile) => {
 const getMenuList = async () => {
   const res = await findMenuListByOpen({})
   columnListData.value = res.data;
+
+  columnListDataOld.value = res.data;
+
+};
+
+const getSubMenuListSelect = async (id) => {
+  formData.data.subId = ""
+    await getSubMenuList(id)
 };
 
 const getSubMenuList = async (id) => {
-  const res = await findSubMenuListByOpen({columnId: id})
-  subColumnListData.value = res.data;
+  const  column = columnListDataOld.value.find(x=> x.id == id);
+  console.log(column)
+  console.log(column.type)
+  console.log(column.type == '2')
+  if (column.type == '2'){
+    subFlag.value = false
+  }else {
+    subFlag.value = true
+    const res = await findSubMenuListByOpen({columnId: id})
+    subColumnListData.value = res.data;
+  }
 };
 
 
+
 getMenuList()
 getDictlist()
 getList()

src/views/XMHJC/column/index.vue

@@ -23,7 +23,7 @@
       </template>
 
     </byTable>
-    <el-dialog z-index="100" :title="modalType == 'add' ? '添加栏目菜单' : '编辑栏目菜单'" v-if="dialogVisible" v-model="dialogVisible" width="600" v-loading="loading">
+    <el-dialog z-index="1100" :title="modalType == 'add' ? '添加栏目菜单' : '编辑栏目菜单'" v-if="dialogVisible" v-model="dialogVisible" width="80%" v-loading="loading">
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
         <template #subColumn>
           <el-row style="width: 100%;margin-bottom: 10px"   v-for="(row, index) in formData.data.columnMenuSubList" ref="sort">

src/views/XMHJC/home/index.vue

@@ -14,7 +14,7 @@
         @get-list="getList">
 
     </byTable>
-    <el-dialog z-index="100" :title="'编辑栏目文章'" v-if="dialogVisible" v-model="dialogVisible" width="600" v-loading="loading">
+    <el-dialog z-index="1100" :title="'编辑栏目文章'" v-if="dialogVisible" v-model="dialogVisible" width="600" v-loading="loading">
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
         <template #menuId>
           <el-form-item prop="menuId">
@@ -78,8 +78,8 @@ let rules = ref({
   titleEn: [{ required: true, message: "请输入标题英文名称", trigger: "blur" }],
   menuId: [{ required: true, message: "请选择菜单", trigger: "change" }],
   article1: [{ required: true, message: "请选择文章", trigger: "change" }],
-  article2: [{ required: true, message: "请选择文章", trigger: "change" }],
-  article3: [{ required: true, message: "请选择文章", trigger: "change" }],
+  // article2: [{ required: true, message: "请选择文章", trigger: "change" }],
+  // article3: [{ required: true, message: "请选择文章", trigger: "change" }],
 });
 const { proxy } = getCurrentInstance();
 
@@ -107,7 +107,14 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "标题英文名称",
+        label: "标题别名",
+        prop: "titleAlias",
+        width: '180'
+      },
+    },
+    {
+      attrs: {
+        label: "英文标题",
         prop: "titleEn",
         width: '180'
       },
@@ -176,6 +183,12 @@ const formConfig = computed(() => {
     },
     {
       type: "input",
+      prop: "titleAlias",
+      label: "标题别名",
+      required: true,
+    },
+    {
+      type: "input",
       prop: "titleEn",
       label: "英文标题",
       required: true,
@@ -271,17 +284,8 @@ const getArticleListSelect = async (value) => {
   formData.data.article3 = ""
   formData.data.article4 = ""
 
-  const res = await findColumnArticleList({
-    pageNum: 1,
-    pageSize: 99999,
-    status: 1,
-    columnId: value,
-  });
-  articleList.value = res.data.rows.map((x) => ({
-    label: x.title,
-    value: x.id,
-  }));
 
+  await getArticleList(value)
 
 };
 

src/views/XMHJC/product/category/index.vue

@@ -22,6 +22,38 @@
     </div>
     <el-dialog :title="modalType == 'add' ? '新增' : '编辑'" v-model="dialogVisible" width="800" v-loading="loading">
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
+        <template #categoryCover>
+          <el-row style="width: 100%">
+            <el-col :span="24">
+              <el-form-item  prop="categoryCover">
+                <el-upload
+                    class="avatar-uploader"
+                    action="https://winfaster.obs.cn-south-1.myhuaweicloud.com"
+                    :data="uploadDataOne"
+                    :show-file-list="false"
+                    accept=".gif, .jpeg, .jpg, .png"
+                    :on-success="categoryCoverListSuccess"
+                    :before-upload="uploadFileOne">
+                  <el-image
+                      v-if="formData.data.categoryCoverList && formData.data.categoryCoverList.length > 0"
+                      :src="formData.data.categoryCoverList[0].fileUrl"
+                      fit="scale-down"
+                      class="avatar" />
+                  <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+                </el-upload>
+                <el-button
+                    class="delete-btn"
+                    type="danger"
+                    v-if="formData.data.categoryCoverList && formData.data.categoryCoverList.length > 0"
+                    @click="formData.data.categoryCoverList = []">
+                  删除
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </template>
+
+
         <template #subCategorySlot>
           <el-row style="width: 100%;margin-bottom: 10px"   v-for="(row, index) in formData.data.subCategoryList" ref="sort">
             <el-col :span="6" >
@@ -85,6 +117,7 @@ import byTable from "@/components/byTable/index.vue";
 import byForm from "@/components/byForm/index.vue";
 import { computed, ref } from "vue";
 import {getDictOneByXmhjc} from "@/api/XMHJC/common";
+import {getFileList, getFileStr} from "../../../../api/XMHJC/common";
 const loading = ref(false);
 const submitLoading = ref(false);
 const enableStatus = ref([]);
@@ -196,6 +229,7 @@ let formData = reactive({
   data: {},
   treeData: [],
   subCategoryList:[],
+  honorCoverList: [],
 });
 const formOption = reactive({
   inline: true,
@@ -214,6 +248,14 @@ const formConfig = computed(() => {
       maxlength: 10,
       itemType: "text",
     },
+
+    {
+      type: "slot",
+      prop: "categoryCover",
+      slotName: "categoryCover",
+      label: "分类图片",
+    },
+
     {
       type: "input",
       prop: "code",
@@ -263,6 +305,17 @@ const openModal = () => {
 };
 const submitForm = () => {
   byform.value.handleSubmit((valid) => {
+    if (!formData.data.categoryCoverList) {
+      ElMessage({message: "请上传图片",type: "error",});
+      return
+    }
+
+
+    if (!(formData.data.subCategoryList && formData.data.subCategoryList.length > 0)) {
+      ElMessage({message: "请填写子类目",type: "error",});
+      return
+    }
+
     submitLoading.value = true;
     proxy.post("/productCategory/" + modalType.value, formData.data)
       .then((res) => {
@@ -304,12 +357,14 @@ const changeStatus = (row) => {
 };
 
 //编辑详情
-const getDetail = (row) => {
+const getDetail = async (row) => {
   modalType.value = "edit";
-  proxy.post("/productCategory/detail", { id: row.id }).then((res) => {
+  await proxy.post("/productCategory/detail", { id: row.id }).then((res) => {
     formData.data = res;
     dialogVisible.value = true;
   });
+  const resFile = await getFileList({businessIdList: [formData.data.id], fileType: 1})
+  formData.data.categoryCoverList = resFile.data[formData.data.id];
 };
 
 //删除
@@ -356,6 +411,27 @@ const clickAddSubCategory = () => {
   }
 };
 
+
+const uploadDataOne = ref({});
+const uploadFileOne = async (file) => {
+  const res = await getFileStr({ fileName: file.name });
+  uploadDataOne.value = res.data.uploadBody;
+  file.id = res.data.id;
+  file.fileName = res.data.fileName;
+  file.fileUrl = res.data.fileUrl;
+  return true;
+};
+
+const categoryCoverListSuccess = (response, uploadFile) => {
+  formData.data.categoryCoverList = [
+    {
+      id: uploadFile.raw.id,
+      fileName: uploadFile.raw.fileName,
+      fileUrl: uploadFile.raw.fileUrl,
+    },
+  ];
+};
+
 const clickDelete = (index) => {
   formData.data.subCategoryList.splice(index, 1);
 };
@@ -366,5 +442,34 @@ getDictlist();
 <style lang="scss" scoped>
 .tenant {
   padding: 20px;
+  .delete-btn{
+    margin-top: 10px;
+    margin-left: 25px;
+  }
+}
+.avatar-uploader .avatar {
+  width: 110px;
+  height: 110px;
+  display: block;
+  background-color: black;
+}
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 110px;
+  height: 110px;
+  text-align: center;
+  border: 1px dashed var(--el-border-color);
 }
 </style>

src/views/XMHJC/product/info/index.vue

@@ -20,7 +20,7 @@
                 </template>
             </byTable>
         </div>
-        <el-dialog z-index="100"  :title="modalType == 'add' ? '新增' : '编辑'" v-model="dialogVisible" width="80%" v-loading="loading">
+        <el-dialog z-index="1100"  :title="modalType == 'add' ? '新增' : '编辑'" v-model="dialogVisible" width="800px" v-loading="loading">
             <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
                 <template #coverUrl>
                     <el-row style="width: 100%">

src/views/XMHJC/topic/content/index.vue

@@ -8,6 +8,7 @@
           :config="config"
           :loading="loading"
           highlight-current-row
+          :selectConfig="selectConfig"
           :action-list="[]"
           @get-list="getList">
         <template #slotName="{ item }">
@@ -15,8 +16,19 @@
         </template>
       </byTable>
     </div>
+    <el-dialog :title="'编辑'" v-if="dialogVisible" v-model="dialogVisible" width="600">
+      <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform">
+
+      </byForm>
+      <template #footer>
+        <el-button @click="dialogVisible = false" size="large">取 消</el-button>
+        <el-button type="primary" v-no-double-click="submitForm" size="large" :loading="submitLoading">确 定</el-button>
+      </template>
+    </el-dialog>
+
+
     <el-dialog title="回复列表" v-if="replyCommonModal" v-model="replyCommonModal" width="1000" class="replyCommonModal" v-loading="loading">
-      <replyList :data="formData"></replyList>
+      <replyList :data="replyData"></replyList>
       <template #footer>
         <el-button @click="replyCommonModal = false" size="large">关闭</el-button>
       </template>
@@ -28,9 +40,11 @@
 /* eslint-disable vue/no-unused-components */
 import { ElMessage, ElMessageBox } from "element-plus";
 import byTable from "@/components/byTable/index.vue";
-import { computed, ref } from "vue";
+import byForm from "@/components/byForm/index.vue";
+import {computed, reactive, ref} from "vue";
 import replyList from "./replyList.vue";
 const loading = ref(false);
+
 const sourceList = ref({
   data: [],
   pagination: {
@@ -39,6 +53,7 @@ const sourceList = ref({
     pageSize: 10,
   },
 });
+const dialogVisible = ref(false);
 const replyCommonModal = ref(false);
 const { proxy } = getCurrentInstance();
 const config = computed(() => {
@@ -94,6 +109,17 @@ const config = computed(() => {
         return [
           {
             attrs: {
+              label: "修改",
+              type: "primary",
+              text: true,
+            },
+            el: "button",
+            click() {
+              openEditModal(row);
+            },
+          },
+          {
+            attrs: {
               label: "查看回复",
               type: "primary",
               text: true,
@@ -120,18 +146,69 @@ const config = computed(() => {
   ];
 });
 
+
+const selectConfig = computed(() => {
+  return [
+    {
+      label: "是否热门",
+      prop: "toping",
+      data: [
+        {
+          label: "是",
+          value: "1",
+        },
+        {
+          label: "否",
+          value: "2",
+        },
+      ],
+    },
+  ]});
+
 let formData = reactive({
   data: {},
-  treeData: [],
-  subCategoryList:[],
 });
+
+let rules = ref({
+  toping: [{ required: true, message: "请选择是否热门", trigger: "change" }],
+});
+
 const formOption = reactive({
   inline: true,
   labelWidth: 100,
   itemWidth: 100,
   rules: [],
 });
+
 const byform = ref(null);
+const formConfig = computed(() => {
+  return [
+    {
+      type: "select",
+      prop: "toping",
+      label: "是否热门",
+      data: [
+        {
+          label: "是",
+          value: "1",
+        },
+        {
+          label: "否",
+          value: "0",
+        }
+      ],
+      required: true,
+    }
+  ];
+});
+
+let replyData = reactive({
+  data: {},
+  treeData: [],
+  subCategoryList:[],
+});
+
+
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
@@ -145,9 +222,15 @@ const getList = async (req) => {
 };
 
 
+//打开是否热门弹框
+const openEditModal = (row) => {
+  formData.data = {...row};
+
+  dialogVisible.value = true;
+};
 //打开回复列表弹窗
 const openReplyModal = (row) => {
-  formData.data = { ...row };
+  replyData.data = { ...row };
   replyCommonModal.value = true;
 };
 
@@ -174,6 +257,26 @@ const prefixDel = (row) => {
   });
 };
 
+
+const submitForm = () => {
+  byform.value.handleSubmit(() => {
+    submitLoading.value = true;
+    proxy.post("/topicContent/edit", formData.data).then((res) => {
+      if(res){
+        ElMessage({
+          message: "编辑成功",
+          type: "success",
+        });
+        dialogVisible.value = false;
+        submitLoading.value = false;
+        getList();
+      }else{
+        submitLoading.value = false;
+      }
+    });
+  });
+};
+
 const del = (id) => {
   proxy.post("/topicContent/delete", { id: id }).then((res) => {
     ElMessage({

src/views/index.vue

@@ -1,100 +1,5 @@
 <template>
 	<div class="app-container home">
-		
-		<div class="stat-warp">
-			<ul>
-				<li class="theme1" @click="toUrl('Backlog',1)">
-					<div class="num">{{toBeProcessedData.total}}</div>
-					<div class="label">我的待审批</div>
-					<div class="icon-box">
-						<i class="icon iconfont icon-iconm_waixht"></i>
-					</div>
-				</li>
-				<li class="theme2" @click="toUrl('DealWith',2)">
-					<div class="num">{{haveInitiatedData.total}}</div>
-					<div class="label">我的发起（未结束）</div>
-					<div class="icon-box">
-						<i class="icon iconfont icon-iconm_wofqd"></i>
-					</div>
-				</li>
-				<li class="theme3">
-					<div class="num">{{ pushInfo.total }}</div>
-					<div class="label">未读消息</div>
-					<div class="icon-box">
-						<i class="icon iconfont icon-iconm_unread"></i>
-					</div>
-				</li>
-			</ul>
-		</div>
-		<div class="table-warp">
-			<div class="card">
-				<div class="commons-title">
-					我的待审批
-				</div>
-				<el-table :data="toBeProcessedData.rows" style="width: 100%">
-					<el-table-column prop="flowName" label="流程类型" width="100" />
-					<el-table-column prop="title" label="流程标题" />
-					<el-table-column prop="createUserName" label="发起人"  width="100"/>
-					<el-table-column prop="createTime" label="发起时间" width="160" />
-					<el-table-column fixed="right" label="操作" width="60">
-						<template #default="scope">
-							<el-button
-								link
-								type="primary"
-								size="small"
-								@click="pushProcessApproval(scope.row)"
-							>
-								办理
-							</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
-			<div class="card">
-				<div class="commons-title">
-					在线统计时长
-				</div>
-				<div>
-					<el-table
-						:data="onLineInfoData"
-						style="width: 100%"
-						row-key="deptName"
-						lazy
-						:load="load"
-						:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-						>
-						<el-table-column prop="deptName" label="名称" />
-						<el-table-column prop="onLineTime" label="在线时长">
-							<template #default="scope">
-								{{ scope.row.onLineTime }}h
-							</template>
-						</el-table-column>
-					</el-table>
-				</div>
-			</div>
-			<div class="card">
-				<div class="commons-title">
-					我的发起（未结束）
-				</div>
-				<el-table :data="haveInitiatedData.rows" style="width: 100%">
-					<el-table-column prop="flowName" label="流程类型"  width="100"/>
-					<el-table-column prop="title" label="流程标题" />
-					<el-table-column prop="createUserName" label="审批人" width="100" />
-					<el-table-column prop="createTime" label="发起时间"  width="160"/>
-					<el-table-column fixed="right" label="操作" width="60">
-						<template #default="scope">
-							<el-button
-								link
-								type="primary"
-								size="small"
-								@click="pushProcessApproval(scope.row)"
-							>
-								查看
-							</el-button>
-						</template>
-					</el-table-column>
-				</el-table>
-			</div>
 			<div class="card">
 				<div class="commons-title">
 					系统公告
@@ -106,11 +11,10 @@
 					</li>
 				</ul>
 			</div>
-		</div>
+  </div>
 		<!-- <byTableDemo></byTableDemo> -->
 		<!-- <el-input type="number" v-model='aaa' v-mousewheel></el-input> -->
 		<!-- 111112132131211 -->
-	</div>
 </template>
 
 <script setup >
@@ -178,73 +82,18 @@ const pushInfo = ref({
 	rows:[]
 })
 const getData = (() => {
-	
-	proxy.get('/onLineInfo/info',{
-		pageNum:1,
-		pageSize:5,
-	}).then(res=>{
-		onLineInfoData.value = res.data.deptList
-		onLineInfoData.value.unshift({
-			deptName:'我的时长',
-			onLineTime:res.data.onLineTime
-		})
-		//递归将数据内的deptList 改成 children
-		const changeData = (data) => {
-			data.forEach(item => {
-				item.children = item.deptList
-				if(item.deptList && item.deptList.length > 0) {
-					changeData(item.deptList)
-				}
-				if(item.userList && item.userList.length > 0) {
 
-					item.children = item.children.concat(item.userList.map(item=> {
-						return {
-							...item,
-							deptName:item.userName,
-							onLineTime:item.onLineTime
-						}
-					}))
-				}
-			})
-		}
-		changeData(onLineInfoData.value)
-	})
-	proxy.post('flowExample/getToBeProcessedPage',{
-		pageNum:1,
-		pageSize:4,
-		status:'1'
-	}).then(res=>{
-		toBeProcessedData.value = res
-	})
-	proxy.post('flowExample/getHaveInitiatedPage',{
-		pageNum:1,
-		pageSize:4,
-		status:'1'
-	}).then(res=>{
-		haveInitiatedData.value = res
-	})
+
 	proxy.post('pushAnnouncement/page',{
 		pageNum:1,
 		pageSize:3,
 	}).then(res=>{
 		sendMegData.value = res
 	})
-	proxy.post('pushInfo/page',{
-		pageNum:1,
-		pageSize:3,
-		pushRead:0,
-		
-	}).then(res=>{
-		pushInfo.value = res
-	})
+
 	
 })
-const toUrl = (name,type) => {
-	//获取name为name的路由的基础信息
-	const route = proxy.$router.resolve({ name: name, params: {  } })
-	console.log(route)
-	proxy.$router.push(route.path + '?type=' + type)
-}
+
 getData()
 
 onMounted(() => {})