Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/api/index.js

@@ -787,6 +787,9 @@ export default {
         getParameterList (params) {
             return fetch(`/v1/science-admin/system-parameter/getParameterList`, params)
         },
+        getParameterListByTypeId (params) {
+            return fetch(`/v1/science-admin/system-parameter/getParameterListByTypeId`, params)
+        },
         getParameterById (params) {
             return fetch(`/v1/science-admin/system-parameter/getParameterById/`, params)
         },

src/views/report/project/components/fileInfo.vue

@@ -87,8 +87,14 @@ export default {
     },
   },
   data() {
-    return {};
+    return {
+      projAttribute: []
+    };
+  },
+  created () {
+  },
+  methods: {
+    
   },
-  methods: {},
 };
 </script>
\ No newline at end of file

src/views/report/project/components/projectKPI.vue

@@ -25,8 +25,8 @@
         <td class="bg-title">项目属性</td>
         <td colspan="10">
           <a-radio-group v-model="projectKPI.projAttribute">
-            <a-radio :value="newProject">新增项目</a-radio>
-            <a-radio :value="delayProject">延期项目</a-radio>
+            <a-radio :value="projAttributes[0].id">projAttributes[0].name</a-radio>
+            <a-radio :value="projAttributes[1].id">projAttributes[1].name</a-radio>
           </a-radio-group>
         </td>
         <td colspan="2" class="bg-title">项目期</td>
@@ -112,14 +112,26 @@ export default {
   },
   data() {
     return {
-      newProject: "5b9d6509-aece-11ef-b6cb-0c42a1380f01",
-      delayProject: "5b9d6509-aece-11ef-b6cb-0c42a1380f02",
+      projAttributes: [
+        { id: "5b9d6509-aece-11ef-b6cb-0c42a1380f01", name: "新增项目" },
+        { id: "5b9d6509-aece-11ef-b6cb-0c42a1380f02", name: "延期项目" },
+      ],
     };
   },
   created () {
     //this.getProjectKpitStatistic()
+    this.LoadParameterInfo()
   },
   methods: {
+    LoadParameterInfo() {
+      let pars1 = { typeId: 67 }
+      this.$api.parameter.getParameterListByTypeId(pars1)
+        .then(({ data = {} }) => {
+          this.projAttributes = data
+          //console.log(this.projAttribute[0].id)
+        })
+        .catch(() => { });
+    },
     getProjectKpitStatistic() {
       this.$api.statistical.getProjectKpitStatistic().then(({ data = {} }) => {
         if (data) {