导航栏规则修改+general组件目录结构

src/components/upload_file.vue → src/components/general/upload_file.vue

@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import cropper from "@/components/cropper";
+import cropper from "@/components/general/cropper";
 export default {
   components: {
     cropper

src/components/menu.vue

@@ -78,19 +78,19 @@
         v-for="(item, index) in menu_arr"
         :key="index + 200"
         class="menu_box user_hover"
-        @click="navAction(index, item.visit_url)"
-        :style="{ color: now_menu == index ? '#fff' : '' }"
+        @click="navAction(item.visit_url)"
+        :style="{ color: now_menu == item.visit_url ? '#fff' : '' }"
       >
         {{ item.menu_name }}
         <div class="user_menu" v-if="item.Child && item.Child.length" style="left: 30px;">
           <div
             v-for="(v, indexs) in item.Child"
             :key="indexs + 700"
-            @click.stop="gotoChildPage(v, index)"
+            @click.stop="gotoChildPage(v, item.visit_url)"
           >{{ v.menu_name }}</div>
         </div>
         <div class="sj" v-if="item.Child && item.Child.length" style="left: 60px;"></div>
-        <div class="bottom_show" v-if="now_menu == index"></div>
+        <div class="bottom_show" v-if="now_menu == item.visit_url"></div>
       </div>
     </div>
   </div>
@@ -101,7 +101,7 @@ export default {
   data() {
     return {
       menu_arr: [],
-      now_menu: 2,
+      now_menu: "",
       user_arr: [
         { name: "个人档案", path: "/user/user_info" },
         { name: "消息通知", path: "/user/message" },
@@ -155,23 +155,23 @@ export default {
       // at here, we will goto shopping cart
       this.$router.push({ name: "shoppingCart" });
     },
-    navAction(index, path) {
+    navAction(path) {
       this.$router.push(path);
-      this.now_menu = index;
-      window.sessionStorage.setItem("menuIndex", index);
+      this.now_menu = path;
+      window.sessionStorage.setItem("menuVisitUrl", path);
     },
     gotoChildPage(v, parent) {
       if (v.visit_url) {
         if (v.visit_url == "/fwgl/" || v.visit_url == "/yygl/") {
           this.$router.push(v.visit_url + this.$store.getters.level);
-        } else if (parent == 2) {
+        } else if (parent == "/services_shop") {
           this.$router.push(v.visit_url);
           this.$store.commit("serviceShopMenuAct", v.visit_url);
         } else {
           this.$router.push(v.visit_url);
         }
         this.now_menu = parent;
-        window.sessionStorage.setItem("menuIndex", parent);
+        window.sessionStorage.setItem("menuVisitUrl", parent);
       }
     },
     getList() {
@@ -189,9 +189,9 @@ export default {
       });
     },
     getMenuIndex() {
-      let index = window.sessionStorage.getItem("menuIndex");
-      console.log(index);
-      this.now_menu = index ? index : 2;
+      let visit_url = window.sessionStorage.getItem("menuVisitUrl");
+      console.log(visit_url);
+      this.now_menu = visit_url ? visit_url : "/services_shop";
     },
     getNowMenu() {
       this.$api.general.getNowMenu({ teamName: "APAAS3" }).then(response => {

src/components/service-list/service_list.vue

@@ -141,7 +141,7 @@
 
 <script>
 import CommodityList from "@/components/service-list/commodity-list.vue";
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     "commodity-list": CommodityList,

src/components/shop-car-apply/apply_service_state.vue

@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import tableUm from "@/components/table/table-um";
 export default {
   props: ["data", "idx"],

src/components/shop-cloud/shop-cloud.vue

@@ -699,8 +699,8 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
-import uploadFile from "@/components/upload_file";
+import BlockRadius from "@/components/general/block-radius";
+import uploadFile from "@/components/general/upload_file";
 export default {
   components: {
     BlockRadius,

src/pages/authority/organization/organizationedit.vue

@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import { getRole, formatDateTime_date } from "@/utils/common";
 export default {
   props: {},

src/pages/authority/user/organizationuser.vue

@@ -166,7 +166,7 @@
 </template>
 
 <script>
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import { getRole, formatDateTime_date } from "@/utils/common";
 import { mapGetters, mapState } from "vuex";
 export default {

src/pages/data-analysis/my-service.vue

@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 import Dashboard from "@/components/e-charts/dashboard";
 export default {
   components: {

src/pages/example/example_code.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import codes from "@/components/codes";
+import codes from "@/components/general/codes";
 export default {
   data() {
     return {};

src/pages/example/example_com_list.vue

@@ -10,7 +10,7 @@
 <script>
 // @ is an alias to /src
 import CommodityList from "@/components/service-list/commodity-list.vue";
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     "commodity-list": CommodityList,

src/pages/example/example_commodity.vue

@@ -11,7 +11,7 @@
 <script>
 // @ is an alias to /src
 import Commodity from "@/components/service-list/commodity.vue";
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     Commodity,

src/pages/example/example_upload.vue

@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 export default {
   data() {
     return {

src/pages/service_shop/service_application_successfully.vue

@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     BlockRadius

src/pages/user/message.vue

@@ -25,7 +25,7 @@
 
 <script>
 import CesTable from "@/components/table/table-um";
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 export default {
   components: {
     CesTable,

src/pages/user/order/order_detail.vue

@@ -229,7 +229,7 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 import ProcessCard from "@/components/process-card";
 import TableUm from "@/components/table/table-um";
 import InfoList from "@/components/infoList";

src/pages/user/user_info.vue

@@ -176,8 +176,8 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
-import UploadFile from "@/components/upload_file";
+import BlockRadius from "@/components/general/block-radius";
+import UploadFile from "@/components/general/upload_file";
 export default {
   components: {
     BlockRadius,

src/pages/workbench/app_build.vue

@@ -274,7 +274,7 @@
 import appBuildSteps from "@/components/app-build-steps/app-build-steps";
 import appBuildStep from "@/components/app-build-steps/app-build-step";
 import apassTable from "@/components/apass-table";
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import apassDialog from "@/components/apass-dialog";
 
 export default {

src/pages/workbench/fwgl/serviceDetail.vue

@@ -166,7 +166,7 @@
 <script>
 import infoList from "@/components/infoList";
 import tableUm from "@/components/table/table-um";
-import codes from "@/components/codes";
+import codes from "@/components/general/codes";
 import norCard from "@/components/card";
 import exampleIcon from "@/pages/example/example_icon";
 import Topology from "@/components/topology.vue";

src/pages/workbench/fwgl/serviceEdit.vue

@@ -146,7 +146,7 @@
 </template>
 
 <script>
-import uploadFile from '@/components/upload_file'
+import uploadFile from '@/components/general/upload_file'
 import { getRole } from "@/utils/common";
 import { mapGetters,mapState } from 'vuex'
 export default {

src/pages/workbench/fwzc_fwcs.vue

@@ -350,10 +350,10 @@
 </template>
 
 <script>
-import BlockRadius from "@/components/block-radius";
+import BlockRadius from "@/components/general/block-radius";
 import CesTable from "@/components/table/table-um";
-import Codes from "@/components/codes";
-import uploadFile from "@/components/upload_file";
+import Codes from "@/components/general/codes";
+import uploadFile from "@/components/general/upload_file";
 export default {
   components: {
     BlockRadius,

src/pages/workbench/yygl/app_detail.vue

@@ -152,7 +152,7 @@ import infoList from "@/components/infoList";
 import tableUm from "@/components/table/table-um";
 import serviceHeader from "@/components/service-header";
 import dialogAction from "@/components/dialog-action";
-import uploadFile from '@/components/upload_file'
+import uploadFile from '@/components/general/upload_file'
 import serviceTabComments from '@/components/service-tabs/service-tab-comments'
 import { getRole } from "@/utils/common";
 import { mapGetters,mapState } from 'vuex'

src/pages/workbench/yygl/app_edit.vue

@@ -97,7 +97,7 @@
 </template>
 
 <script>
-import uploadFile from '@/components/upload_file'
+import uploadFile from '@/components/general/upload_file'
 import { getRole } from "@/utils/common";
 import { mapGetters,mapState } from 'vuex'
 export default {

src/pages/workbench/yygl/deploy_app_detail.vue

@@ -169,7 +169,7 @@ import infoList from "@/components/infoList";
 import tableUm from "@/components/table/table-um";
 import serviceHeader from "@/components/service-header";
 import dialogAction from "@/components/dialog-action";
-import uploadFile from "@/components/upload_file";
+import uploadFile from "@/components/general/upload_file";
 import norCard from "@/components/card";
 import exampleIcon from "@/pages/example/example_icon";
 import Topology from "@/components/topology.vue";

src/pages/workbench/yygl/deployment.vue

@@ -226,7 +226,7 @@
 <script>
 import appBuildSteps from "@/components/app-build-steps/app-build-steps";
 import appBuildStep from "@/components/app-build-steps/app-build-step";
-import codes from "@/components/codes";
+import codes from "@/components/general/codes";
 import yaml from "js-yaml";
 var checkNumber = (rule, value, callback) => {
   if (!value) {