diff --git a/pqs9200/src/main/resources/mybatis/mappers/weeklyReport/GetAreaPointInfoMapper.xml b/pqs9200/src/main/resources/mybatis/mappers/weeklyReport/GetAreaPointInfoMapper.xml
index 1fcdc7a..a20830f 100644
--- a/pqs9200/src/main/resources/mybatis/mappers/weeklyReport/GetAreaPointInfoMapper.xml
+++ b/pqs9200/src/main/resources/mybatis/mappers/weeklyReport/GetAreaPointInfoMapper.xml
@@ -96,13 +96,17 @@
 		f.longitude
 		longitude,f.latitude latitude
 		from
-		pq_line a,pq_substation
-		c,pq_subvoltage d,pq_device e,pqs_map
-		f,pq_devicedetail g
+		pq_line a,
+		pq_substation c,
+		pq_subvoltage d,
+		pq_device e,
+		pqs_map f,
+		pq_devicedetail g
 		where
-		a.sub_index=c.sub_index and a.subv_index=d.subv_index and
-		a.dev_index=e.dev_index
-		and a.sub_index=f.sub_index and
+		a.sub_index=c.sub_index and
+		a.subv_index=d.subv_index and
+		a.dev_index=e.dev_index and
+		a.sub_index=f.sub_index and
 		e.dev_index=g.dev_index and f.state =1
 		and e.devmodel=1
 		and e.datatype
diff --git a/pqs9200/src/main/webapp/jspJS/area/vdList.js b/pqs9200/src/main/webapp/jspJS/area/vdList.js
index 8f975a5..1d5f843 100644
--- a/pqs9200/src/main/webapp/jspJS/area/vdList.js
+++ b/pqs9200/src/main/webapp/jspJS/area/vdList.js
@@ -260,7 +260,7 @@
                     extend: 'csv',
                     title: name + '暂降事件列表',//导出csv名称
                     exportOptions: {
-                        columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,14],
+                        columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,14,15],
                         format: {
                             body: function (data, rID, cID) {
                                 if (cID === 0) {
diff --git a/pqs9900/src/main/webapp/WEB-INF/views/business/device/devmanage.jsp b/pqs9900/src/main/webapp/WEB-INF/views/business/device/devmanage.jsp
index 92629c6..d84cee3 100644
--- a/pqs9900/src/main/webapp/WEB-INF/views/business/device/devmanage.jsp
+++ b/pqs9900/src/main/webapp/WEB-INF/views/business/device/devmanage.jsp
@@ -178,9 +178,9 @@
 		</tr>
 		<tr>
 			<td align="right" class="width1">识别码:</td>
-			<td align="left" class="width2"><input type="password" class="width3" name="series" id="series" autocomplete="off" maxlength="255"></td>
+			<td align="left" class="width2"><input type="text" class="width3" name="series" id="series" autocomplete="off" maxlength="255"></td>
 			<td align="right" class="width1">秘钥:</td>
-			<td align="left" class="width2"><input type="password" class="width3" name="key" id="key" autocomplete="off" maxlength="255"></td>
+			<td align="left" class="width2"><input type="text" class="width3" name="key" id="key" autocomplete="off" maxlength="255"></td>
 			<td align="right" class="width1" id="call"></td>
 			<td align="left" class="width2"><select class="width3" id="callflag" hidden>
 			</select></td>