t

src/views/map/components/popup/MapTextEdit.vue

@@ -16,6 +16,9 @@
       <div class="scoped-color-quick" v-if="mteStr === 'polygonAdd' || mteStr === 'polylineAdd'">
         <div class="t">快速选择颜色</div>
         <div :class="fillColor === item.color ? 'op cur' : 'op'" v-for="(item, i) in colorArr" @click="colorHandle(item)" :style="`background: ${item.color}`" :key="i">{{fillColor === item.color ? '已选' : ' '}}</div>
+        <div style="padding-top: 10px;">
+          <div :class="fillColor === item.color ? 'op cur' : 'op'" v-for="(item, i) in colorArr2" @click="colorHandle(item)" :style="`background: ${item.color}`" :key="i">{{fillColor === item.color ? '已选' : ' '}}</div>
+        </div>
       </div>
       <div class="xl-form">
         <div class="xl-form-footer">
@@ -41,8 +44,8 @@ export default {
     return {
       loading: false,
       formData: [],
-      fillColor: '#DC3021',
-      strokeColor: '#DC3021',
+      fillColor: '#ff003f',
+      strokeColor: '#ff003f',
       colorArr: [
         {color: '#fb6557'}, 
         {color: '#ff9149'}, 
@@ -51,6 +54,13 @@ export default {
         {color: '#4da4ee'}, 
         {color: '#e77ad4'}
       ],
+      colorArr2: [
+        {color: '#ff0'}, 
+        {color: '#ff7fbf'}, 
+        {color: '#ff003f'}, 
+        {color: '#007299'}, 
+        {color: '#00ff3f'}, 
+      ],
       cObj: {},
     }
   },
@@ -72,6 +82,7 @@ export default {
         params.strokeColor = this.strokeColor
       }
       if (!params.text) params.text = '标题示例'
+      if (!params.strokeStyle) params.strokeStyle = 'solid'
       if (this.mteStr === 'polygonAdd' || this.mteStr === 'polylineAdd') {
         if (!params.fillColor) {
           params.fillColor = this.fillColor
@@ -83,6 +94,7 @@ export default {
           { label: '填充色', key: 'fillColor', type: 'colorPicker', rules: 1},
           { label: '透明度', key: 'fillOpacity', rules: 1},
           { label: '轮廓色', key: 'strokeColor', type: 'colorPicker', rules: 1},
+          { label: '实虚线', key: 'strokeStyle', type: 'select', options: [{key: '实线', val: 'solid'}, {key: '虚线', val: 'dashed'}]},
         ]
       } else {
         if (!params.color) {

src/views/map/dtl.vue

@@ -148,6 +148,7 @@
         :strokeColor="polygon.strokeColor"
         :strokeWeight="polygon.strokeWeight"
         :strokeOpacity="polygon.strokeOpacity"
+        :strokeStyle="polygon.strokeStyle"
         :extData="{index}"
         :events="polygonEvents">
       </el-amap-polygon>
@@ -160,6 +161,7 @@
         :strokeColor="polyline.strokeColor"
         :strokeWeight="polyline.strokeWeight"
         :strokeOpacity="polyline.strokeOpacity"
+        :strokeStyle="polyline.strokeStyle"
         :extData="{index}"
         :events="polylineEvents"
         :path="polyline.path">
@@ -791,6 +793,7 @@ export default {
           fillColor: obj.fillColor || '#DC3021', // 填充色
           fillOpacity: obj.fillOpacity || 0.4, // 填充透明度
           strokeColor: obj.strokeColor || '#DC3021', // 轮廓颜色
+          strokeStyle: obj.strokeStyle || 'solid',
           strokeWeight: 2, // 轮廓宽度
           strokeOpacity: 0.8, // 轮廓透明度
           text: obj.text,
@@ -823,6 +826,7 @@ export default {
           fillColor: obj.fillColor || '#DC3021', // 填充色
           fillOpacity: obj.fillOpacity || 0.4, // 填充透明度
           strokeColor: obj.strokeColor || '#DC3021', // 轮廓颜色
+          strokeStyle: obj.strokeStyle || 'solid',
           strokeWeight: 5, // 轮廓宽度
           strokeOpacity: 0.8, // 轮廓透明度
           text: obj.text,
@@ -838,10 +842,10 @@ export default {
       if (str === 'polygons' || str === 'polylines') {
         if (tempData[index].editable) {
           tempData[index].editable = false
-          tempData[index].strokeStyle = 'solid'
+          // tempData[index].strokeStyle = 'solid'
         } else {
           tempData[index].editable = true
-          tempData[index].strokeStyle = 'dashed'
+          // tempData[index].strokeStyle = 'dashed'
         }
       } else {
         tempData[index].draggable = !tempData[index].draggable
@@ -942,6 +946,7 @@ export default {
             tempData[index].fillColor = obj.fillColor
             tempData[index].fillOpacity = obj.fillOpacity
             tempData[index].strokeColor = obj.strokeColor
+            tempData[index].strokeStyle = obj.strokeStyle
           }
           this[str] = [...tempData]
           this.$storage(`map_${str}`, JSON.stringify(tempData))