소스 검색

feat 决策

sys5923812@126.com 5 일 전
부모
커밋
f2a5dd4846
1개의 변경된 파일139개의 추가작업 그리고 149개의 파일을 삭제
  1. 139 149
      src/views/xjc-integratedmachine/wakeup/rainbow/index.vue

+ 139 - 149
src/views/xjc-integratedmachine/wakeup/rainbow/index.vue

@@ -77,10 +77,7 @@
     let raduisColor = ["#000000",
         "#ffc300", "#f72585", "#4cc9f0", "#a000ff", "#ffc9f6", "#9de617"
     ]
-    //手指宽度
-    let pointWidth = 40
-    //间隔宽度
-    let betweenWidth = 15
+
     let radiusHalf = new Map(
         [
             ["startAngle11", [10, 50]],
@@ -109,25 +106,6 @@
         ]
     )
 
-    let radius_startAngle11 = radiusHalf.get("startAngle11")
-    let radius_startAngle12 = radiusHalf.get("startAngle12")
-    let radius_startAngle13 = radiusHalf.get("startAngle13")
-    let radius_startAngle21 = radiusHalf.get("startAngle21")
-    let radius_startAngle22 = radiusHalf.get("startAngle22")
-    let radius_startAngle23 = radiusHalf.get("startAngle23")
-    let radius_startAngle31 = radiusHalf.get("startAngle31")
-    let radius_startAngle32 = radiusHalf.get("startAngle32")
-    let radius_startAngle33 = radiusHalf.get("startAngle33")
-    let radius_startAngle41 = radiusHalf.get("startAngle41")
-    let radius_startAngle42 = radiusHalf.get("startAngle42")
-    let radius_startAngle43 = radiusHalf.get("startAngle43")
-    let radius_startAngle51 = radiusHalf.get("startAngle51")
-    let radius_startAngle52 = radiusHalf.get("startAngle52")
-    let radius_startAngle53 = radiusHalf.get("startAngle53")
-    let radius_startAngle61 = radiusHalf.get("startAngle61")
-    let radius_startAngle62 = radiusHalf.get("startAngle62")
-    let radius_startAngle63 = radiusHalf.get("startAngle63")
-
 
     // 所有轨道绘画限制
     let paintFlagList = [
@@ -186,112 +164,112 @@
         data.paintStateFlag = paintStateFlag
         let sum = Math.pow(startMouse.x - CENTER_X, 2) + Math.pow(CENTER_Y - startMouse.y, 2);
         // 第一个职业
-        if (sum < Math.pow(radius_startAngle11[1], 2) && sum > Math.pow(radius_startAngle11[0], 2)) {
+        if (sum < Math.pow(50, 2) && sum > Math.pow(10, 2)) {
             startAngle11 = calcAngle();
             data.startAngle = startAngle11
             data.angle = 'startAngle11'
             calcPaintCircleFlag(0)
-        } else if (sum < Math.pow(radius_startAngle12[1], 2) && sum > Math.pow(radius_startAngle12[0], 2)) {
+        } else if (sum < Math.pow(90, 2) && sum > Math.pow(50, 2)) {
             startAngle12 = calcAngle();
             data.startAngle = startAngle12
             data.angle = 'startAngle12'
             calcPaintCircleFlag(1)
-        } else if (sum < Math.pow(radius_startAngle13[1], 2) && sum > Math.pow(radius_startAngle13[0], 2)) {
+        } else if (sum < Math.pow(130, 2) && sum > Math.pow(90, 2)) {
             startAngle13 = calcAngle();
             data.startAngle = startAngle13
             data.angle = 'startAngle13'
             calcPaintCircleFlag(2)
         }
         // 第二个职业
-        else if (sum < Math.pow(radius_startAngle21[1], 2) && sum > Math.pow(radius_startAngle21[0], 2)) {
+        else if (sum < Math.pow(185, 2) && sum > Math.pow(145, 2)) {
             startAngle21 = calcAngle();
             data.startAngle = startAngle21
             data.angle = 'startAngle21'
             calcPaintCircleFlag(3)
-        } else if (sum < Math.pow(radius_startAngle22[1], 2) && sum > Math.pow(radius_startAngle22[0], 2)) {
+        } else if (sum < Math.pow(225, 2) && sum > Math.pow(185, 2)) {
             startAngle22 = calcAngle();
             data.startAngle = startAngle22
             data.angle = 'startAngle22'
             calcPaintCircleFlag(4)
-        } else if (sum < Math.pow(radius_startAngle23[1], 2) && sum > Math.pow(radius_startAngle23[0], 2)) {
+        } else if (sum < Math.pow(265, 2) && sum > Math.pow(225, 2)) {
             startAngle23 = calcAngle();
             data.startAngle = startAngle23
             data.angle = 'startAngle23'
             calcPaintCircleFlag(5)
         }
         // 第三个职业
-        else if (sum < Math.pow(radius_startAngle31[1], 2) && sum > Math.pow(radius_startAngle31[0], 2)) {
+        else if (sum < Math.pow(320, 2) && sum > Math.pow(280, 2)) {
             startAngle31 = calcAngle();
             data.startAngle = startAngle31
             data.angle = 'startAngle31'
             calcPaintCircleFlag(6)
-        } else if (sum < Math.pow(radius_startAngle32[1], 2) && sum > Math.pow(radius_startAngle32[0], 2)) {
+        } else if (sum < Math.pow(360, 2) && sum > Math.pow(320, 2)) {
             startAngle32 = calcAngle();
             data.startAngle = startAngle32
             data.angle = 'startAngle32'
             calcPaintCircleFlag(7)
-        } else if (sum < Math.pow(radius_startAngle33[1], 2) && sum > Math.pow(radius_startAngle33[0], 2)) {
+        } else if (sum < Math.pow(400, 2) && sum > Math.pow(360, 2)) {
             startAngle33 = calcAngle();
             data.startAngle = startAngle33
             data.angle = 'startAngle33'
             calcPaintCircleFlag(8)
         }
         // 第四个职业
-        else if (sum < Math.pow(radius_startAngle41[1], 2) && sum > Math.pow(radius_startAngle41[0], 2)) {
+        else if (sum < Math.pow(455, 2) && sum > Math.pow(415, 2)) {
             startAngle41 = calcAngle();
             data.startAngle = startAngle41
             data.angle = 'startAngle41'
             calcPaintCircleFlag(9)
-        } else if (sum < Math.pow(radius_startAngle42[1], 2) && sum > Math.pow(radius_startAngle42[0], 2)) {
+        } else if (sum < Math.pow(495, 2) && sum > Math.pow(455, 2)) {
             startAngle42 = calcAngle();
             data.startAngle = startAngle42
             data.angle = 'startAngle42'
             calcPaintCircleFlag(10)
-        } else if (sum < Math.pow(radius_startAngle43[1], 2) && sum > Math.pow(radius_startAngle43[0], 2)) {
+        } else if (sum < Math.pow(535, 2) && sum > Math.pow(495, 2)) {
             startAngle43 = calcAngle();
             data.startAngle = startAngle43
             data.angle = 'startAngle43'
             calcPaintCircleFlag(11)
         }
         // 第五个职业
-        else if (sum < Math.pow(radius_startAngle51[1], 2) && sum > Math.pow(radius_startAngle51[0], 2)) {
+        else if (sum < Math.pow(590, 2) && sum > Math.pow(550, 2)) {
             startAngle51 = calcAngle();
             data.startAngle = startAngle51
             data.angle = 'startAngle51'
             calcPaintCircleFlag(12)
-        } else if (sum < Math.pow(radius_startAngle52[1], 2) && sum > Math.pow(radius_startAngle52[0], 2)) {
+        } else if (sum < Math.pow(630, 2) && sum > Math.pow(590, 2)) {
             startAngle52 = calcAngle();
             data.startAngle = startAngle52
             data.angle = 'startAngle52'
             calcPaintCircleFlag(13)
-        } else if (sum < Math.pow(radius_startAngle53[1], 2) && sum > Math.pow(radius_startAngle53[0], 2)) {
+        } else if (sum < Math.pow(670, 2) && sum > Math.pow(630, 2)) {
             startAngle53 = calcAngle();
             data.startAngle = startAngle53
             data.angle = 'startAngle53'
             calcPaintCircleFlag(14)
         }
         // 第六个职业
-        else if (sum < Math.pow(radius_startAngle61[1], 2) && sum > Math.pow(radius_startAngle61[0], 2)) {
+        else if (sum < Math.pow(725, 2) && sum > Math.pow(685, 2)) {
             startAngle61 = calcAngle();
             data.startAngle = startAngle61
             data.angle = 'startAngle61'
             calcPaintCircleFlag(15)
-        } else if (sum < Math.pow(radius_startAngle62[1], 2) && sum > Math.pow(radius_startAngle62[0], 2)) {
+        } else if (sum < Math.pow(765, 2) && sum > Math.pow(725, 2)) {
             startAngle62 = calcAngle();
             data.startAngle = startAngle62
             data.angle = 'startAngle62'
             calcPaintCircleFlag(16)
-        } else if (sum < Math.pow(radius_startAngle63[1], 2) && sum > Math.pow(radius_startAngle63[0], 2)) {
+        } else if (sum < Math.pow(805, 2) && sum > Math.pow(765, 2)) {
             startAngle63 = calcAngle();
             data.startAngle = startAngle63
             data.angle = 'startAngle63'
             calcPaintCircleFlag(17)
         }
-        if (data.startAngle == 0) {
+        if(data.startAngle == 0){
             alert("起点角度记录不完整")
-        } else if (data.angle == '') {
+        }else if(data.angle == ''){
             alert("起点轨道记录不完整")
-        } else {
+        }else{
             form.value.picData.push(data)
         }
 
@@ -316,202 +294,196 @@
         let sum = Math.pow(moveMouse.x - CENTER_X, 2) + Math.pow(CENTER_Y - moveMouse.y, 2);
         let ret = calcAngle();
         // 第一个职业
-        let radius_1 = radius_startAngle11[0] + (radius_startAngle11[1] - radius_startAngle11[0]) / 2
-        let radius_2 = radius_startAngle11[0] + (radius_startAngle11[1] - radius_startAngle11[0]) / 2
-        let radius_3 = radius_startAngle11[0] + (radius_startAngle11[1] - radius_startAngle11[0]) / 2
-        let radius_4 = radius_startAngle11[0] + (radius_startAngle11[1] - radius_startAngle11[0]) / 2
-        let radius_5 = radius_startAngle11[0] + (radius_startAngle11[1] - radius_startAngle11[0]) / 2
-        let radius_6 = radius_startAngle11[0] + (radius_startAngle11[1] - radius_startAngle11[0]) / 2
-        if (sum < Math.pow(radius_startAngle11[1], 2) && sum > Math.pow(radius_startAngle11[0], 2)) {
+        if (sum < Math.pow(50, 2) && sum > Math.pow(10, 2)) {
             if (paintFlagList[0]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[1], radius_1, startAngle11, ret);
+                    paint(raduisColor[1], 30, startAngle11, ret);
                 } else {
-                    paint(raduisColor[0], radius_1, startAngle11, ret);
-                    paint(raduisColor[0], radius_1 + pointWidth, startAngle11, ret);
-                    paint(raduisColor[0], radius_1 + 2 * pointWidth, startAngle11, ret);
+                    paint(raduisColor[0], 30, startAngle11, ret);
+                    paint(raduisColor[0], 70, startAngle11, ret);
+                    paint(raduisColor[0], 110, startAngle11, ret);
                 }
             }
-        } else if (sum < Math.pow(radius_startAngle12[1], 2) && sum > Math.pow(radius_startAngle12[0], 2)) {
+        } else if (sum < Math.pow(90, 2) && sum > Math.pow(50, 2)) {
             if (paintFlagList[1]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[1], radius_1, startAngle12, ret);
-                    paint(raduisColor[1], radius_1 + pointWidth, startAngle12, ret);
+                    paint(raduisColor[1], 30, startAngle12, ret);
+                    paint(raduisColor[1], 70, startAngle12, ret);
                 } else {
-                    paint(raduisColor[0], radius_1 + pointWidth, startAngle12, ret);
-                    paint(raduisColor[0], radius_1 + 2 * pointWidth, startAngle12, ret);
+                    paint(raduisColor[0], 70, startAngle12, ret);
+                    paint(raduisColor[0], 110, startAngle12, ret);
                 }
             }
-        } else if (sum < Math.pow(radius_startAngle13[1], 2) && sum > Math.pow(radius_startAngle13[0], 2)) {
+        } else if (sum < Math.pow(130, 2) && sum > Math.pow(90, 2)) {
             if (paintFlagList[2]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[1], radius_1, startAngle13, ret);
-                    paint(raduisColor[1], radius_1 + pointWidth, startAngle13, ret);
-                    paint(raduisColor[1], radius_1 + 2 * pointWidth, startAngle13, ret);
+                    paint(raduisColor[1], 30, startAngle13, ret);
+                    paint(raduisColor[1], 70, startAngle13, ret);
+                    paint(raduisColor[1], 110, startAngle13, ret);
                 } else {
-                    paint(raduisColor[0], radius_1 + 2 * pointWidth, startAngle13, ret);
+                    paint(raduisColor[0], 110, startAngle13, ret);
                 }
             }
         }
         // 第二个职业
-        else if (sum < Math.pow(radius_startAngle21[1], 2) && sum > Math.pow(radius_startAngle21[0], 2)) {
+        else if (sum < Math.pow(185, 2) && sum > Math.pow(145, 2)) {
             if (paintFlagList[3]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[2], radius_2, startAngle21, ret);
+                    paint(raduisColor[2], 165, startAngle21, ret);
                 } else {
-                    paint(raduisColor[0], radius_2, startAngle21, ret);
-                    paint(raduisColor[0], radius_2 + pointWidth, startAngle21, ret);
-                    paint(raduisColor[0], radius_2 + 2 * pointWidth, startAngle21, ret);
+                    paint(raduisColor[0], 165, startAngle21, ret);
+                    paint(raduisColor[0], 205, startAngle21, ret);
+                    paint(raduisColor[0], 245, startAngle21, ret);
                 }
             }
-        } else if (sum < Math.pow(radius_startAngle22[1], 2) && sum > Math.pow(radius_startAngle22[0], 2)) {
+        } else if (sum < Math.pow(225, 2) && sum > Math.pow(185, 2)) {
             if (paintFlagList[4]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[2], radius_2, startAngle22, ret);
-                    paint(raduisColor[2], radius_2 + pointWidth, startAngle22, ret);
+                    paint(raduisColor[2], 165, startAngle22, ret);
+                    paint(raduisColor[2], 205, startAngle22, ret);
                 } else {
-                    paint(raduisColor[0], radius_2 + pointWidth, startAngle22, ret);
-                    paint(raduisColor[0], radius_2 + 2 * pointWidth, startAngle22, ret);
+                    paint(raduisColor[0], 205, startAngle22, ret);
+                    paint(raduisColor[0], 245, startAngle22, ret);
                 }
             }
-        } else if (sum < Math.pow(radius_startAngle23[1], 2) && sum > Math.pow(radius_startAngle23[0], 2)) {
+        } else if (sum < Math.pow(265, 2) && sum > Math.pow(225, 2)) {
             if (paintFlagList[5]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[2], radius_2, startAngle23, ret);
-                    paint(raduisColor[2], radius_2 + pointWidth, startAngle23, ret);
-                    paint(raduisColor[2], radius_2 + 2 * pointWidth, startAngle23, ret);
+                    paint(raduisColor[2], 165, startAngle23, ret);
+                    paint(raduisColor[2], 205, startAngle23, ret);
+                    paint(raduisColor[2], 245, startAngle23, ret);
                 } else {
-                    paint(raduisColor[0], radius_2 + 2 * pointWidth, startAngle23, ret);
+                    paint(raduisColor[0], 245, startAngle23, ret);
                 }
             }
         }
         //第三个职业
-        else if (sum < Math.pow(radius_startAngle31[1], 2) && sum > Math.pow(radius_startAngle31[0], 2)) {
+        else if (sum < Math.pow(320, 2) && sum > Math.pow(280, 2)) {
             if (paintFlagList[6]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[3], radius_3, startAngle31, ret);
+                    paint(raduisColor[3], 300, startAngle31, ret);
                 } else {
-                    paint(raduisColor[0], radius_3, startAngle31, ret);
-                    paint(raduisColor[0], radius_3+pointWidth, startAngle31, ret);
-                    paint(raduisColor[0], radius_3+2*pointWidth, startAngle31, ret);
+                    paint(raduisColor[0], 300, startAngle31, ret);
+                    paint(raduisColor[0], 340, startAngle31, ret);
+                    paint(raduisColor[0], 380, startAngle31, ret);
                 }
             }
-        } else if (sum < Math.pow(radius_startAngle32[1], 2) && sum > Math.pow(radius_startAngle32[0], 2)) {
+        } else if (sum < Math.pow(360, 2) && sum > Math.pow(320, 2)) {
             if (paintFlagList[7]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[3], radius_3, startAngle31, ret);
-                    paint(raduisColor[3], radius_3+pointWidth, startAngle31, ret);
+                    paint(raduisColor[3], 300, startAngle31, ret);
+                    paint(raduisColor[3], 340, startAngle31, ret);
                 } else {
-                    paint(raduisColor[0], radius_3+pointWidth, startAngle32, ret);
-                    paint(raduisColor[0], radius_3+2*pointWidth, startAngle32, ret);
+                    paint(raduisColor[0], 340, startAngle32, ret);
+                    paint(raduisColor[0], 380, startAngle32, ret);
                 }
             }
-        } else if (sum < Math.pow(radius_startAngle33[1], 2) && sum > Math.pow(radius_startAngle33[0], 2)) {
+        } else if (sum < Math.pow(400, 2) && sum > Math.pow(360, 2)) {
             if (paintFlagList[8]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[3], radius_3, startAngle33, ret);
-                    paint(raduisColor[3], radius_3+pointWidth, startAngle33, ret);
-                    paint(raduisColor[3], radius_3+2*pointWidth, startAngle33, ret);
+                    paint(raduisColor[3], 300, startAngle33, ret);
+                    paint(raduisColor[3], 340, startAngle33, ret);
+                    paint(raduisColor[3], 380, startAngle33, ret);
                 } else {
-                    paint(raduisColor[0], radius_3+2*pointWidth, startAngle33, ret);
+                    paint(raduisColor[0], 380, startAngle33, ret);
                 }
             }
         }
         //第四个职业
-        else if (sum < Math.pow(radius_startAngle41[1], 2) && sum > Math.pow(radius_startAngle41[0], 2)) {
+        else if (sum < Math.pow(455, 2) && sum > Math.pow(415, 2)) {
             if (paintFlagList[9]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[4], radius_4, startAngle41, ret);
+                    paint(raduisColor[4], 435, startAngle41, ret);
                 } else {
-                    paint(raduisColor[0], radius_4, startAngle41, ret);
-                    paint(raduisColor[0], radius_4+pointWidth, startAngle41, ret);
+                    paint(raduisColor[0], 435, startAngle41, ret);
+                    paint(raduisColor[0], 475, startAngle41, ret);
                     paint(raduisColor[0], 515, startAngle41, ret);
                 }
             }
-        } else if (sum < Math.pow(radius_startAngle42[1], 2) && sum > Math.pow(radius_startAngle42[0], 2)) {
+        } else if (sum < Math.pow(495, 2) && sum > Math.pow(455, 2)) {
             if (paintFlagList[10]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[4], radius_4, startAngle42, ret);
-                    paint(raduisColor[4], radius_4+pointWidth, startAngle42, ret);
+                    paint(raduisColor[4], 435, startAngle42, ret);
+                    paint(raduisColor[4], 475, startAngle42, ret);
                 } else {
-                    paint(raduisColor[0], radius_4+pointWidth, startAngle42, ret);
-                    paint(raduisColor[0], radius_4+2*pointWidth, startAngle42, ret);
+                    paint(raduisColor[0], 475, startAngle42, ret);
+                    paint(raduisColor[0], 515, startAngle42, ret);
                 }
             }
-        } else if (sum < Math.pow(radius_startAngle43[1], 2) && sum > Math.pow(radius_startAngle43[0], 2)) {
+        } else if (sum < Math.pow(535, 2) && sum > Math.pow(495, 2)) {
             if (paintFlagList[11]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[4], radius_4, startAngle43, ret);
-                    paint(raduisColor[4], radius_4+pointWidth, startAngle43, ret);
-                    paint(raduisColor[4], radius_4+2*pointWidth, startAngle43, ret);
+                    paint(raduisColor[4], 435, startAngle43, ret);
+                    paint(raduisColor[4], 475, startAngle43, ret);
+                    paint(raduisColor[4], 515, startAngle43, ret);
                 } else {
-                    paint(raduisColor[0], radius_4+2*pointWidth, startAngle43, ret);
+                    paint(raduisColor[0], 515, startAngle43, ret);
                 }
             }
         }
 
         //第五个职业
-        else if (sum < Math.pow(radius_startAngle51[1], 2) && sum > Math.pow(radius_startAngle51[0], 2)) {
+        else if (sum < Math.pow(590, 2) && sum > Math.pow(550, 2)) {
             if (paintFlagList[12]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[5], radius_5, startAngle51, ret);
+                    paint(raduisColor[5], 570, startAngle51, ret);
                 } else {
-                    paint(raduisColor[0], radius_5, startAngle51, ret);
+                    paint(raduisColor[0], 570, startAngle51, ret);
                     paint(raduisColor[0], 610, startAngle51, ret);
                     paint(raduisColor[0], 650, startAngle51, ret);
                 }
             }
-        } else if (sum < Math.pow(radius_startAngle52[1], 2) && sum > Math.pow(radius_startAngle52[0], 2)) {
+        } else if (sum < Math.pow(630, 2) && sum > Math.pow(590, 2)) {
             if (paintFlagList[13]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[5], radius_5, startAngle52, ret);
-                    paint(raduisColor[5], radius_5+pointWidth, startAngle52, ret);
+                    paint(raduisColor[5], 570, startAngle52, ret);
+                    paint(raduisColor[5], 610, startAngle52, ret);
                 } else {
-                    paint(raduisColor[0], radius_5+pointWidth, startAngle52, ret);
-                    paint(raduisColor[0], radius_5+2*pointWidth, startAngle52, ret);
+                    paint(raduisColor[0], 610, startAngle52, ret);
+                    paint(raduisColor[0], 650, startAngle52, ret);
                 }
             }
-        } else if (sum < Math.pow(radius_startAngle53[1], 2) && sum > Math.pow(radius_startAngle53[0], 2)) {
+        } else if (sum < Math.pow(670, 2) && sum > Math.pow(630, 2)) {
             if (paintFlagList[14]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[5], radius_5, startAngle53, ret);
-                    paint(raduisColor[5], radius_5+pointWidth, startAngle53, ret);
-                    paint(raduisColor[5], radius_5+2*pointWidth, startAngle53, ret);
+                    paint(raduisColor[5], 570, startAngle53, ret);
+                    paint(raduisColor[5], 610, startAngle53, ret);
+                    paint(raduisColor[5], 650, startAngle53, ret);
                 } else {
-                    paint(raduisColor[0], radius_5+2*pointWidth, startAngle53, ret);
+                    paint(raduisColor[0], 650, startAngle53, ret);
                 }
             }
         }
 
         //第六个职业
-        else if (sum < Math.pow(radius_startAngle61[1], 2) && sum > Math.pow(radius_startAngle61[0], 2)) {
+        else if (sum < Math.pow(725, 2) && sum > Math.pow(685, 2)) {
             if (paintFlagList[15]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[6], radius_6, startAngle61, ret);
+                    paint(raduisColor[6], 705, startAngle61, ret);
                 } else {
-                    paint(raduisColor[0], radius_6, startAngle61, ret);
-                    paint(raduisColor[0], radius_6+pointWidth, startAngle61, ret);
+                    paint(raduisColor[0], 705, startAngle61, ret);
+                    paint(raduisColor[0], 745, startAngle61, ret);
                     paint(raduisColor[0], 785, startAngle61, ret);
                 }
             }
-        } else if (sum < Math.pow(radius_startAngle62[1], 2) && sum > Math.pow(radius_startAngle62[0], 2)) {
+        } else if (sum < Math.pow(765, 2) && sum > Math.pow(725, 2)) {
             if (paintFlagList[16]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[6], radius_6, startAngle62, ret);
-                    paint(raduisColor[6], radius_6+pointWidth, startAngle62, ret);
+                    paint(raduisColor[6], 705, startAngle62, ret);
+                    paint(raduisColor[6], 745, startAngle62, ret);
                 } else {
-                    paint(raduisColor[0], radius_6+pointWidth, startAngle62, ret);
-                    paint(raduisColor[0], radius_6+2*pointWidth, startAngle62, ret);
+                    paint(raduisColor[0], 745, startAngle62, ret);
+                    paint(raduisColor[0], 785, startAngle62, ret);
                 }
             }
-        } else if (sum < Math.pow(radius_startAngle63[1], 2) && sum > Math.pow(radius_startAngle63[0], 2)) {
+        } else if (sum < Math.pow(805, 2) && sum > Math.pow(765, 2)) {
             if (paintFlagList[17]) {
                 if (paintStateFlag) {
-                    paint(raduisColor[6], radius_6, startAngle63, ret);
-                    paint(raduisColor[6], radius_6+pointWidth, startAngle63, ret);
-                    paint(raduisColor[6], radius_6+2*pointWidth, startAngle63, ret);
+                    paint(raduisColor[6], 705, startAngle63, ret);
+                    paint(raduisColor[6], 745, startAngle63, ret);
+                    paint(raduisColor[6], 785, startAngle63, ret);
                 } else {
-                    paint(raduisColor[0], radius_6+2*pointWidth, startAngle63, ret);
+                    paint(raduisColor[0], 785, startAngle63, ret);
                 }
             }
         }
@@ -613,9 +585,9 @@
 
     function drawBackgroundOne(innerRadius, i) {
         if (i % 4 == 0) {
-            return innerRadius + betweenWidth;
+            return innerRadius + 15;
         } else {
-            return innerRadius + pointWidth;
+            return innerRadius + 40;
         }
     }
 
@@ -674,6 +646,7 @@
     function backShow(picData) {
         if (picData.length == 0) {
             //清空
+
         } else {
             //根据数据重绘
             picData.forEach(function (item, index) {
@@ -683,7 +656,7 @@
     }
 
     function repaint(item) {
-        let paintStateFlag = item.paintStateFlag
+        let  paintStateFlag = item.paintStateFlag
         //第几职业
         let angleNum = item.angle.substr(10, 1)
         let color = raduisColor[parseInt(angleNum)]
@@ -698,15 +671,35 @@
         let min = radius[0];
         let max = radius[1];
         let middle = min + (max - min) / 2
-        if (paintStateFlag == true) {
-            for (let i = 0; i < angleCount; i++) {
-                paint(color, middle - (i * pointWidth), startAngle, endAngle);
+        // console.log(item.angle,"=======",radius,"mmmmm",middle)
+        // console.log("count:",angleCount,"middle:",middle)
+        if(paintStateFlag == true){
+            if(angleCount == 1){
+                paint(color, middle, startAngle, endAngle);
+            }else if(angleCount == 2){
+                paint(color, middle, startAngle, endAngle);
+                paint(color, middle-40, startAngle, endAngle);
+            }else if(angleCount == 3){
+                paint(color, middle, startAngle, endAngle);
+                paint(color, middle-40, startAngle, endAngle);
+                paint(color, middle-80, startAngle, endAngle);
             }
-        } else {
-            for (let i = 0; i <= (3 - angleCount); i++) {
-                paint(raduisColor[0], middle + i * pointWidth, startAngle, endAngle);
+        }else{
+            if(angleCount == 1){
+                paint(raduisColor[0], middle, startAngle, endAngle);
+                paint(raduisColor[0], middle+40, startAngle, endAngle);
+                paint(raduisColor[0], middle+80, startAngle, endAngle);
+            }else if(angleCount == 2){
+                paint(raduisColor[0], middle, startAngle, endAngle);
+                paint(raduisColor[0], middle+40, startAngle, endAngle);
+            }else if(angleCount == 3){
+                paint(raduisColor[0], middle, startAngle, endAngle);
             }
         }
+
+
+
+
     }
 
     function saveAllData(type) {
@@ -738,10 +731,7 @@
     }
 
     function finishRepaint(type) {
-        nextTick(() => {
-            save(type)
-        })
-        clear()
+        save(type)
     }
 
     onMounted(() => {