diff --git a/src/iscs/utils/parser.js b/src/iscs/utils/parser.js
index 08fc4c9aa..6dacc418f 100644
--- a/src/iscs/utils/parser.js
+++ b/src/iscs/utils/parser.js
@@ -36,6 +36,11 @@ export function deviceFactory(type, elem) {
 export function parser(data) {
     var iscsDevice = {};
     if (data) {
+		Object.values(data).forEach(list => {
+			if (list instanceof Array) {
+				list.sort((a, b) => parseInt(a.code.split('_')[1]) - parseInt(b.code.split('_')[1]));
+			}
+		})
         zrUtil.each(data.manualAlarmButtonList || [], elem => {
             iscsDevice[elem.code] = deviceFactory(deviceType.ManualAlarmButton, elem);
         }, this);
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 29e608467..2d2373cdb 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,10 +2,10 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
         // BASE_API = 'http://192.168.8.129:9000'; // 旭强
-        BASE_API = 'http://192.168.8.119:9000'; // 张赛
+        // BASE_API = 'http://192.168.8.119:9000'; // 张赛
         // BASE_API = 'http://192.168.8.140:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
diff --git a/src/views/iscs/iscsDraw/icscComponents/line.vue b/src/views/iscs/iscsDraw/icscComponents/line.vue
index ca46e6b8b..05bd03bee 100644
--- a/src/views/iscs/iscsDraw/icscComponents/line.vue
+++ b/src/views/iscs/iscsDraw/icscComponents/line.vue
@@ -5,7 +5,7 @@
         <el-input-number v-model="form.z2" controls-position="right" :min="0" size="small" />
       </el-form-item>
       <el-form-item label="线段宽度:" prop="lineWidth">
-        <el-input-number v-model="form.lineWidth" controls-position="right" :min="0" :max="50" size="small" />
+        <el-input-number v-model="form.lineWidth" controls-position="right" :min="0" :max="1000" size="small" />
       </el-form-item>
       <el-form-item label="类型:" prop="type">
         <el-select v-model="form.classify" placeholder="请选择类型" size="small">
diff --git a/src/views/iscs/iscsSystem/stationConfig/fas/index.vue b/src/views/iscs/iscsSystem/stationConfig/fas/index.vue
index 1d2fb0e49..5c97e047a 100644
--- a/src/views/iscs/iscsSystem/stationConfig/fas/index.vue
+++ b/src/views/iscs/iscsSystem/stationConfig/fas/index.vue
@@ -69,7 +69,7 @@ export default {
             } else if (this.mode == 'sensing') {
                 this.title = '';
                 this.scaleRate = window.innerWidth / 1920;
-                this.height = 900;
+                this.height = 800;
             } else if (this.mode == 'section') {
                 this.title = this.stationName + ' 火灾报警系统 区间层';
                 this.scaleRate = window.innerWidth / 1920;
diff --git a/src/views/iscsSystem/index.vue b/src/views/iscsSystem/index.vue
index ff7f5d03d..2b358bab4 100644
--- a/src/views/iscsSystem/index.vue
+++ b/src/views/iscsSystem/index.vue
@@ -180,7 +180,8 @@ export default {
                     } else if (this.selected._type != 'CheckBox') {
                         this.copyModel = this.copyModelInfo(this.selected, 10);
                         const type1 = this.selected._type.charAt(0).toLowerCase() + this.selected._type.slice(1);
-                        this.copyModel.code = getUID(this.selected._type, this.iscs[type1 + 'List'] || []);
+						const list = this.iscs[type1 + 'List'] || [];
+                        this.copyModel.code = getUID(this.selected._type, list);
                     } else {
                         this.copyModel = {};
                     }