Browse Source

附件补充增加研发立项决议文件;首页布局增加响应式处理

ljb 8 months ago
parent
commit
9ebbc2bd33
2 changed files with 49 additions and 32 deletions
  1. 31 14
      src/views/archive-manage/file-supplement.vue
  2. 18 18
      src/views/wel/index.vue

+ 31 - 14
src/views/archive-manage/file-supplement.vue

@@ -121,51 +121,68 @@ export default window.$crudCommon({
           let list = [{
             id: data.data.id,
             fileName: '高新项目技术鉴定资料',
-            fileList: JSON.parse(data.data.d1 || '[]')
+            fileList: JSON.parse(data.data.d1 || '[]'),
+            rowIndex: 'd1'
           }, {
             id: data.data.id,
             fileName: '加计扣除项目技术鉴定资料',
-            fileList: JSON.parse(data.data.d2 || '[]')
+            fileList: JSON.parse(data.data.d2 || '[]'),
+            rowIndex: 'd2'
           }, {
             id: data.data.id,
             fileName: '高新技术企业认定资料',
-            fileList: JSON.parse(data.data.d3 || '[]')
+            fileList: JSON.parse(data.data.d3 || '[]'),
+            rowIndex: 'd3'
+          }, {
+            id: data.data.id,
+            fileName: '研发立项决议文件',
+            fileList: JSON.parse(data.data.d13 || '[]'),
+            rowIndex: 'd13'
           }, {
             id: data.data.id,
             fileName: '年度主要产品(服务)发挥核心支持作用的技术属于《国家重点支持的高新技术领域》规定范围的说明',
-            fileList: JSON.parse(data.data.d4 || '[]')
+            fileList: JSON.parse(data.data.d4 || '[]'),
+            rowIndex: 'd4'
           }, {
             id: data.data.id,
             fileName: '高新技术产品(服务)及对应收入资料',
-            fileList: JSON.parse(data.data.d5 || '[]')
+            fileList: JSON.parse(data.data.d5 || '[]'),
+            rowIndex: 'd5'
           }, {
             id: data.data.id,
             fileName: '年度职工和科技人员情况说明',
-            fileList: JSON.parse(data.data.d6 || '[]')
+            fileList: JSON.parse(data.data.d6 || '[]'),
+            rowIndex: 'd6'
           }, {
             id: data.data.id,
             fileName: '当年和前两个会计年度研发费用总额及占同期销售收入比例的说明',
-            fileList: JSON.parse(data.data.d7 || '[]')
+            fileList: JSON.parse(data.data.d7 || '[]'),
+            rowIndex: 'd7'
           }, {
             id: data.data.id,
             fileName: '研发管理制度',
-            fileList: JSON.parse(data.data.d8 || '[]')
+            fileList: JSON.parse(data.data.d8 || '[]'),
+            rowIndex: 'd8'
           }, {
             id: data.data.id,
             fileName: '研发费用结构明细表',
-            fileList: JSON.parse(data.data.d9 || '[]')
+            fileList: JSON.parse(data.data.d9 || '[]'),
+            rowIndex: 'd9'
           }, {
             id: data.data.id,
             fileName: '加计扣除情况说明',
-            fileList: JSON.parse(data.data.d10 || '[]')
+            fileList: JSON.parse(data.data.d10 || '[]'),
+            rowIndex: 'd10'
           }, {
             id: data.data.id,
             fileName: '其他高新备查资料',
-            fileList: JSON.parse(data.data.d11 || '[]')
+            fileList: JSON.parse(data.data.d11 || '[]'),
+            rowIndex: 'd11'
           }, {
             id: data.data.id,
             fileName: '其他加计扣除备查资料',
-            fileList: JSON.parse(data.data.d12 || '[]')
+            fileList: JSON.parse(data.data.d12 || '[]'),
+            rowIndex: 'd112'
           }];
           this.data = list;
         }
@@ -174,7 +191,7 @@ export default window.$crudCommon({
         this.loading = false;
       })
     },
-    handleBeforeOpen(done) {
+    handleBeforeOpen(done, form) {
       this.currIndex = this.form.$index + 1;
       done();
     },
@@ -207,7 +224,7 @@ export default window.$crudCommon({
       
     },
     getFormData() {
-      return { id: this.form.id, yearAndMonth: this.params.year, [`d${this.currIndex}`]: JSON.stringify(this.form.fileList) }
+      return { id: this.form.id, yearAndMonth: this.params.year, [`${this.form.rowIndex}`]: JSON.stringify(this.form.fileList) }
     },
     handleDownTemp(templateKey) {
       getDictValueByKey('fjbczl-template', templateKey).then(({ data }) => {

+ 18 - 18
src/views/wel/index.vue

@@ -10,8 +10,8 @@
         </div>
       </div>
 
-      <el-row gutter="20">
-        <el-col :span="9">
+      <el-row>
+        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="9">
           <basic-card title="研发项目情况">
             <avue-data-display :option="projectTotalOpt"></avue-data-display>
             <div style="position: relative;">
@@ -22,7 +22,7 @@
             </div>
           </basic-card>
         </el-col>
-        <el-col :span="9">
+        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="9">
           <basic-card title="研发费用情况">
             <avue-data-display :option="RD_costOpt"></avue-data-display>
             <div style="position: relative;">
@@ -37,8 +37,8 @@
 
       <el-divider></el-divider>
 
-      <el-row gutter="20">
-        <el-col :span="9">
+      <el-row>
+        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="9">
           <basic-card title="研发人员情况">
             <avue-data-display :option="RD_person_zb_opt"></avue-data-display>
             <div style="position: relative;">
@@ -49,7 +49,7 @@
             </div>
           </basic-card>
         </el-col>
-        <el-col :span="9">
+        <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="9">
           <basic-card title="知识产权情况">
             <avue-data-display :option="zscqTotalOpt"></avue-data-display>
             <div style="position: relative;">
@@ -78,14 +78,14 @@
       <el-divider></el-divider>
 
       <basic-card title="项目预算与归集趋势图">
-        <el-row :gutter="24">
-          <el-col :span="12">
+        <el-row>
+          <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
             <basic-chart
               style="width: 100%; height: 300px"
               :options="currYearBudgetOpt"
             />
           </el-col>
-          <el-col :span="12">
+          <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
             <basic-chart
               style="width: 100%; height: 300px"
               :options="fullCycleBudgetOpt"
@@ -355,8 +355,6 @@ export default {
           this.yfPersonZb = 0;
         }
         
-        console.log(_personList, yfPersonList)
-
         this.RD_personOpt = this.getPieOptions("", [
           { value: _personList.filter(item => item.situation == '全职').length, name: "全职" },
           { value: _personList.filter(item => item.situation == '非全职').length, name: "非全职" },
@@ -369,7 +367,6 @@ export default {
      */
     getXmysygjqstFunc(currentYear) {
       getXmysygjqst({ year: this.currYear, currentYear }).then(({ data }) => {
-        console.log(data)
         let xmList = [], ysList = [], costList = [];
         data.data.forEach(item => {
           xmList.push(item.XMMC);
@@ -433,20 +430,23 @@ export default {
           trigger: "item",
         },
         legend: {
-          orient: "vertical",
-          top: "center",
-          right: 0,
+          // orient: "vertical",
+          // top: "center",
+          // right: 0,
+          bottom: 0,
+          left: 'center',
           textStyle: {
             rich: {
               a: {
                 verticalAlign: "right",
                 align: "left",
-                width: 160,
+                // width: 160,
                 fontSize: 14,
               },
               num: {
                 align: "right",
                 fontSize: 14,
+                padding: [0, 0, 0, 10],
                 color: "rgb(64, 158, 255)",
               },
             },
@@ -461,8 +461,8 @@ export default {
           {
             name: title,
             type: "pie",
-            radius: ["45%", "70%"],
-            center: ["25%", "50%"],
+            radius: ["50%", "65%"],
+            center: ["50%", "35%"],
             avoidLabelOverlap: false,
             label: {
               show: false,