From 55d4ff6e696cfaec20027f4646754a1fd39e453b Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 4 Aug 2022 17:26:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E6=96=B0=E5=BB=BA=20bug?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newMap/mapDraftPicture/createPicture.vue  |  6 ++--
 src/views/newMap/registerBook/index.vue       | 29 +++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/views/newMap/mapDraftPicture/createPicture.vue b/src/views/newMap/mapDraftPicture/createPicture.vue
index c56ba31df..18855223a 100644
--- a/src/views/newMap/mapDraftPicture/createPicture.vue
+++ b/src/views/newMap/mapDraftPicture/createPicture.vue
@@ -47,7 +47,7 @@ export default {
         return {
             centerDialogVisible: false,
             skinCodeList: [],
-            ruleForm: { name: '', type: '', stationCode: '', lineCode: '', deviceMap: {} },
+            ruleForm: { name: '', type: '', stationCode: '', lineCode: '' },
             rules: {
                 name: [{ required: true, message: '请输入画面名称', trigger: 'blur' }],
                 type: [{ required: true, message: '请选择画面类型', trigger: 'change' }],
@@ -78,9 +78,9 @@ export default {
                 if (valid) {
                     const map = this.$store.state.map.map;
                     if (map && map.pictureList && map.pictureList.length) {
-                        map.pictureList.push({...this.ruleForm, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }});
+                        map.pictureList.push({...this.ruleForm, deviceMap: {}, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }});
                     } else {
-                        map.pictureList = [{...this.ruleForm, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }}];
+                        map.pictureList = [{...this.ruleForm, deviceMap: {}, scaling: map.scaling || '1', origin: { x: map.origin ? map.origin.x : 0, y: map.origin ? map.origin.y : 0 }}];
                     }
                     if (map && parseInt(this.$route.params.mapId)) {
                         saveMap(Object.assign(map, { mapId: this.$route.params.mapId })).then(() => {
diff --git a/src/views/newMap/registerBook/index.vue b/src/views/newMap/registerBook/index.vue
index a39587237..30d164b70 100644
--- a/src/views/newMap/registerBook/index.vue
+++ b/src/views/newMap/registerBook/index.vue
@@ -423,6 +423,35 @@
             </div>
           </div>
         </el-row>
+        <el-row style="display: flex;">
+          <div class="border-box" style="width: 10%;">计数器</div>
+          <div style="width: 90%;">
+            <el-row style="display: flex;justify-content: space-between;">
+              <div class="border-box" style="width: 100%;">名称</div>
+              <div class="border-box" style="width: 100%;">S总人工解锁</div>
+              <div class="border-box" style="width: 100%;">S引导</div>
+              <div class="border-box" style="width: 100%;">S总锁闭</div>
+              <div class="border-box" style="width: 100%;">X总人工解锁</div>
+              <div class="border-box" style="width: 100%;">X引导</div>
+              <div class="border-box" style="width: 100%;">X总锁闭</div>
+              <div class="border-box" style="width: 100%;">S故障</div>
+              <div class="border-box" style="width: 100%;">S接车引导</div>
+              <div class="border-box" style="width: 100%;">南场</div>
+            </el-row>
+            <el-row style="display: flex;justify-content: space-between;">
+              <div class="border-box" style="width: 100%;">号码</div>
+              <div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
+              <div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
+              <div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
+              <div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
+              <div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
+              <div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
+              <div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
+              <div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
+              <div class="border-box" style="width: 100%;"><el-input v-model="value" size="mini" /></div>
+            </el-row>
+          </div>
+        </el-row>
       </el-tab-pane>-->
     </el-tabs>
   </el-dialog>