zhulizhen1111 4 лет назад
Родитель
Сommit
667d129bb4
2 измененных файлов с 22 добавлено и 5 удалено
  1. 1 0
      .gitignore
  2. 21 5
      src/views/legendLibrary/addForm.vue

+ 1 - 0
.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
+package-lock.json
 /dist
 
 # local env files

+ 21 - 5
src/views/legendLibrary/addForm.vue

@@ -23,11 +23,15 @@
                 <div
                     v-else-if='ruleForm.Type=="Zone" '
                     class='model'
-                    :style='`background:${ruleForm.color};border-width:${ruleForm.borderLine}px;border-style:${ruleForm.borderColor}; border-color:${ruleForm.borderColor};`'
+                    :style='`background:${ruleForm.color};border-width:${ruleForm.linepx}px;border-style:${ruleForm.borderLine}; border-color:${ruleForm.borderColor};`'
                 ></div>
-                <div v-else class='model'>
-                    <img :src='linepxObject.src' alt v-if='linepxObject.src' />
-                    <img :src='borderLineOptionObject.src' alt v-if='borderLineOptionObject.src' />
+                <div
+                    v-else
+                    class='model1'
+                    :style='`border-width:${ruleForm.linepx}px;border-style:${ruleForm.borderLine}; border-color:${ruleForm.borderColor};`'
+                >
+                    <!-- <img :src='linepxObject.src' alt v-if='linepxObject.src' />
+                    <img :src='borderLineOptionObject.src' alt v-if='borderLineOptionObject.src' />-->
                 </div>
             </div>
         </div>
@@ -167,11 +171,14 @@ export default {
             uploadImg({ postParams }).then(res => {
                 if (res.Result == 'success') {
                     this.imgSrc = res.EntityList[0]
+
                     this.$message.success('图标上传成功!')
                 }
             })
         },
         changeSelection(val) {
+            console.log(val)
+            this.ruleForm.linepx = val
             this.linepxObject = val && this.linepxOption.find(item => item.id == val)
             this.$refs.select.$el.children[0].children[0].setAttribute(
                 'style',
@@ -179,6 +186,8 @@ export default {
             )
         },
         changeSelection1(val) {
+            console.log(val)
+            this.ruleForm.borderLine = val
             this.borderLineOptionObject = val && this.borderLineOption.find(item => item.id == val)
             this.$refs.select1.$el.children[0].children[0].setAttribute(
                 'style',
@@ -253,7 +262,6 @@ export default {
             height: 114px;
             background: rgba(245, 246, 247, 1);
             display: inline-block;
-            margin-left: 18px;
             display: flex;
             align-items: center;
             justify-content: center;
@@ -261,6 +269,14 @@ export default {
                 width: 56px;
                 height: 6px;
             }
+            .model {
+                width: 56px;
+                height: 40px;
+            }
+            img {
+                width: 100%;
+                height: 100%;
+            }
         }
     }
     .form3 {