a3fd08bd by renchao@pashanhoo.com

Merge branch 'dev' into master-hnz

2 parents 416cd9c3 566e79d7
1 { 1 {
2 "TITLE": "黄南州监管系统", 2 "TITLE": "黄南州监管系统",
3 "CODE": "BDCJGPT", 3 "CODE": "BDCJGPT",
4 "AREARMAP": "632300", 4 "AREARMAP": "610702",
5 "XZQ": "黄南州", 5 "XZQ": "黄南州",
6 "SERVERAPI": "/bdcjg", 6 "SERVERAPI": "/bdcjg",
7 "calcHeight": 200, 7 "calcHeight": 200,
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 <btn nativeType="cz" @click="resetForm">重置</btn> 86 <btn nativeType="cz" @click="resetForm">重置</btn>
87 <btn nativeType="cx" @click="handleSearch">查询</btn> 87 <btn nativeType="cx" @click="handleSearch">查询</btn>
88 <el-upload ref="upload" style="display:inline-block;margin-left: 10px" action="" :auto-upload="false" 88 <el-upload ref="upload" style="display:inline-block;margin-left: 10px" action="" :auto-upload="false"
89 accept=".xml" :show-file-list="false" 89 accept=".xml" :show-file-list="false" :multiple="true"
90 :before-upload="uploadRecord" :on-change="fileChange"> 90 :before-upload="uploadRecord" :on-change="fileChange">
91 <btn nativeType="cx">xml导入</btn> 91 <btn nativeType="cx">xml导入</btn>
92 </el-upload> 92 </el-upload>
......