合并修改

README.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 三区综合分析系统[hb_sis_zhfx]
 
 * 注：需创建自己的 GIT 分支进行代码开发，开发完调试完毕后再自行合并至主干分支。
@@ -152,4 +153,9 @@ import SvgIcon from "@/components/coms/icon/svg-icon.vue";
 </div>
 ```
 
-## 版本更新
+## 版本更新
+=======
+# fd_dwgz_zhyw_nx
+
+宁夏分公司demo
+>>>>>>> b81cfabb3a8845a8237b2d6a380554fad05b53e6

src/App.vue

@@ -20,7 +20,11 @@
                 : 'color:#000'
             "
           >
+<<<<<<< HEAD
             &gt;&gt;&nbsp;演示平台</span
+=======
+            &gt;&gt;宁夏分公司演示平台</span
+>>>>>>> b81cfabb3a8845a8237b2d6a380554fad05b53e6
           >
         </div>
         <div class="header-menu-body">

src/router/index.js

@@ -1049,6 +1049,7 @@ export const asyncRoutes = [
           permissions: ["jn_fdfx"],
         },
         children: [
+<<<<<<< HEAD
           // {
           //   path: "stateTransition",
           //   component: () =>
@@ -1075,6 +1076,34 @@ export const asyncRoutes = [
           //     permissions: ["jn_fdfx_ztsjfx"],
           //   },
           // },
+=======
+          {
+            path: "stateTransition",
+            component: () =>
+              import(
+                "@/views/economicsOperation/windAnalyse/stateTransition/index.vue"
+              ),
+            name: "stateTransition",
+            meta: {
+              title: "状态时间分析",
+              icon: "",
+              permissions: ["jn_fdfx_ztzhfx"],
+            },
+          },
+          {
+            path: "timeTransition",
+            component: () =>
+              import(
+                "@/views/economicsOperation/windAnalyse/timeTransition/index.vue"
+              ),
+            name: "timeTransition",
+            meta: {
+              title: "状态转换分析",
+              icon: "",
+              permissions: ["jn_fdfx_ztsjfx"],
+            },
+          },
+>>>>>>> b81cfabb3a8845a8237b2d6a380554fad05b53e6
           {
             path: "powerAnalyse",
             component: () =>