Merge pull request 'fix : 优化首页样式' (#776) from de into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/776

src/views/home/index.vue

@@ -39,17 +39,21 @@
                   </div>
                 </div>
                 <div class="todo-content">
-                  <div v-if="todoList&&todoList.length==0">
+                  <div v-if="todoList&&todoList.length==0" style="width: 100%">
-                    <el-empty image-size="135" description="暂无已办数据~"/>
+                    <el-empty image-size="88" description="暂无待办数据~"/>
                   </div>
                   <div v-for="item in todoList" class="todo-border">
 <!--                    <div class="status-style"-->
 <!--                         :style="{'background-color': item.status == 0 ? '#F55815' : item.status == 1 ? '#20BDA1' : '#4C52EA'}">-->
 <!--                      {{ item.status == 0 ? '加急' : item.status == 1 ? '正常' : '逾期' }}-->
 <!--                    </div>-->
-                    <div class="status-style">
+<!--                    <div class="status-style">-->
-                      {{item.targetState}}
+<!--                      {{item.targetState}}-->
+<!--                    </div>-->
+                    <div v-if="item.targetState !== null|| item.targetState !== undefined" style="margin-bottom: 14px">
+                      <Tag dictType="todo_type" :value="item.targetState"/>
                     </div>
+                    <div v-else></div>
                     <div class="black-text">发起人：{{ item.initiatorName }}</div>
                     <div class="black-text">当前节点：{{ item.taskName }}</div>
                     <div class="gray-time">
@@ -61,7 +65,7 @@
                         <div class="time"> {{ item.submitTime }}</div>
                         <div class="time">时间要求 {{ item.totalTime }}天</div>
                       </div>
-                      <div class="view">查看</div>
+                      <div class="view" @click="handleView(item)">查看</div>
                     </div>
                   </div>
                 </div>
@@ -74,30 +78,49 @@
                 <!--                </fvTable>-->
               </el-tab-pane>
               <el-tab-pane :label="'已办（' + reportNum + '）'" name="second">
-                <div v-if="doneList&&doneList.length==0">
+                <div class="todo-top">
-                  <el-empty image-size="135" description="暂无已办数据~"/>
+                  <div class="bell">
-                </div>
+                    <el-icon size="20" color="#F55815">
-                <div v-for="item in doneList" class="todo-border">
+                      <BellFilled/>
-<!--                  <div class="status-style"-->
+                    </el-icon>
-<!--                       :style="{'background-color': item.status == 0 ? '#F55815' : item.status == 1 ? '#20BDA1' : '#4C52EA'}">-->
+                    <span>您有{{ todoList.length }}条待办需要处理</span>
-<!--                    {{ item.status == 0 ? '加急' : item.status == 1 ? '正常' : '逾期' }}-->
-<!--                  </div>-->
-                  <div class="status-style">
-                    {{item.targetState}}
                   </div>
-                  <div class="black-text">发起人：{{ item.initiatorName }}</div>
+                  <div class="todo-more">
-                  <div class="black-text">当前节点：{{ item.taskName }}</div>
+                    <span>查看更多</span>
-                  <div class="gray-time">
+                    <el-icon color="#1F63E6" size="18">
-                    <div>
+                      <ArrowRight/>
-                      <div class="title">
+                    </el-icon>
-                        <svg-icon name="home-time" :class-name="'home-time'"/>
+                  </div>
-                        <span>提交时间：</span>
+                </div>
-                      </div>
+                <div class="todo-content">
-                      <div class="time"> {{ item.submitTime }}</div>
+                  <div v-if="doneList&&doneList.length==0" style="width: 100%">
+                    <el-empty image-size="88" description="暂无已办数据~"/>
+                  </div>
+                  <div v-for="item in doneList" class="todo-border">
+                    <!--                  <div class="status-style"-->
+                    <!--                       :style="{'background-color': item.status == 0 ? '#F55815' : item.status == 1 ? '#20BDA1' : '#4C52EA'}">-->
+                    <!--                    {{ item.status == 0 ? '加急' : item.status == 1 ? '正常' : '逾期' }}-->
+                    <!--                  </div>-->
+                    <div v-if="item.targetState !== null|| item.targetState !== undefined" style="margin-bottom: 14px">
+                      <Tag dictType="todo_type" :value="item.targetState"/>
+                    </div>
+                    <div v-else></div>
+                    <div class="black-text">发起人：{{ item.initiatorName }}</div>
+                    <div class="black-text">当前节点：{{ item.taskName }}</div>
+                    <div class="gray-time">
+                      <div>
+                        <div class="title">
+                          <svg-icon name="home-time" :class-name="'home-time'"/>
+                          <span>提交时间：</span>
+                        </div>
+                        <div class="time"> {{ item.submitTime }}</div>
+                        <div class="time">时间要求 {{ item.totalTime }}天</div>
+                      </div>
+                      <div class="view" @click="handleView(item)">查看</div>
                     </div>
-                    <div class="view">查看</div>
                   </div>
                 </div>
+
                 <!--                <fvTable ref="tableConfigReportRef" :tableConfig="tableConfigReport" @getTotal="getReportNumTotal">-->
                 <!--                  <template #empty>-->
                 <!--                    <el-empty description="暂无数据"/>-->
@@ -256,6 +279,8 @@ import 'element-plus/theme-chalk/display.css'
 import {useAuthStore} from '@/stores/userstore.js'
 import * as echarts from 'echarts'
 import {toThousands} from "@/utils/changePrice.js";
+import {ElNotification} from "element-plus";
+import {getHomeInfo} from "@/api/home";
 
 const AuthStore = useAuthStore()
 const router = useRouter()
@@ -315,7 +340,7 @@ const taskTabList = ref([
 const todoList = ref([
   {
     status: 0,
-    targetState: '项目归档',
+    targetState: '00',
     initiatorName: '胡晓',
     taskName: '审批人',
     submitTime: '2024-08-07 19:00:01',
@@ -323,7 +348,7 @@ const todoList = ref([
   },
   {
     status: 1,
-    targetState: '项目归档',
+    targetState: '10',
     initiatorName: '胡晓',
     taskName: '审批人',
     submitTime: '2024-08-07 19:00:01',
@@ -331,7 +356,7 @@ const todoList = ref([
   },
   {
     status: 2,
-    targetState: '项目归档',
+    targetState: '20',
     initiatorName: '胡晓',
     taskName: '审批人',
     submitTime: '2024-08-07 19:00:01',
@@ -339,7 +364,7 @@ const todoList = ref([
   },
   {
     status: 0,
-    targetState: '项目归档',
+    targetState: '40',
     initiatorName: '胡晓',
     taskName: '审批人',
     submitTime: '2024-08-07 19:00:01',
@@ -347,7 +372,7 @@ const todoList = ref([
   },
   {
     status: 1,
-    targetState: '项目归档',
+    targetState: '50',
     initiatorName: '胡晓',
     taskName: '审批人',
     submitTime: '2024-08-07 19:00:01',
@@ -355,7 +380,7 @@ const todoList = ref([
   },
   {
     status: 2,
-    targetState: '项目归档',
+    targetState: '80',
     initiatorName: '胡晓',
     taskName: '审批人',
     submitTime: '2024-08-07 19:00:01',
@@ -783,8 +808,22 @@ const init = () => {
   data.fundPieCharts = echarts.init(document.getElementById('fundPie')).setOption(fundPieOption.value)
   data.moneyPieCharts = echarts.init(document.getElementById('moneyPie')).setOption(moneyPieOption.value)
 }
-
+const getTodoList=()=>{
+  getHomeInfo().then(res => {
+    if (res.code === 1000) {
+      // todoList.value=res.data.rows
+      // todoNum.value=res.data.total
+    }else{
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type:  'error'
+      })
+    }
+  })
+}
 onMounted(() => {
+  // getTodoList()
   init()
 })
 
@@ -847,9 +886,6 @@ const handleReport = (row) => {
     }
   })
 }
-const getTotal = (val) => {
-  todoNum.value = val
-}
 const getReportNumTotal = (val) => {
   reportNum.value = val
 }