Merge pull request 'dj' (#822) from dj into master

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

src/api/home/index.js

@@ -13,3 +13,11 @@ export const getDoneTaskInfo = () => {
     method: "get"
   });
 };
+
+//获取专项资金饼图数据
+export const getSpecialFundChart = () => {
+  return request({
+    url: '/workflow/home/page/statistic',
+    method: "get"
+  });
+};

src/views/home/index.vue

@@ -54,7 +54,10 @@
                       <Tag dictType="todo_type" :value="item.targetState"/>
                     </div>
                     <div v-else></div>
-                    <div class="target-name">{{item.targetState=='00'?'征集名称':'项目名称'}}：{{ item.targetName }}</div>
+                    <div class="target-name">{{ item.targetState == '00' ? '征集名称' : '项目名称' }}：{{
+                        item.targetName
+                      }}
+                    </div>
                     <div class="black-text">发起人：{{ item.initiatorName }}</div>
                     <div class="black-text">当前节点：{{ item.taskName }}</div>
                     <div class="gray-time">
@@ -106,7 +109,10 @@
                       <Tag dictType="todo_type" :value="item.targetState"/>
                     </div>
                     <div v-else></div>
-                    <div class="target-name">{{item.targetState=='00'?'征集名称':'项目名称'}}：{{ item.targetName }}</div>
+                    <div class="target-name">{{ item.targetState == '00' ? '征集名称' : '项目名称' }}：{{
+                        item.targetName
+                      }}
+                    </div>
                     <div class="black-text">发起人：{{ item.initiatorName }}</div>
                     <!--                    <div class="black-text">当前节点：{{ item.taskName }}</div>-->
                     <div class="gray-time">
@@ -229,7 +235,9 @@
                 </div>
               </div>
             </div>
-            <div class="fund-pie" v-if="totalMoney" style="text-align: left;margin-left: 70px;margin-top: 10px">研发投入资金统计图</div>
+            <div class="fund-pie" v-if="totalMoney" style="text-align: left;margin-left: 70px;margin-top: 10px">
+              研发投入资金统计图
+            </div>
           </div>
         </div>
       </el-col>
@@ -312,6 +320,7 @@ import {ElNotification} from "element-plus";
 import {getHomeTaskInfo, getDoneTaskInfo} from "@/api/home";
 import {getResearchFundChart} from "@/api/research-fund";
 import {getArticle} from "@/api/article";
+import {getSpecialFundChart} from "../../api/home";
 
 const AuthStore = useAuthStore()
 const router = useRouter()
@@ -422,7 +431,7 @@ const fundPieOption = ref({
       },
       left: 'center',
       right: 'center',
-      top: '42%',
+      top: '42%'
     }]
   },
   series: [
@@ -542,6 +551,7 @@ const moneyPieOption = ref({
 onMounted(async () => {
   getTodoList()
   getDoneList()
+  await getFundChart()
   await getResearchChart()
   // nextTick(() => {
   //  let topLeft=document.getElementById('topLeft')
@@ -552,7 +562,7 @@ onMounted(async () => {
   rulesList.value = await getArticleList(1)
   helpDocList.value = await getArticleList(2)
   problemList.value = await getArticleList(3)
-  await initFundCharts()
+  // await initFundCharts()
 })
 const handleGoToArticleDetail = (row) => {
   router.push({
@@ -622,6 +632,29 @@ const changeResearchFundDataByYear=(year)=>{
 
   }
 }
+const getFundChart = () => {
+  getSpecialFundChart().then(res => {
+    if (res.code === 1000) {
+      moneyData.value = res.data
+      if (res.data?.length == 0) return;
+      if (fundPieOption.value.series && fundPieOption.value.series?.length > 0) {
+        fundPieOption.value.series[0].data[0].value = res.data[0].value
+        fundPieOption.value.series[0].data[0].name = res.data[0].name
+        fundPieOption.value.series[0].data[1].value = res.data[1].value
+        fundPieOption.value.series[0].data[1].name = res.data[1].name
+        nextTick(() => {
+          initFundCharts()
+        })
+      }
+    } else {
+      ElNotification({
+        title: '提示',
+        message: res.msg,
+        type: 'error'
+      })
+    }
+  })
+}
 const getResearchChart = (year) => {
   getResearchFundChart(year).then(res => {
     if (res.code === 1000) {
@@ -803,6 +836,7 @@ const handleView = (row) => {
   }
 
 }
+
 @media only screen and (max-width: 1720px) {
   .statistics {
     .block {
@@ -817,6 +851,7 @@ const handleView = (row) => {
   //  height: 624px !important;
   //}
 }
+
 @media only screen and (max-width: 1620px) {
   .statistics {
     .block {
@@ -825,6 +860,7 @@ const handleView = (row) => {
   }
 
 }
+
 @media only screen and (max-width: 1500px) {
   .statistics {
     .block {
@@ -943,11 +979,13 @@ const handleView = (row) => {
     color: #000000;
     line-height: 18px;
   }
+
   .legend-block {
     height: 240px;
     overflow-y: auto;
     display: flex;
     flex-direction: column;
+
     &::-webkit-scrollbar {
       width: 6px;
       height: 6px;
@@ -965,6 +1003,7 @@ const handleView = (row) => {
       border-radius: 10px;
     }
   }
+
   .legend {
     margin-top: 14px;
     display: flex;
@@ -1236,6 +1275,7 @@ const handleView = (row) => {
             margin-bottom: 7px;
             font-size: 12px;
           }
+
           .target-name {
             width: 140px;
             color: #000000;
@@ -1246,6 +1286,7 @@ const handleView = (row) => {
             white-space: nowrap;
             -webkit-line-clamp: 1;
           }
+
           .process-type {
             white-space: nowrap;
             margin-top: 13px;

src/views/research-fund/index.vue

@@ -98,14 +98,14 @@ const researchFundTableConfig = reactive({
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = []
-        btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
+        btn.push({label: '编辑',  prem: ['rd:fund:update'], func: () => handleEdit(row), type: 'primary'})
         return (
             <div style={{width: '100%'}}>
               {
                 btn.map(item => (
                     <el-button
                         type={item.type}
-                        // v-perm={item.prem}
+                        v-perm={item.prem}
                         onClick={() => item.func()}
                         link
                     >
@@ -114,7 +114,7 @@ const researchFundTableConfig = reactive({
                 ))
               }
               {
-                <popover-delete name={row.rdCompany} type={'研发投入资金'} btnType={'danger'}
+                <popover-delete name={row.rdCompany} type={'研发投入资金'} btnType={'danger'} perm={['rd:fund:remove']}
                                 onDelete={() => handleDelete(row)}/>
 
               }
@@ -125,7 +125,7 @@ const researchFundTableConfig = reactive({
   ],
   api: '/workflow/mosr/rd/list',
   btns: [
-    {name: '新增', key: 'add', color: '#DED0B2'}
+    {name: '新增', key: 'add', color: '#DED0B2', auth: ['rd:fund:add']}
   ],
   params: {}
 })