Jelajahi Sumber

判断color

shaun-sheep 4 tahun lalu
induk
melakukan
db3048354b
3 mengubah file dengan 81 tambahan dan 74 penghapusan
  1. 2 2
      public/systemConf.js
  2. 75 71
      src/views/legendLibrary/addForm.vue
  3. 4 1
      src/views/legendRules/index.vue

+ 2 - 2
public/systemConf.js

@@ -25,8 +25,8 @@ var __systemConf = {
     conf: {
         // 阿里云
         editerUrl: 'http://60.205.177.43:80/wandaEditer/', // 编辑器地址
-        wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
-        // wandaBmGuideUrl: 'http://192.168.200.100:8090/wandaBmGuide/', //管理书地址
+        // wandaBmGuideUrl: 'http://60.205.177.43:80/wandaBmGuide/', //管理书地址
+        wandaBmGuideUrl: 'http://192.168.200.100:8090/wandaBmGuide/', //管理书地址
     },
 }
 window.__systemConf = __systemConf

+ 75 - 71
src/views/legendLibrary/addForm.vue

@@ -303,78 +303,82 @@ export default {
         },
         //rgba转成16进制
         hexify(color) {
-            var opacity = ''
-            var rgb = color.split(',')
-            var r = parseInt(rgb[0].split('(')[1])
-            var g = parseInt(rgb[1])
-            var b = parseInt(rgb[2].split(')')[0])
-            switch (parseFloat(rgb[3] || 1) + '') {
-                case '0':
-                    opacity = '00'
-                    break
-                case '0.05':
-                    opacity = '0C'
-                    break
-                case '0.1':
-                    opacity = '19'
-                    break
-                case '0.15':
-                    opacity = '26'
-                    break
-                case '0.2':
-                    opacity = '33'
-                    break
-                case '0.25':
-                    opacity = '3F'
-                    break
-                case '0.3':
-                    opacity = '4C'
-                    break
-                case '0.35':
-                    opacity = '59'
-                    break
-                case '0.4':
-                    opacity = '66'
-                    break
-                case '0.45':
-                    opacity = '72'
-                    break
-                case '0.5':
-                    opacity = '7F'
-                    break
-                case '0.55':
-                    opacity = '8C'
-                    break
-                case '0.6':
-                    opacity = '99'
-                    break
-                case '0.65':
-                    opacity = 'A5'
-                    break
-                case '0.7':
-                    opacity = 'B2'
-                    break
-                case '0.75':
-                    opacity = 'BF'
-                    break
-                case '0.8':
-                    opacity = 'CC'
-                    break
-                case '0.85':
-                    opacity = 'D8'
-                    break
-                case '0.9':
-                    opacity = 'E5'
-                    break
-                case '0.95':
-                    opacity = 'F2'
-                    break
-                case '1':
-                    opacity = 'FF'
-                    break
+            if (color) {
+                var opacity = ''
+                var rgb = color.split(',')
+                var r = parseInt(rgb[0].split('(')[1])
+                var g = parseInt(rgb[1])
+                var b = parseInt(rgb[2].split(')')[0])
+                switch (parseFloat(rgb[3] || 1) + '') {
+                    case '0':
+                        opacity = '00'
+                        break
+                    case '0.05':
+                        opacity = '0C'
+                        break
+                    case '0.1':
+                        opacity = '19'
+                        break
+                    case '0.15':
+                        opacity = '26'
+                        break
+                    case '0.2':
+                        opacity = '33'
+                        break
+                    case '0.25':
+                        opacity = '3F'
+                        break
+                    case '0.3':
+                        opacity = '4C'
+                        break
+                    case '0.35':
+                        opacity = '59'
+                        break
+                    case '0.4':
+                        opacity = '66'
+                        break
+                    case '0.45':
+                        opacity = '72'
+                        break
+                    case '0.5':
+                        opacity = '7F'
+                        break
+                    case '0.55':
+                        opacity = '8C'
+                        break
+                    case '0.6':
+                        opacity = '99'
+                        break
+                    case '0.65':
+                        opacity = 'A5'
+                        break
+                    case '0.7':
+                        opacity = 'B2'
+                        break
+                    case '0.75':
+                        opacity = 'BF'
+                        break
+                    case '0.8':
+                        opacity = 'CC'
+                        break
+                    case '0.85':
+                        opacity = 'D8'
+                        break
+                    case '0.9':
+                        opacity = 'E5'
+                        break
+                    case '0.95':
+                        opacity = 'F2'
+                        break
+                    case '1':
+                        opacity = 'FF'
+                        break
+                }
+                var hex = '#' + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1) + opacity
+                return hex
+            } else {
+                return
             }
-            var hex = '#' + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1) + opacity
-            return hex
         },
         // 背景颜色改变
         changBgColor(val) {

+ 4 - 1
src/views/legendRules/index.vue

@@ -21,7 +21,10 @@
                         display: inline-block;
                         margin-top: 10px;
                         padding-left: 20px;'
-            ></span>图例绘制规则
+            >
+                <!-- <i style='font-size:14px;display:inline-block;height:48px;line-height:48px'>图例管理</i> -->
+            </span>
+            图例绘制规则
             <el-button type='primary' class='rules-button' size='small' @click='add'>添加图例</el-button>
         </div>
         <div class='legend-rules-bottom'>