Browse Source

样本库界面刷新路由跳转异常问题

chenminghua 3 years ago
parent
commit
68dc0de8be
3 changed files with 16 additions and 25 deletions
  1. 10 11
      src/router/index.js
  2. 3 8
      src/views/layout/Menu.vue
  3. 3 6
      src/views/sampleDatabase/fault/index.vue

+ 10 - 11
src/router/index.js

@@ -509,7 +509,7 @@ const routes = [{
 	component: () => import( /* webpackChunkName: "powerCurve" */ "../views/powerCurve/index.vue"),
 },
 {
-	path: "/totalCurve", // 功率曲线拟合
+	path: "/others/totalCurve", // 功率曲线拟合
 	name: "totalCurve",
 	component: () => import( /* webpackChunkName: "powerCurve" */ "../views/totalCurve/index.vue"),
 },
@@ -937,15 +937,8 @@ const routes = [{
 	component: () =>
 		import('../views/Knowledge/Knowledge7.vue'),
 },
-{
-	path: '/device/device', //设备管理
-	name: 'device',
-	component: () =>
-		import('../views/sampleDatabase/device/device.vue'),
-}
-
 	/***********************************************************其他************************************************************ */
-	,
+	
 {
 	path: "/planPower",
 	name: "planPower",
@@ -984,12 +977,18 @@ const routes = [{
 		import( /* webpackChunkName: "dj2" */ "../views/NewPages/dialogs.vue"),
 },
 {
-	path: "/new/powerforecast2",
+	path: '/others/device', //设备管理
+	name: 'device',
+	component: () =>
+		import('../views/sampleDatabase/device/device.vue'),
+},
+{
+	path: "/others/powerforecast2",
 	name: "powerforecast2",
 	component: () => import( /* webpackChunkName: "powerforecast2" */ "../views/NewPages/power-forecast-2.vue"),
 },
 {
-	path: "/weatherPrognosis",//天气预测数据
+	path: "/others/weatherPrognosis",//天气预测数据
 	name: "weatherPrognosis",
 	component: () => import( /* webpackChunkName: "powerforecast2" */ "../views/weatherPrognosis/index.vue"),
 },

+ 3 - 8
src/views/layout/Menu.vue

@@ -985,7 +985,7 @@ export default {
                  {
                   text: "设备管理",
                   icon: "svg-wind-site",
-                  path: "/device/device",
+                  path: "/others/device",
                 },
                 {
                   text: "故障训练样本库",
@@ -1005,23 +1005,18 @@ export default {
                 {
                   text: "功率曲线拟合",
                   icon: "svg-matrix",
-                  path: "/totalCurve",
+                  path: "/others/totalCurve",
                 },
                  {
                   text: "天气预测数据",
                   icon: "svg-matrix",
-                  path: "/weatherPrognosis",
+                  path: "/others/weatherPrognosis",
                 },
                 {
                   text: "性能预警综合分析",
                   icon: "svg-matrix",
                   path: "/others/analysis",
                 },
-                // {
-                //   text: "功率曲线综合分析",
-                //   icon: "svg-matrix",
-                //   path: "/others/powerline/analysis",
-                // },
                 {
                   text: "风机检修规则",
                   icon: "svg-matrix",

+ 3 - 6
src/views/sampleDatabase/fault/index.vue

@@ -166,7 +166,7 @@
     <el-dialog
       :title="'故障样本库' + addDialogTitle"
       v-model="addDialogShow"
-      width="50%"
+      width="60%"
       custom-class="modal currentAddDialog"
       :close-on-click-modal="false"
       class="isvisiable"
@@ -262,11 +262,8 @@
             >
             </el-date-picker>
           </el-form-item>
-        </div>
-        <div class="inlineItem">
           <el-form-item label="风机厂商:" prop="manufacturer">
             <el-select
-              style="width: 100%"
               v-model="addDialogForm.manufacturer"
               placeholder="请选择"
               popper-class="select"
@@ -281,7 +278,7 @@
             </el-select>
           </el-form-item>
         </div>
-        <div class="inlineItem" style="width: 100%">
+        <div class="inlineItem">
           <el-form-item style="width: 100%" label="故障现象:" prop="symptom">
             <el-input
               type="textarea"
@@ -1027,7 +1024,7 @@ export default {
     align-items: center;
     flex-wrap: wrap;
     .inlineItem {
-      width: 50%;
+      width: 100%;
       display: flex;
       justify-content: start;
       align-items: center;