首页工作台调整

src/api/home/index.js

@@ -0,0 +1,70 @@
+import request from "@/utils/request";
+
+/**
+ * 查询项目列表
+ * @data data
+ */
+export async function projectsPageAPI(data) {
+  const res = await request.post('/pro/projects/page', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+/**
+ * 查询任务列表
+ * @data data
+ */
+export async function projectsTaskPageAPI(data) {
+  const res = await request.post('/pro/projectstask/page', data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据当前用户获取所有菜单数据
+ * @data data
+ */
+export async function getAllResourceByCurrentUserAPI() {
+  const res = await request.get('/sys/indexuserresource/getAllResourceByCurrentUser');
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+/**
+ * 保存菜单数据
+ * @data data
+ */
+export async function userResourceSaveAPI(data) {
+  const res = await request.post('/sys/indexuserresource/save',data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+/**
+ * 当前用户菜单数据
+ * @data data
+ */
+export async function userResourceListAPI() {
+  const res = await request.post('/sys/indexuserresource/list');
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+/**
+ * 删除当前用户菜单数据
+ * @data data
+ */
+export async function userResourceDeleteAPI(data) {
+  const res = await request.delete('/sys/indexuserresource/delete',{data});
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+

src/views/home/common-dialog.vue

@@ -0,0 +1,108 @@
+<template>
+  <ele-modal
+    custom-class="ele-dialog-form long-dialog-form"
+    :centered="true"
+    :visible.sync="commonDialogFlag"
+    title="添加"
+    :close-on-click-modal="false"
+    width="20%"
+    :before-close="cancel">
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="常用菜单:" prop="resourceId">
+            <el-cascader  style="width: 100%" v-model="form.resourceId" clearable :show-all-levels="false" :options="menuTreeList" filterable :props="{label:'name',value:'id',emitPath:false}"></el-cascader>
+<!--            <ele-tree-select clearable v-model="form.resourceId"  :data="menuTreeList" label="name" value="id"-->
+<!--                             default-expand-all placeholder="请选择上级菜单"/>-->
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="排序:" prop="sort">
+            <el-input-number :min="0" v-model="form.sort" placeholder="请输入排序号" controls-position="right"
+                             class="ele-fluid ele-text-left"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- <div style="margin: 6px 0 28px 0">
+        <el-divider />
+      </div> -->
+    </el-form>
+    <div slot="footer">
+      <el-button type="primary" size="small" @click="submit">保 存</el-button>
+      <!--      <el-button type="primary" size="small" @click="submit('sub')">提 交</el-button>-->
+      <el-button size="small" @click="cancel">关 闭</el-button>
+    </div>
+
+
+  </ele-modal>
+</template>
+
+
+<script>
+
+
+import {mapGetters} from "vuex";
+import {EleIconPicker} from 'ele-admin';
+import {getAllResourceByCurrentUserAPI, userResourceSaveAPI} from "@/api/home";
+
+export default {
+  name: "common-dialog",
+  components: {
+    EleIconPicker
+  },
+  props: {
+    commonDialogFlag: {
+      type: Boolean,
+      default: false,
+    }
+  },
+  data() {
+    return {
+      title: '',
+      form: {
+        sort: 1,
+        resourceId: '',
+      },
+      rules: {
+        resourceId:{required:true,message:'',trigger:['blur','change']},
+      },
+      menuList: [],
+      menuTreeList: [],
+      dialogType: '',
+    }
+  },
+  computed: {
+    ...mapGetters(['user'])
+  },
+  created() {
+    console.log(this.user);
+  },
+  methods: {
+    async init(row = {}, type) {
+      this.menuList = await getAllResourceByCurrentUserAPI()
+      this.menuList = this.menuList.filter(item => item.type == 1)
+      this.menuTreeList = this.$util.toTreeData({
+        data: this.menuList || [],
+        idField: 'id',
+        parentIdField: 'parentId'
+      });
+    },
+
+
+    async submit(type = '') {
+      await userResourceSaveAPI(this.form)
+      this.$message.success('操作成功');
+      this.cancel()
+      this.$emit('reload');
+    },
+    cancel() {
+      this.$emit('update:commonDialogFlag', false);
+    },
+  }
+}
+</script>
+
+
+<style scoped lang="scss">
+
+</style>

src/views/home/index.vue

@@ -6,24 +6,24 @@
           <span>数据概览</span>
         </div>
         <div class="card-cell-content">
-          <div class="card-cell-value">
+          <div class="card-cell-value" @click="handelRouterTo('/page-pro/project-initiation')">
             <div class="img-box img1-url"></div>
             <div class="text-box">
-              <span>64</span>
+              <span>{{ projectNum }}</span>
               <span>我的项目</span>
             </div>
           </div>
-          <div class="card-cell-value">
+          <div class="card-cell-value" @click="handelRouterTo('/page-pro/task-manage')">
             <div class="img-box img2-url"></div>
             <div class="text-box">
-              <span>15</span>
+              <span>{{ taskNum }}</span>
               <span>我的任务</span>
             </div>
           </div>
-          <div class="card-cell-value">
+          <div class="card-cell-value" @click="handelRouterTo('/page-wt/tickets')">
             <div class="img-box img3-url"></div>
             <div class="text-box">
-              <span>22</span>
+              <span>{{ workOrderNum }}</span>
               <span>我的工单</span>
             </div>
           </div>
@@ -44,18 +44,19 @@
           <div class="card-cell-value">
             <div>
               <el-avatar shape="square" :size="80" src="https://empty" @error="errorHandler">
-                <img src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png"/>
+                <img :src="xyy"/>
               </el-avatar>
             </div>
             <div class="text-box">
               <span>{{ user.info.name }}</span>
+              <span>{{ user.info.deptName }}</span>
               <span>{{ user.info.groupName }}</span>
             </div>
           </div>
           <div class="card-cell-date">
-            <!--            <span style="color: #7fa7ce">{{ date }}</span>-->
-            <span>{{ time }}</span>
+            <span>{{ date }}</span>
             <span>{{ week }} </span>
+            <span>{{ time }}</span>
           </div>
         </div>
       </el-card>
@@ -127,7 +128,9 @@
                 </template>
                 <div class="scroll-box-content-item">
                   <span class="item-date">{{ o.createTime }}</span>
-                  <span class="item-text" :title="`${ o.templateNickname + ':'+o.templateContent}`">{{ o.templateNickname + ':' + o.templateContent }}</span>
+                  <span class="item-text" :title="`${ o.templateNickname + ':'+o.templateContent}`">{{
+                      o.templateNickname + ':' + o.templateContent
+                    }}</span>
                 </div>
               </el-timeline-item>
             </div>
@@ -143,15 +146,43 @@
           <span>常用功能</span>
         </div>
         <div class="card-cell-content">
-          <div v-for="item in commonList" :key="item.id"  class="card-cell-content-div">
-            <i :class="item.icon||'el-icon-menu'"></i>
-            <span>{{item.name}}</span>
+          <div v-for="(item,index) in commonList" :key="item.id" class="card-cell-content-box" @click="handleAdd(item)">
+            <!--            <el-popover-->
+            <!--              v-if="item.id !=='-1'"-->
+            <!--              placement="top-start"-->
+            <!--              title=""-->
+            <!--              width="10px"-->
+            <!--              trigger="click"-->
+            <!--              content="">-->
+            <!--              <i style="color: red" class="el-icon-delete"></i>-->
+            <!--              <div class="card-cell-content-div"  slot="reference">-->
+            <!--                <i :class="item.icon||'el-icon-menu'"></i>-->
+            <!--                <span>{{ item.name }}</span>-->
+            <!--              </div>-->
+            <!--            </el-popover>-->
+            <el-tooltip placement="top" effect="light" v-if="item.id !=='-1'">
+              <div slot="content">
+                <i style="color: red;cursor: pointer;font-size: 18px" class="el-icon-delete"
+                   @click="handleCommonListDel(item,index)"></i>
+              </div>
+              <div class="card-cell-content-div">
+                <i :class="item.icon||'el-icon-s-opportunity'"></i>
+                <span>{{ item.name }}</span>
+              </div>
+            </el-tooltip>
+            <div class="card-cell-content-div" v-else>
+              <i :class="item.icon||'el-icon-s-opportunity'"></i>
+              <span>{{ item.name }}</span>
+            </div>
           </div>
+
         </div>
       </el-card>
     </div>
     <handleTask ref="handleTaskRef" @reload="reload"></handleTask>
     <detail ref="detailRef"></detail>
+    <commonDialog ref="commonDialogRef" v-if="commonDialogFlag"
+                  :common-dialog-flag.sync="commonDialogFlag" @reload="getUserResourceList"></commonDialog>
   </div>
 </template>
 
@@ -164,15 +195,25 @@ import detail from "@/views/bpm/processInstance/detail.vue";
 import handleTask from "@/views/bpm/handleTask/index.vue";
 import {deepClone} from "ele-admin/lib/utils/core";
 import vueSeamlessScroll from 'vue-seamless-scroll'
+import {projectsPageAPI, projectsTaskPageAPI, userResourceDeleteAPI, userResourceListAPI} from "@/api/home";
+import {getWorkOrderPage} from "@/api/tickets";
+import {statistics} from "@/api/bpm/components/inspectionManage";
+import commonDialog from "@/views/home/common-dialog.vue";
+import xyy from '@/assets/xyy.jpg'
 export default {
   name: "index",
-  components: {handleTask, detail,vueSeamlessScroll},
+  components: {handleTask, detail, vueSeamlessScroll, commonDialog},
   data() {
     return {
+      xyy,
       time: '',
       date: '',
       week: '',
+      commonDialogFlag: false,
       updateTimer: null,
+      projectNum: 0,
+      taskNum: 0,
+      workOrderNum: 0,
       messageScrollList: [],
       defineScroll: {
         step: 0.2, // 数值越大速度滚动越快
@@ -184,18 +225,7 @@ export default {
         singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
         waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
       },
-      commonList: [
-        {
-          name: '常用分类',
-          id: '1',
-          icon: '',
-        },
-        {
-          name: '编辑',
-          id: '-1',
-          icon: 'el-icon-edit',
-        }
-      ],
+      commonList: [],
       columns: [
         {
           columnKey: 'index',
@@ -263,12 +293,56 @@ export default {
     ...mapGetters(['user'])
   },
   created() {
-    console.log(this.user);
     // window.isFullscreen = false
     this.updateTimer = setInterval(this.updateTime, 1000);
     this.getMessageList();
+    this.getProjectNum();
+    this.getTaskNum();
+    this.getWorkOrderNum();
+    this.getUserResourceList();
+    console.log(this.user);
   },
   methods: {
+    async getProjectNum() {
+      const {count} = await projectsPageAPI({size: 1, pageNum: 1, parentId: "0"})
+      this.projectNum = count;
+    },
+    async getTaskNum() {
+      const {count} = await projectsTaskPageAPI({size: 1, pageNum: 1})
+      this.taskNum = count;
+    },
+    async getWorkOrderNum() {
+      const {total} = await statistics()
+
+      this.workOrderNum = total;
+    },
+    async getUserResourceList() {
+      this.commonList = await userResourceListAPI()
+      this.commonList.unshift({
+        name: '添加',
+        id: '-1',
+        icon: 'el-icon-edit',
+      })
+    },
+    handelRouterTo(path) {
+      window.history.pushState(null, '', path)
+      // this.$router.push(path);
+    },
+    handleAdd(item) {
+      if (item.id == -1) {
+        this.commonDialogFlag = true
+        this.$nextTick(() => {
+          this.$refs.commonDialogRef.init()
+        })
+      } else {
+        let urlPath = item.topUrl + item.url
+        this.handelRouterTo(urlPath)
+      }
+    },
+    async handleCommonListDel(item, index) {
+      await userResourceDeleteAPI([item.id])
+      this.commonList.splice(index, 1)
+    },
     /* 表格数据源 */
     datasource({page, limit, where, order}) {
       return getTodoTaskPage({
@@ -278,7 +352,7 @@ export default {
       });
     },
     async getMessageList() {
-     const { list} = await notifyMessagePageAPI({
+      const {list} = await notifyMessagePageAPI({
         pageNum: 1,
         size: 9999,
         userId: this.user.info.userId
@@ -335,6 +409,7 @@ export default {
         this.$refs.detailRef.open(row.processInstance.id);
       }
     },
+
     /* 刷新表格 */
     reload(where) {
       this.$refs.table.reload({page: 1, where});
@@ -451,7 +526,8 @@ export default {
             display: flex;
             flex-direction: column;
             justify-content: space-around;
-            font-size: 0.8vw;
+            font-size: 0.7vw;
+            color: #000000;
           }
         }
 
@@ -460,9 +536,9 @@ export default {
           display: flex;
           flex-direction: column;
           justify-content: space-around;
-          align-items: center;
-          color: #404446;
-          font-size: 0.8vw;
+          align-items: flex-end;
+          color: #000000;
+          font-size: 0.7vw;
           margin: 0 10px;
         }
       }
@@ -493,7 +569,8 @@ export default {
     display: flex;
     min-height: 150px;
     min-width: 400px;
-    .card-cell-content{
+
+    .card-cell-content {
       display: flex;
       align-items: center;
       justify-content: flex-start;
@@ -503,11 +580,12 @@ export default {
       overflow-x: auto;
       padding: 0 10px;
 
-      .card-cell-content-div {
+      .card-cell-content-box {
         display: flex;
         flex-direction: column;
         align-items: center;
         height: 80%;
+        width: 100%;
         border: 1px solid #e3e5e4;
         justify-content: space-evenly;
         flex: 0 0 5.5%;
@@ -515,18 +593,31 @@ export default {
         border-radius: 5px;
         margin-right: 10px;
         cursor: pointer;
+
         &:hover {
           background: #dee4e9;
         }
       }
-      .card-cell-content-div i{
+
+      .card-cell-content-div {
+        height: 100%;
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: space-evenly;
+      }
+
+      .card-cell-content-div i {
         font-size: 2vw;
       }
+
       .card-cell-content-div span {
         letter-spacing: 2px;
         font-weight: 600;
       }
     }
+
     .middle-cell {
       flex: 0 0 100%;
     }
@@ -549,6 +640,7 @@ export default {
   height: calc(100% - 40px);
   padding: 0;
 }
+
 .scroll-box {
   height: 80%;
   width: 100%;
@@ -616,4 +708,5 @@ export default {
 .el-empty {
   padding: 0;
 }
+
 </style>