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

src/views/components/common/baseSelect.vue

@@ -101,8 +101,8 @@ export default {
     },
     getIsSelect () {
       let arr = []
-      arr.push({ title: '是', key: '是' })
-      arr.push({ title: '否', key: '否' })
+      arr.push({ title: '是', key: '1' })
+      arr.push({ title: '否', key: '0' })
       this.selectArray = arr
       this.loadValue()
     },

src/views/report/project/components/keyProject/projectEdit.vue

@@ -43,7 +43,7 @@
       <a-row>
         <a-col :span="24" style="border-top: 0px">
           <div class="tb-title">
-            <span>项目申报单位</span>
+            <span>项目基本情况</span>
           </div>
         </a-col>
       </a-row>