权限 角色 路由完成

src/api/job.js

 import request from '@/utils/request'
 
 
+
+
 /* 运行报表 */
+export function indexCount(data) {
+    return request({
+        url: '/device/indexCount',
+        method: 'post',
+        data
+    })
+}
 export function chartInfo(data) {
     return request({
         url: '/device/chartInfo',

src/icons/svg/edit.svg

-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1648197448165" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3164" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
-</style></defs><path d="M862.709333 116.042667a32 32 0 1 1 45.248 45.248L455.445333 613.813333a32 32 0 1 1-45.258666-45.258666L862.709333 116.053333zM853.333333 448a32 32 0 0 1 64 0v352c0 64.8-52.533333 117.333333-117.333333 117.333333H224c-64.8 0-117.333333-52.533333-117.333333-117.333333V224c0-64.8 52.533333-117.333333 117.333333-117.333333h341.333333a32 32 0 0 1 0 64H224a53.333333 53.333333 0 0 0-53.333333 53.333333v576a53.333333 53.333333 0 0 0 53.333333 53.333333h576a53.333333 53.333333 0 0 0 53.333333-53.333333V448z" p-id="3165"></path></svg>
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><defs><style>@font-face{font-family:feedback-iconfont;src:url(//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944) format(&quot;woff2&quot;),url(//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944) format(&quot;woff&quot;),url(//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944) format(&quot;truetype&quot;)}</style></defs><path d="M862.71 116.043a32 32 0 1 1 45.247 45.248L455.445 613.813a32 32 0 1 1-45.258-45.258l452.522-452.502zM853.332 448a32 32 0 0 1 64 0v352c0 64.8-52.533 117.333-117.333 117.333H224c-64.8 0-117.333-52.533-117.333-117.333V224c0-64.8 52.533-117.333 117.333-117.333h341.333a32 32 0 0 1 0 64H224A53.333 53.333 0 0 0 170.667 224v576A53.333 53.333 0 0 0 224 853.333h576A53.333 53.333 0 0 0 853.333 800V448z"/></svg>
\ No newline at end of file
\ No newline at end of file

src/icons/svg/history.svg

-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1643453337715" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4672" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M883.712 749.568c0-13.312-9.216-22.528-22.528-22.528h-67.072v-98.816c0-13.312-9.216-22.528-22.528-22.528-13.312 0-22.528 9.216-22.528 22.528v143.36h116.736c8.704 0.512 17.92-8.704 17.92-22.016zM188.928 937.472h349.696c13.312 0 23.552-15.872 23.552-29.184s-9.728-29.696-23.552-29.696H203.776c-31.232 0-58.368-12.8-58.368-44.032V189.44c0-31.232 26.112-44.032 57.344-44.032h486.912c31.232 0 44.544 13.312 44.544 44.544v242.176c0 13.312 16.384 21.504 29.696 21.504 13.312 0 29.696-8.192 29.696-21.504V189.44c0-58.368-45.056-102.912-102.912-102.912h-501.76c-58.368 0-102.912 45.056-102.912 102.912v645.12c0 58.368 44.544 102.912 102.912 102.912z" fill="" p-id="4673"></path><path d="M771.584 937.472c116.736 0 210.432-94.208 210.432-210.432s-94.208-210.432-210.432-210.432-210.432 94.208-210.432 210.432 93.696 210.432 210.432 210.432z m0-376.32c89.6 0 165.888 71.68 165.888 165.888 0 89.6-71.68 165.888-165.888 165.888-89.6 0-165.888-71.68-165.888-165.888 0-89.6 76.288-165.888 165.888-165.888zM229.376 301.568H650.24c13.312 0 22.528-9.216 22.528-22.528 0-13.312-9.216-22.528-22.528-22.528H229.376c-13.312 0-22.528 9.216-22.528 22.528s8.704 22.528 22.528 22.528z m165.888 420.864H229.376c-13.312 0-22.528 9.216-22.528 22.528s9.216 22.528 22.528 22.528h165.888c13.312 0 22.528-9.216 22.528-22.528s-9.216-22.528-22.528-22.528zM471.04 565.76H229.376c-13.312 0-22.528 9.216-22.528 22.528 0 13.312 9.216 22.528 22.528 22.528H471.04c13.312 0 22.528-9.216 22.528-22.528 0-13.312-8.704-22.528-22.528-22.528z m179.2-152.576H229.376c-13.312 0-22.528 9.216-22.528 22.528 0 13.312 9.216 22.528 22.528 22.528H650.24c13.312 0 22.528-9.216 22.528-22.528 0-13.312-8.704-22.528-22.528-22.528z" fill="" p-id="4674"></path></svg>
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><defs><style/></defs><path d="M883.712 749.568c0-13.312-9.216-22.528-22.528-22.528h-67.072v-98.816c0-13.312-9.216-22.528-22.528-22.528s-22.528 9.216-22.528 22.528v143.36h116.736c8.704.512 17.92-8.704 17.92-22.016zM188.928 937.472h349.696c13.312 0 23.552-15.872 23.552-29.184s-9.728-29.696-23.552-29.696H203.776c-31.232 0-58.368-12.8-58.368-44.032V189.44c0-31.232 26.112-44.032 57.344-44.032h486.912c31.232 0 44.544 13.312 44.544 44.544v242.176c0 13.312 16.384 21.504 29.696 21.504 13.312 0 29.696-8.192 29.696-21.504V189.44c0-58.368-45.056-102.912-102.912-102.912h-501.76c-58.368 0-102.912 45.056-102.912 102.912v645.12c0 58.368 44.544 102.912 102.912 102.912z"/><path d="M771.584 937.472c116.736 0 210.432-94.208 210.432-210.432s-94.208-210.432-210.432-210.432-210.432 94.208-210.432 210.432 93.696 210.432 210.432 210.432zm0-376.32c89.6 0 165.888 71.68 165.888 165.888 0 89.6-71.68 165.888-165.888 165.888-89.6 0-165.888-71.68-165.888-165.888 0-89.6 76.288-165.888 165.888-165.888zM229.376 301.568H650.24c13.312 0 22.528-9.216 22.528-22.528s-9.216-22.528-22.528-22.528H229.376c-13.312 0-22.528 9.216-22.528 22.528s8.704 22.528 22.528 22.528zm165.888 420.864H229.376c-13.312 0-22.528 9.216-22.528 22.528s9.216 22.528 22.528 22.528h165.888c13.312 0 22.528-9.216 22.528-22.528s-9.216-22.528-22.528-22.528zM471.04 565.76H229.376c-13.312 0-22.528 9.216-22.528 22.528s9.216 22.528 22.528 22.528H471.04c13.312 0 22.528-9.216 22.528-22.528s-8.704-22.528-22.528-22.528zm179.2-152.576H229.376c-13.312 0-22.528 9.216-22.528 22.528s9.216 22.528 22.528 22.528H650.24c13.312 0 22.528-9.216 22.528-22.528s-8.704-22.528-22.528-22.528z"/></svg>
\ No newline at end of file

src/icons/svg/homePage.svg

-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1643452701498" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2778" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M958.400956 451.54921c-0.058328-5.760191-2.597151-11.215436-6.965645-14.97097L524.345166 69.511143c-7.498788-6.445806-18.581194-6.445806-26.079982 0L309.582871 231.6755l0-102.017488c0-11.04966-8.901741-19.532869-19.951401-19.532869l-88.034009 0c-11.048637 0-19.928888 8.482185-19.928888 19.532869l0 211.954343L71.176063 436.57824c-4.423753 3.800559-6.967692 9.341762-6.967692 15.173584l0 105.500822c0 7.819083 4.554736 14.921851 11.660574 18.183128 2.670829 1.226944 5.51562 1.824555 8.343015 1.824555 4.699022 0 9.346879-1.654686 13.048177-4.836145l53.29788-45.825698 0 324.100516c0 60.677964 49.364291 110.042255 110.042255 110.042255L764.792447 960.741257c60.677964 0 110.042255-49.364291 110.042255-110.042255L874.834702 527.026228l51.585889 44.335764c5.955642 5.119601 14.356986 6.282077 21.481244 2.965541 7.122211-3.313465 11.645225-10.488889 11.565407-18.342764L958.400956 451.54921zM221.578538 150.034085l48.095391 0 0 115.941616-48.095391 41.336454L221.578538 150.034085zM570.718333 920.725892 436.666244 920.725892 436.666244 700.642404c0-11.031241 8.976442-20.007683 20.007683-20.007683l94.0357 0c11.031241 0 20.007683 8.976442 20.007683 20.007683L570.71731 920.725892zM834.818313 495.895207l0 354.803795c0 38.612413-31.414477 70.02689-70.02689 70.02689l-154.058748 0L610.732675 700.642404c0-33.096792-26.926256-60.023048-60.023048-60.023048l-94.0357 0c-33.096792 0-60.023048 26.926256-60.023048 60.023048l0 220.084511L260.59925 920.726915c-38.612413 0-70.02689-31.414477-70.02689-70.02689L190.57236 495.895207c0-1.172709-0.121773-2.314719-0.315178-3.432169l322.113255-276.958846 322.70268 277.348726C834.921667 493.848595 834.818313 494.858598 834.818313 495.895207zM525.411451 173.947727c-7.502881-6.445806-18.587334-6.446829-26.086122 0.00307L104.223736 513.663896l0-52.726875 407.081439-349.870436 407.176606 349.9523 0.521886 51.205219L525.411451 173.947727z" p-id="2779"></path></svg>
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><defs><style/></defs><path d="M958.401 451.55a20.01 20.01 0 0 0-6.966-14.972L524.345 69.511c-7.499-6.446-18.581-6.446-26.08 0L309.583 231.676V129.657c0-11.05-8.902-19.533-19.952-19.533h-88.034c-11.048 0-19.928 8.482-19.928 19.533v211.954L71.176 436.578a20.003 20.003 0 0 0-6.968 15.174v105.5a20.007 20.007 0 0 0 33.052 15.172l53.298-45.826V850.7c0 60.678 49.364 110.042 110.042 110.042h504.192c60.678 0 110.043-49.364 110.043-110.042V527.026l51.586 44.336a20.001 20.001 0 0 0 21.48 2.966 20.006 20.006 0 0 0 11.566-18.343l-1.066-104.436zM221.579 150.033h48.095v115.942l-48.095 41.336V150.034zm349.14 770.692H436.665V700.642c0-11.03 8.977-20.007 20.008-20.007h94.036c11.03 0 20.007 8.976 20.007 20.007v220.084zm264.1-424.83v354.803c0 38.612-31.415 70.027-70.028 70.027H610.733V700.642c0-33.096-26.927-60.023-60.023-60.023h-94.036c-33.097 0-60.023 26.927-60.023 60.023v220.085H260.599c-38.612 0-70.027-31.415-70.027-70.027V495.895a20.07 20.07 0 0 0-.315-3.432L512.37 215.504l322.703 277.349a20.158 20.158 0 0 0-.255 3.042zM525.41 173.947c-7.502-6.446-18.587-6.447-26.086.003l-395.1 339.714v-52.727l407.081-349.87 407.177 349.952.522 51.205L525.41 173.948z"/></svg>
\ No newline at end of file

src/icons/svg/maintain.svg

-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1643453071952" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8246" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M243.113 158.084c92.034-54.354 212.56-41.993 291.636 37.082 62.815 62.815 83.531 151.786 62.15 231.854l231.764 231.765c46.394 46.395 46.858 121.326 1.391 168.291l-1.391 1.415c-46.863 46.863-122.843 46.863-169.706 0L427.193 596.726c-80.068 21.383-169.04 0.666-231.856-62.149-78.284-78.285-91.181-197.196-38.691-288.867l1.61-2.77 132.06 132.056c23.43 23.432 61.42 23.432 84.852 0 23.197-23.197 23.43-60.663 0.696-84.145l-0.696-0.707-132.055-132.06z m-61.127 187.782l-0.13 1.289c-5.092 53.223 13.075 107.82 53.08 147.824 46.538 46.539 113.355 64.142 175.914 48.139l1.894-0.496 31.207-8.334 254.604 254.605c24.993 24.994 65.516 24.994 90.51 0 24.743-24.744 24.99-64.707 0.742-89.755l-0.742-0.755L534.46 443.778l8.334-31.206c16.851-63.101-0.635-130.8-47.643-177.808-40.004-40.004-94.6-58.171-147.824-53.08l-1.29 0.131 69.048 69.053 0.856 0.869 0.158 0.163c44.017 45.468 43.464 117.897-1.333 162.694-44.848 44.848-117.282 45.297-162.681 1.346l-1.367-1.345-68.732-68.73z m13.351-150.7a243.938 243.938 0 0 1 8.995-8.55l-17.544 17.545a243.728 243.728 0 0 1 7.086-7.52l1.463-1.475z" p-id="8247"></path></svg>
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><defs><style/></defs><path d="M243.113 158.084c92.034-54.354 212.56-41.993 291.636 37.082 62.815 62.815 83.531 151.786 62.15 231.854l231.764 231.765c46.394 46.395 46.858 121.326 1.391 168.291l-1.391 1.415c-46.863 46.863-122.843 46.863-169.706 0L427.193 596.726c-80.068 21.383-169.04.666-231.856-62.149-78.284-78.285-91.181-197.196-38.691-288.867l1.61-2.77 132.06 132.056c23.43 23.432 61.42 23.432 84.852 0 23.197-23.197 23.43-60.663.696-84.145l-.696-.707-132.055-132.06zm-61.127 187.782l-.13 1.289c-5.092 53.223 13.075 107.82 53.08 147.824 46.538 46.539 113.355 64.142 175.914 48.139l1.894-.496 31.207-8.334 254.604 254.605c24.993 24.994 65.516 24.994 90.51 0 24.743-24.744 24.99-64.707.742-89.755l-.742-.755L534.46 443.778l8.334-31.206c16.851-63.101-.635-130.8-47.643-177.808-40.004-40.004-94.6-58.171-147.824-53.08l-1.29.131 69.048 69.053.856.869.158.163c44.017 45.468 43.464 117.897-1.333 162.694-44.848 44.848-117.282 45.297-162.681 1.346l-1.367-1.345-68.732-68.73zm13.351-150.7a243.938 243.938 0 0 1 8.995-8.55l-17.544 17.545a243.728 243.728 0 0 1 7.086-7.52l1.463-1.475z"/></svg>
\ No newline at end of file

src/layout/components/Sidebar/Item.vue

@@ -16,9 +16,9 @@ export default {
     const { icon, title } = context.props
     const vnodes = []
 
-    if (icon) {
-      vnodes.push(<svg-icon icon-class={icon}/>)
-    }
+    // if (icon) {
+    //   vnodes.push(<svg-icon icon-class={icon}/>)
+    // }
 
     if (title) {
       if (title.length > 5) {

src/views/setting/add/comp/monitorEquip.vue

@@ -73,9 +73,9 @@
         <el-select v-model="monitorForm.equipType" placeholder="请输入设备类别">
           <el-option
             v-for="item in equipTypeSelect"
-            :key="item.id"
-            :label="item.dictValue"
-            :value="item.id"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -83,9 +83,9 @@
         <el-select v-model="monitorForm.equipMode" placeholder="请输入设备型号">
           <el-option
             v-for="item in equipModeSelect"
-            :key="item.id"
-            :label="item.dictValue"
-            :value="item.id"
+            :key="item.dictValue"
+            :label="item.dictLabel"
+            :value="item.dictValue"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -243,12 +243,13 @@ export default {
           monitorEquipsave(this.monitorForm).then((res) => {
             if (res.code == 200) {
               successAlert("添加成功");
+              
+        this.monitorForm = formInit();
             } else {
               warningAlert("添加失败");
             }
           });
         }
-        this.monitorForm = formInit();
       });
     },
 

src/views/setting/statistics/comp/fsuTable.vue

@@ -246,7 +246,7 @@ export default {
     },
     handleView(row) {
       this.$router.push({
-        path: "/detail",
+        path: "/setting/statistics/detail",
         query: {
           id: row.id,
           type: 3,

src/views/setting/statistics/comp/lineTable.vue

@@ -313,7 +313,7 @@ export default {
     },
     handleView(row) {
       this.$router.push({
-        path: "/detail",
+        path: "/setting/statistics/detail",
         query: {
           id: row.id,
           type: 6,

src/views/setting/statistics/comp/railWayTable.vue

@@ -248,7 +248,7 @@ export default {
     },
     handleView(row) {
       this.$router.push({
-        path: "/detail",
+        path: "/setting/statistics/detail",
         query: {
           id: row.id,
           type: 1,