style：chart模板 显示对应图标

nezha-fronted/src/assets/css/font/iconfont.svg

@@ -20,6 +20,36 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="barchart" unicode="&#59162;" d="M160.93452769 782.72141926v-704.51374257c0-5.16272745 4.2890351-9.45176256 9.53118922-9.45176256h819.68227976a38.12475689 38.12475689 0 0 0 38.12475688-38.12475773v-9.53118922a38.12475689 38.12475689 0 0 0-38.12475688-38.04533022H113.27858074a38.12475689 38.12475689 0 0 0-38.12475689 38.12475687V782.72141926A38.12475689 38.12475689 0 0 0 113.27858074 820.84617615H122.80976995a38.12475689 38.12475689 0 0 0 38.12475774-38.1247569zM370.62069224 248.97481867v-68.14800348c0-25.01937161-17.07671377-45.35257566-38.12475773-45.35257652h-9.53118923c-21.04804312 0-38.12475689 20.33320407-38.12475688 45.35257652V248.97481867c0 25.01937161 17.07671377 45.35257566 38.12475688 45.35257565h9.53118923c21.04804312 0 38.12475689-20.33320407 38.12475773-45.35257565z m177.51840082 267.27043314V173.51956975999997a38.12475689 38.12475689 0 0 0-38.12475773-38.04533109h-9.53118922a38.12475689 38.12475689 0 0 0-38.12475688 38.12475774V516.08639851a38.12475689 38.12475689 0 0 0 38.12475688 38.12475688h9.53118922a38.12475689 38.12475689 0 0 0 38.12475773-38.12475688zM725.65749304 363.90507590000004v-190.4649328a38.12475689 38.12475689 0 0 0-38.12475689-38.04533022h-9.53118921a38.12475689 38.12475689 0 0 0-38.12475688 38.12475688V363.82564923999996a38.12475689 38.12475689 0 0 0 38.12475688 38.12475688h9.53118921a38.12475689 38.12475689 0 0 0 38.12475689-38.12475688z m177.51840082 266.55559411v-457.02052691a38.12475689 38.12475689 0 0 0-38.12475687-38.04533022h-9.53118923a38.12475689 38.12475689 0 0 0-38.12475773 38.12475688V630.38124335a38.12475689 38.12475689 0 0 0 38.12475773 38.12475688h9.53118923a38.12475689 38.12475689 0 0 0 38.12475687-38.12475688z"  horiz-adv-x="1117" />
+
+    
+    <glyph glyph-name="alertlist" unicode="&#59163;" d="M454.65888959 334.90941095999995h564.25964447a55.48553177 55.48553177 0 1 1 0 110.97106354h-564.25964447a55.48553177 55.48553177 0 1 1 0-110.97106354z m0 332.81914716h738.61587453a55.48553177 55.48553177 0 1 1 0 110.97106272H454.65888959a55.48553177 55.48553177 0 0 1 0-110.97106271z m738.61587453-554.76127426H454.65888959a55.48553177 55.48553177 0 1 1 0-110.9710627h738.61587453a55.48553177 55.48553177 0 1 1 0 110.9710627zM204.87995358 473.71728343a83.22829724 83.22829724 0 1 1 0-166.55063793 83.22829724 83.22829724 0 0 1 0 166.45659446z m0-332.91318979a83.22829724 83.22829724 0 1 1 0-166.55063878 83.22829724 83.22829724 0 0 1 0 166.45659531z m0 665.6382935a83.22829724 83.22829724 0 1 1 0-166.45659532 83.22829724 83.22829724 0 0 1 0 166.45659532z"  horiz-adv-x="1365" />
+
+    
+    <glyph glyph-name="Text1" unicode="&#59164;" d="M913.89848206 820.84617615a34.94769409 34.94769409 0 0 0 34.94769409-34.94769409v-803.79696412a34.94769409 34.94769409 0 0 0-34.94769409-34.94769409H110.10151794a34.94769409 34.94769409 0 0 0-34.94769409 34.94769409V785.89848206A34.94769409 34.94769409 0 0 0 110.10151794 820.84617615z m-43.68461762-78.63231171H153.78613556v-716.42772888h716.42772888V742.21386444zM613.93077472 602.42308807c26.21077057 0 40.62669438-11.79484675 43.24777143-35.38454026L657.61539234 558.7384704599999c0-29.12307812-14.56153949-43.68461762-43.68461762-43.68461762H482.80411361L482.87692188 209.26152953999997c0-26.21077057-11.79484675-40.62669438-35.38454027-43.24777144L439.19230427 165.57691193000005c-29.12307812 0-43.68461762 14.56153949-43.68461762 43.68461761V515.05385284H264.4538338c-26.21077057 0-40.62669438 11.79484675-43.24777144 35.38454028L220.76921619 558.7384704599999c0 29.12307812 14.56153949 43.68461762 43.68461761 43.68461761h349.47694092z m87.36923524-349.47694091c26.21077057 0 40.62669438-11.79484675 43.24777142-35.38454027L744.98462756 209.26152953999997c0-29.12307812-14.56153949-43.68461762-43.6846176-43.68461761H613.93077472c-26.21077057 0-40.62669438 11.79484675-43.24777145 35.38454026L570.24615711 209.26152953999997c0 29.12307812 14.56153949 43.68461762 43.68461761 43.68461762h87.36923524z m0 174.73847046c26.21077057 0 40.62669438-11.79484675 43.24777142-35.38454027L744.98462756 384c0-29.12307812-14.56153949-43.68461762-43.6846176-43.68461762H657.61539234c-26.21077057 0-40.62669438 11.79484675-43.24777145 35.38454027L613.93077472 384c0 29.12307812 14.56153949 43.68461762 43.68461762 43.68461762h43.68461762z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="Piechart" unicode="&#59165;" d="M448.63768055 715.43942139c21.79533639 0 39.60738693-17.7368945 39.60738606-39.53223001V378.73905709999997h297.01782219c21.79533639 0 39.60738693-17.81205053 39.60738606-39.60738693a376.08228223 376.08228223 0 0 0-376.23259431-376.23259518A376.08228223 376.08228223 0 0 0 72.32992934 339.2068262a376.08228223 376.08228223 0 0 0 376.30775121 376.30775122zM743.62628093 299.6745962H448.63768055a39.75769901 39.75769901 0 0 0-39.60738693 39.60738692V634.2705834999999a298.82157327 298.82157327 0 0 1-257.48559131-295.0637573 296.64204025 296.64204025 0 0 1 297.09297824-297.01782132A298.82157327 298.82157327 0 0 1 743.62628093 299.59944014999996zM904.08504871 438.26287155H587.30111195a39.75769901 39.75769901 0 0 0-39.60738693 39.60738605V794.72935129c0 21.79533639 17.81205053 39.60738693 39.60738693 39.60738604a357.51866867 357.51866867 0 0 0 356.46647973-356.46647973c0-21.79533639-17.81205053-39.60738693-39.60738692-39.60738605z m-277.25170674 314.90502789v-235.69025491h235.69025491A281.53561764 281.53561764 0 0 1 626.83334197 753.01758737z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="StackArea" unicode="&#59166;" d="M171.60119436 772.05475259v-704.51374257c0-5.16272745 4.2890351-9.45176256 9.53118922-9.45176256h819.68227976a38.12475689 38.12475689 0 0 0 38.12475688-38.12475773v-9.53118922a38.12475689 38.12475689 0 0 0-38.12475688-38.04533022H123.94524741a38.12475689 38.12475689 0 0 0-38.12475689 38.12475687V772.05475259A38.12475689 38.12475689 0 0 0 123.94524741 810.17950948H133.47643662a38.12475689 38.12475689 0 0 0 38.12475774-38.1247569zM860.94446032 726.78160273a35.42425317 35.42425317 0 0 1-36.77450545-2.54165039L622.82358057 581.03383321 537.75771663 671.73898454a35.42425317 35.42425317 0 0 1-46.94110793 4.28903596L258.97042959 504.30775951a35.42425317 35.42425317 0 0 1-14.29678426-28.43471434V195.41780008c0-19.53893837 15.88531565-35.42425317 35.42425402-35.42425402h564.56411204c19.53893837 0 35.42425317 15.88531565 35.42425402 35.42425402V695.32867805a35.42425317 35.42425317 0 0 1-19.14180509 31.45292468zM315.36329921 458.08149151l192.2123175 142.25300011 84.66873153-90.22859226a35.42425317 35.42425317 0 0 1 46.30569466-4.68616752L809.39661153 626.78354215v-106.66989364L614.40436366 417.01795095l-96.42386537 47.33824033a35.42425317 35.42425317 0 0 1-30.73808479 0.15885331L315.36329921 383.02337586v75.05811565zM809.39661153 230.84205325000005H315.36329921v73.86671753l186.65245762 88.56063334 97.29755687-47.8147994c10.16660161-5.00387414 22.16001541-4.76559504 32.16776373 0.47655908L809.31718488 440.05165872v-209.13017881z"  horiz-adv-x="1117" />
+
+    
+    <glyph glyph-name="LinkChart" unicode="&#59167;" d="M180.95536102 782.72141926v-714.83919749h829.21346899a38.12475689 38.12475689 0 0 0 38.12475687-38.12475773v-9.53118921a38.12475689 38.12475689 0 0 0-38.12475687-38.12475689H133.29941407a38.12475689 38.12475689 0 0 0-38.12475688 38.12475689V782.72141926A38.12475689 38.12475689 0 0 0 133.29941407 820.84617615H142.83060329a38.12475689 38.12475689 0 0 0 38.12475773-38.1247569z m783.94031998-207.2239408L711.20719222 322.04726963999997a76.24951462 76.24951462 0 0 0-106.90817361-0.87369234l-0.953119 0.79426568-104.445949 104.52537567-129.70360142-129.70360057c-15.88531565-15.88531565-41.54009964-15.88531565-57.34598863 0l-6.75125884 6.75125885a40.50755481 40.50755481 0 0 0 0 57.18713617l139.870203 139.94962883a76.24951462 76.24951462 0 0 0 107.86129176 0l104.44594986-104.52537566 243.44245967 243.44245967c15.88531565 15.88531565 41.46067384 15.88531565 57.34598863 0l6.67183305-6.6718322c15.88531565-15.88531565 15.88531565-41.46067384 0-57.34598862z"  horiz-adv-x="1117" />
+
+    
+    <glyph glyph-name="Group" unicode="&#59168;" d="M873.72742264 637.60512371v22.84752533c0 44.11676681-35.77441403 79.96633689-79.966336 79.966336H489.45310059c-9.77032279 0-18.11267557-2.25468994-24.6512764-5.11062994-9.77032279 16.30892362-22.32143042 29.31096924-54.41318451 37.65332202H151.39992233c-49.75349167 0-90.18759766-40.43410599-90.18759766-90.18759766v-586.06907269c0-49.75349167 40.43410599-90.18759766 90.18759766-90.18759766h721.42562434c49.75349167 0 90.18759766 40.43410599 90.18759765 90.18759766V547.41752605c0 49.30255368-39.983168 89.73665967-89.28572168 90.18759766z m-69.74507523 22.84752533v-22.84752533H529.06048751l-20.89346041 33.0687861h285.59405954c5.56156881 0 10.22126077-4.65969284 10.22126077-10.22126077z m88.8347837-563.74764227a20.66799142 20.66799142 0 0 0-20.44252244-20.51767847H151.39992233a20.66799142 20.66799142 0 0 0-20.44252243 20.51767847V682.7740794599999c0 11.12313675 9.24422876 20.44252243 20.44252243 20.44252155h248.39167462c2.25468994-0.90187598 3.23172195-1.42797 3.75781687-1.87890799 1.35281397-1.87890799 4.58453592-7.44047681 6.91438278-11.64923166 7.51563284-13.00204562 17.28595651-30.6637832 34.42159918-49.75349079l24.65127728-39.53223089 20.44252155-32.54269119h382.39541406c11.12313675 0 20.44252243-9.31938479 20.44252244-20.44252244v-450.71251928zM669.07673288 336.45370446000004H540.86003125v128.51732666a29.76190723 29.76190723 0 0 1-29.53643823 29.53643824 29.76190723 29.76190723 0 0 1-29.53643824-29.61159516v-128.51732666h-129.26888968a29.76190723 29.76190723 0 0 1-29.53643823-29.53643823c0-16.15861154 13.37782669-29.53643823 29.53643823-29.53643823h128.36701371v-128.51732667c0-7.89141479 3.23172195-15.25673556 8.71813473-21.26924148a29.76190723 29.76190723 0 0 1 50.80567973 20.8183035v128.51732665h128.3670137a31.26503415 31.26503415 0 0 1 21.19408544 8.71813474 29.76190723 29.76190723 0 0 1-20.74314746 50.88083664z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="SingleValue" unicode="&#59169;" d="M103.7286784 155.48717444V290.43036743000005L442.2703731 823.77727307h214.64648242v-530.9794812h100.55917139v-137.31061743h-100.55917139v-142.6091388H493.00089678V155.48717444H103.7286784z m392.3160498 137.42335193V636.9762114299999h-6.20039734L276.43792792 299.22365820000005v-6.31313183h219.83226928-0.1127345z m375.63134425-279.91975623V136.43504442999995l288.6003125 267.18075806c37.08964953 35.51136658 65.16053931 66.28788428 84.43813829 92.4422876 18.93939551 25.13979285 29.08550025 55.91631055 28.97276576 87.36923522 0 35.73683557-11.94985669 63.80772534-35.73683558 84.43813831-23.56150988 20.85588195-52.98521362 31.34019018-88.6093147 31.34019018-37.08964953 0-66.85155676-11.2734497-89.51119067-33.70761462-22.54689941-22.20869592-33.59488013-52.64701013-33.25667663-91.54041162H863.78465764c0 53.09794812 12.06259119 99.20635742 36.07503907 138.21249342a241.25182373 241.25182373 0 0 0 100.55917139 90.75127013C1043.70891497 824.34094556 1093.76303167 834.93798828 1150.4684837 834.93798828c58.05826599 0 108.67605518-10.25883923 151.62789855-30.8892522 43.29004688-20.29220948 76.9976615-48.47583374 100.89737489-84.66360729 24.12518237-35.96230457 36.07503906-77.44859949 36.07503906-124.34615027 0-30.6637832-5.97492835-60.87662842-18.15025403-90.75127015-12.17532568-29.87464172-33.48214563-62.90584936-64.25866333-99.31909191-30.21284522-36.18777356-73.2774231-79.59055493-128.96826465-130.32107862L1109.32039227 158.53100586000005v-5.52399035h340.45818114v-140.12897986H871.67607245V13.103504639999983z"  horiz-adv-x="1536" />
+
+    
+    <glyph glyph-name="URL" unicode="&#59170;" d="M913.89848206 820.84617615a34.94769409 34.94769409 0 0 0 34.94769409-34.94769409v-803.79696412a34.94769409 34.94769409 0 0 0-34.94769409-34.94769409H110.10151794a34.94769409 34.94769409 0 0 0-34.94769409 34.94769409V785.89848206A34.94769409 34.94769409 0 0 0 110.10151794 820.84617615z m-43.68461762-78.63231171H153.78613556v-716.42772888h716.42772888V742.21386444zM274.64691067 529.61539234v-314.01959324h72.51646524V529.61539234h53.87769535v-327.34340161c0-21.91511623-11.06677009-32.90907889-33.12750197-32.9090789H253.45987114c-21.8423088 0-32.6906558 10.9211544-32.69065495 32.90907889V529.61539234h53.87769448z m312.6362473 0c21.62388572 0 32.47223271-11.06677009 32.47223186-33.12750198v-131.05385284c0-15.14400049-5.09653843-24.97303945-15.43523098-29.41430948-5.53338461-2.32984656-17.18261655-3.49476941-34.9476941-3.49476941l59.33827169-163.1620468h-56.20754104L513.16492285 336.6749973v32.47223271h52.93119558V483.30969767H498.16653804v-313.94678584h-53.87769535V529.61539234h142.99431528z m128.2143527 0v-312.19940114H803.23078381v-48.05307937H661.61981533V529.61539234h53.87769534z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="Table1" unicode="&#59171;" d="M912.44232784 820.84617615H111.55767216a36.4038483 36.4038483 0 0 1-36.40384831-36.40384831v-800.88465568a36.4038483 36.4038483 0 0 1 36.40384831-36.40384831h800.88465568a36.4038483 36.4038483 0 0 1 36.40384831 36.40384831V784.44232784a36.4038483 36.4038483 0 0 1-36.40384831 36.40384831zM414.87453322 287.09295631V493.21154404h194.1781253v-206.11858773H414.87453322z m194.1781253-72.80769575V19.961519589999966H414.87453322V214.28526055999998h194.1781253zM147.96151959 493.21154404h194.10531788v-206.11858773H147.96151959V493.21154404z m533.89883552 0H876.03848041v-206.11858773H681.86035511V493.21154404zM147.96151959 748.03848041h728.07696082v-182.01924064H147.96151959V748.03848041z m0-533.89883552h194.10531788V19.961519589999966H147.96151959V214.13964489zM876.03848041 19.961519589999966H681.86035511V214.28526055999998H876.03848041V19.961519589999966z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="add" unicode="&#59161;" d="M522.61045266 827.11666667a48.05 48.05 0 0 0 48.05-48.05v-352.34378598h352.41242804a48.05 48.05 0 0 0 0-96.1H570.66045266v-352.41242804a48.05 48.05 0 0 0-96.1 0V330.62288069H122.21666668a48.05 48.05 0 1 0 0 96.1h352.34378598V779.06666667a48.05 48.05 0 0 0 48.05 48.05z"  horiz-adv-x="1024" />
 
     

nezha-fronted/src/components/common/language/cn.js

@@ -174,7 +174,7 @@ const cn = {
     authPin: 'Password',
     authUserTip: 'Username prompt',
     authPinTip: 'Password prompt',
-    authPriKey: 'Key',
+    authPriKey: 'Key'
   },
   pageSize: '条/页',
   login: {
@@ -761,9 +761,9 @@ const cn = {
       latitude: '纬度',
       lnglat: '坐标'
     },
-    cabinet:{
+    cabinet: {
-      editCabinet:'编辑机柜',
+      editCabinet: '编辑机柜',
-      createCabinet:'创建机柜',
+      createCabinet: '创建机柜'
     },
     model: {
       model: '资产型号',
@@ -843,8 +843,8 @@ const cn = {
         curUrl: '网站URL',
         timezone: '时区',
         defaultCabinetUsize: '机柜默认U位',
-        sessionTimeout:'Session超时',
+        sessionTimeout: 'Session超时',
-        minute:'分',
+        minute: '分',
         second: '秒',
         day: '天',
         maxSeries: 'Query max series',
@@ -1023,10 +1023,14 @@ const cn = {
       errorStr: '请填写 {errorStr} 的值',
       edit: '修改表达式模板',
       create: '创建表达式模板',
-      expressionError: '请填写表达式'
+      expressionError: '请填写表达式',
+      type: 'Type',
+      varType: 'varType'
     },
     chartTemp: {
       chartTemp: 'Chart 模板',
+      type: 'Type',
+      varType: 'varType'
     }
   },
   alert: {

nezha-fronted/src/components/common/language/en.js

@@ -1044,10 +1044,14 @@ const en = {
       errorStr: 'Please fill in the {errorStr} value',
       edit: 'Edit expression template',
       create: 'New expression template',
-      expressionError: 'Please fill in the "expression" value'
+      expressionError: 'Please fill in the "expression" value',
+      type: 'Type',
+      varType: 'varType'
     },
     chartTemp: {
-      chartTemp: 'Chart template'
+      chartTemp: 'Chart template',
+      type: 'Type',
+      varType: 'varType'
     }
   },
   alert: {

nezha-fronted/src/components/common/table/settings/chartTmplTable.vue

@@ -34,7 +34,8 @@
       </template>
       <template slot-scope="scope" :column="item">
         <span v-if="item.prop==='varType'">{{scope.row[item.prop]===1?'Asset':'endpoint'}}</span>
-        <span v-else-if="item.prop==='type'" :class="typeIcon(scope.row)">
+        <span v-else-if="item.prop==='type'">
+          <i :class="typeIcon(scope.row)"/>
         {{chartTypeList.find(title=>title.id == scope.row[item.prop]).name}}
         </span>
         <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop] || '-'}}</span>
@@ -140,13 +141,40 @@ export default {
   },
   methods: {
     typeIcon (row) {
-      let str = 'nz-icon'
+      let str = 'nz-icon '
       switch (row.type) {
         case 'line':
-          str += 'nz-icon-multitext'
+          str += 'nz-icon-LinkChart'
+          break
+        case 'bar':
+          str += 'nz-icon-barchart'
+          break
+        case 'stackArea':
+          str += 'nz-icon-StackArea'
+          break
+        case 'singleStat':
+          str += 'nz-icon-SingleValue'
+          break
+        case 'pie':
+          str += 'nz-icon-Piechart'
+          break
+        case 'table':
+          str += 'nz-icon-Table1'
+          break
+        case 'alertList':
+          str += 'nz-icon-alertlist'
+          break
+        case 'text':
+          str += 'nz-icon-Text1'
+          break
+        case 'url':
+          str += 'nz-icon-URL'
+          break
+        case 'group':
+          str += 'nz-icon-Group'
           break
         default :
-          str += 'nz-icon-multitext'
+          str += 'nz-icon-Table1'
           break
       }
       return str