Merge pull request 'master' (#774) from master into prod

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

src/components/DetailComponent/SpecialFundDetail.vue

@@ -25,7 +25,7 @@
           </el-form-item>
         </el-col>
         </el-row>
-      <el-row style="margin-bottom: -18px">
+      <el-row style="margin-bottom: -18px" class="projects">
         <baseTitle title="关联项目" v-if="!data.taskId"></baseTitle>
         <el-col :span="24" v-if="!data.taskId" >
           <el-form-item >
@@ -251,9 +251,12 @@ watch(() => props.showTable, (newVal) => {
 </script>
 
 <style scoped lang="scss">
-:deep(.el-table--fit ) {
+.projects{
-  height: 300px !important;
+  :deep(.el-table--fit ) {
+    height: 300px !important;
+  }
 }
+
 :deep(.el-table__header) {
   .is-leaf:first-child {
     .cell {

src/views/home/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="home-bg" v-if="AuthStore.roles.length">
     <el-row gutter="10">
-      <el-col :xs="24" :sm="24" :md="18" :lg="18" :xl="18">
+      <el-col :xs="24" :sm="24" :md="24" :lg="18" :xl="18">
         <div class="top-left">
           <el-card shadow="never">
             <div class="notice-title">早上好，小i提醒您<span>有<span>{{ taskTabList[0].num }}</span>个审批待立项</span></div>
@@ -103,7 +103,7 @@
           </el-card>
         </div>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6">
+      <el-col :xs="24" :sm="24" :md="24" :lg="6" :xl="6">
         <div class="right">
           <div class="right-top ">
             <div class="title-block">
@@ -766,7 +766,8 @@ onMounted(() => {
 })
 
 window.addEventListener('resize', () => {
-  data.pieCharts = null
+  data.fundPieCharts = null
+  data.moneyPieCharts = null
   init()
 })
 
@@ -888,6 +889,44 @@ const handleView = (row) => {
 </script>
 
 <style lang="scss" scoped>
+
+@media only screen and (max-width: 767px) {
+  .right {
+    margin-top: 10px;
+  }
+  :deep(.el-table) {
+    height: 300px !important;
+  }
+  .todo-bg {
+    margin-top: 10px;
+  }
+}
+
+@media only screen and (max-width: 1000px) {
+  .right {
+    margin-top: 10px;
+  }
+  :deep(.el-table) {
+    height: 300px !important;
+  }
+  .todo-bg {
+    margin-top: 10px;
+  }
+
+}
+
+@media only screen and (max-width: 1200px) {
+  .right {
+    margin-top: 10px;
+  }
+  :deep(.el-table) {
+    height: 300px !important;
+  }
+  .todo-bg {
+    margin-top: 10px;
+  }
+
+}
 * {
   font-family: Source Sans Pro, Source Sans Pro;
 }
@@ -1014,27 +1053,6 @@ const handleView = (row) => {
   }
 }
 
-@media only screen and (max-width: 767px) {
-  .right {
-    margin-top: 10px;
-  }
-  :deep(.el-table) {
-    height: 300px !important;
-  }
-  .todo-bg {
-    margin-top: 10px;
-  }
-}
-
-@media only screen and (max-width: 1000px) {
-  .right {
-    margin-top: 10px;
-  }
-  :deep(.el-table) {
-    height: 300px !important;
-  }
-
-}
 
 .home-bg {
   height: calc(100vh - 130px);