瀏覽代碼

修正问题

bill 2 年之前
父節點
當前提交
9e52552e75
共有 2 個文件被更改,包括 52 次插入46 次删除
  1. 49 45
      src/graphic/CanvasStyle/ImageLabels/SVGIcons.js
  2. 3 1
      src/views/graphic/imageLabel.vue

+ 49 - 45
src/graphic/CanvasStyle/ImageLabels/SVGIcons.js

@@ -1,6 +1,6 @@
 const SVGIcons = {
   "chemotuoche_p.svg": {
-    text: "客车",
+    text: "侧三轮平面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -76,7 +76,7 @@ const SVGIcons = {
     }
 
   }, "dianche_p.svg": {
-    text: "客车",
+    text: "电车侧面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -211,7 +211,7 @@ const SVGIcons = {
     }
 
   }, "dianche_s.svg": {
-    text: "客车",
+    text: "电车平面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -321,7 +321,7 @@ const SVGIcons = {
     }
 
   }, "erlunmotuoche.svg": {
-    text: "车",
+    text: "普通二轮摩托车",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -430,7 +430,7 @@ const SVGIcons = {
     }
 
   }, "guache_p.svg": {
-    text: "客车4",
+    text: "挂车侧面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -601,7 +601,7 @@ const SVGIcons = {
     }
 
   }, "huoche_p.svg": {
-    text: "客车3",
+    text: "货车侧面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -820,7 +820,7 @@ const SVGIcons = {
     }
 
   }, "jiaoche_p.svg": {
-    text: "客车",
+    text: "叫车平面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -927,7 +927,7 @@ const SVGIcons = {
     }
 
   }, "jiaoche_s.svg": {
-    text: "客车",
+    text: "客车侧面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -999,7 +999,7 @@ const SVGIcons = {
     }
 
   }, "keche_p.svg": {
-    text: "客车",
+    text: "客车平面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -1101,7 +1101,7 @@ const SVGIcons = {
     }
 
   }, "keche_s.svg": {
-    text: "客车",
+    text: "客车侧面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -1178,7 +1178,7 @@ const SVGIcons = {
     }
 
   }, "lunshijixie_p.svg": {
-    text: "客车",
+    text: "轮式自行机械平面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -1282,7 +1282,7 @@ const SVGIcons = {
     }
 
   }, "lunshituolaji_p.svg": {
-    text: "客车",
+    text: "轮式拖拉机平面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -1399,7 +1399,7 @@ const SVGIcons = {
     }
 
   }, "lunshituolaji_s.svg": {
-    text: "客车",
+    text: "轮式拖拉机侧面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -1502,7 +1502,7 @@ const SVGIcons = {
     }
 
   }, "qianyinche_p.svg": {
-    text: "客车",
+    text: "侨银车平面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -1642,7 +1642,7 @@ const SVGIcons = {
     }
 
   }, "qianyinche_s.svg": {
-    text: "客车",
+    text: "牵引车侧面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -1742,7 +1742,7 @@ const SVGIcons = {
     }
 
   }, "shoufutuolaji_p.svg": {
-    text: "客车",
+    text: "手扶拖拉机平面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -1859,7 +1859,7 @@ const SVGIcons = {
     }
 
   }, "shoufutuolaji_s.svg": {
-    text: "客车1",
+    text: "手扶拖拉机侧面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -1953,7 +1953,7 @@ const SVGIcons = {
     }
 
   }, "zhengsanlun_p.svg": {
-    text: "客车",
+    text: "正三轮平面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -2025,7 +2025,7 @@ const SVGIcons = {
     }
 
   }, "zhengsanlun_s.svg": {
-    text: "客车",
+    text: "正三轮侧面",
     draw: function (ctx) {
       ctx.save();
       //// ctx.strokeStyle = "rgba(0,0,0,0)";
@@ -2082,7 +2082,7 @@ const SVGIcons = {
     }
   },
   "fjdc_canjiren_s.svg": {
-    text: "客车",
+    text: "残疾人用车侧面",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2119,7 +2119,7 @@ const SVGIcons = {
     }
 
   },"fjdc_renliche.svg": {
-    text: "车",
+    text: "人力车",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2197,7 +2197,7 @@ const SVGIcons = {
     }
 
   },"fjdc_sanlunche.svg": {
-    text: "车",
+    text: "三轮车",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2281,7 +2281,7 @@ const SVGIcons = {
     }
 
   },"jtxx_fengxb.svg": {
-    text: "客车",
+    text: "风向标",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2325,7 +2325,7 @@ const SVGIcons = {
     }
 
   },"jtxx_fangxb.svg": {
-    text: "客车",
+    text: "方向标",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2402,7 +2402,7 @@ const SVGIcons = {
     }
 
   },"rt_shit.svg": {
-    text: "客车",
+    text: "尸体",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2473,7 +2473,7 @@ const SVGIcons = {
     }
 
   },"sc_sc.svg": {
-    text: "客车",
+    text: "牲畜",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2511,7 +2511,7 @@ const SVGIcons = {
     }
 
   },"rt_st.svg": {
-    text: "客车",
+    text: "伤体",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2594,7 +2594,7 @@ const SVGIcons = {
     }
 
   },"jtxx_ryydfx.svg": {
-    text: "客车",
+    text: "人员运动方向",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2641,7 +2641,7 @@ const SVGIcons = {
     }
 
   },"sc_shangc.svg": {
-    text: "客车",
+    text: "伤畜",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2691,7 +2691,7 @@ const SVGIcons = {
     }
 
   },"fjdc_canjiren_p.svg": {
-    text: "客车",
+    text: "残疾人用车平面",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2753,7 +2753,7 @@ const SVGIcons = {
     }
 
   },"jtxx_jdcxsfx.svg": {
-    text: "客车",
+    text: "机动车行驶方向",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2788,7 +2788,7 @@ const SVGIcons = {
     }
 
   },"fjdc_zixingche.svg": {
-    text: "车",
+    text: "自行车",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2910,7 +2910,7 @@ const SVGIcons = {
     }
 
   },"jtxx_fjdcxsfx.svg": {
-    text: "客车",
+    text: "非机动车行驶方向",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2957,7 +2957,7 @@ const SVGIcons = {
     }
 
   },"jtxx_jcd.svg": {
-    text: "客车",
+    text: "接触点",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -2999,7 +2999,7 @@ const SVGIcons = {
     }
 
   },"rt_rt.svg": {
-    text: "客车",
+    text: "人体",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -3070,7 +3070,7 @@ const SVGIcons = {
     }
 
   },"fjdc_xuliche.svg": {
-    text: "车",
+    text: "畜力车",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -3160,7 +3160,7 @@ const SVGIcons = {
     }
 
   },"sc_shic.svg": {
-    text: "客车",
+    text: "死畜",
     draw: function(ctx){
       ctx.save();
       // ctx.strokeStyle="rgba(0,0,0,0)";
@@ -3213,25 +3213,29 @@ const SVGIcons = {
 }
 
 
+// ['lunshituolaji_p.svg', 'zhengsanlun_s.svg']
 export const typeKeys = [
   {
     type: "常用名称",
     children: [
-      "chemotuoche_p.svg",
-      "dianche_p.svg",
-      "dianche_s.svg",
-      "erlunmotuoche.svg",
-      "guache_p.svg"
     ]
   },
   {
     type: "机动车",
     children: [
+      "lunshituolaji_p.svg",
+      "zhengsanlun_s.svg",
+      "chemotuoche_p.svg",
+      "dianche_p.svg",
+      "keche_s.svg",
+      "dianche_s.svg",
+      "guache_p.svg",
       "guache_pingmian.svg",
       "huoche_p.svg",
       "huoche_s1.svg",
       "huoche_s2.svg",
       "jiaoche_p.svg",
+      "jiaoche_s.svg",
       "keche_p.svg",
       "lunshijixie_p.svg",
       "lunshituolaji_s.svg",
@@ -3245,14 +3249,13 @@ export const typeKeys = [
   {
     type: "非机动车",
     children: [
+      "erlunmotuoche.svg",
       "fjdc_canjiren_p.svg",
       "fjdc_canjiren_s.svg",
       "fjdc_renliche.svg",
       "fjdc_sanlunche.svg",
       "fjdc_xuliche.svg",
       "fjdc_zixingche.svg",
-      "jtxx_fangxb.svg",
-      "jtxx_fengxb.svg",
 
     ]
   },
@@ -3279,5 +3282,6 @@ export const typeKeys = [
     ]
   },
 ]
-
+const types = typeKeys.map(item => item.children).flat()
+console.log("yl", Object.keys(SVGIcons).filter(type => !types.includes(type)))
 export default SVGIcons

+ 3 - 1
src/views/graphic/imageLabel.vue

@@ -53,7 +53,9 @@ const typeMenus = computed(() => typeMenusRaw
   .map(
     (typeMenu) => ({
       ...typeMenu,
-      children: typeMenu.children.filter(item => item.text.includes(keyword.value))
+      children: typeMenu.children
+        .filter(item => item.text.includes(keyword.value))
+        .sort((a, b) => a.icon.localeCompare(b.icon))
     })
   )
   .filter(typeMenu => typeMenu.children.length > 0)