lsc 2 vuotta sitten
vanhempi
commit
11cac03f3d
6 muutettua tiedostoa jossa 18053 lisäystä ja 33 poistoa
  1. 17993 1
      package-lock.json
  2. 1 0
      package.json
  3. 0 21
      src/App.vue
  4. 39 9
      src/components/pages/demo.vue
  5. 6 0
      src/main.js
  6. 14 2
      src/router/index.js

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 17993 - 1
package-lock.json


+ 1 - 0
package.json

@@ -14,6 +14,7 @@
     "cacache": "^16.1.1",
     "clipboard": "^2.0.10",
     "echarts": "^5.0.2",
+    "element-china-area-data": "^5.0.2",
     "element-ui": "^2.15.1",
     "file-saver": "^2.0.5",
     "hevue-img-preview": "^5.0.3",

+ 0 - 21
src/App.vue

@@ -93,9 +93,6 @@ export default {
   created: function () {
     this.routerP();
     // this.getnCount();
-    setInterval(() => {
-      // this.getnCount();
-    }, 60000);
   },
   methods: {
     isLogin() {
@@ -122,24 +119,6 @@ export default {
         }, 2000);
       }
     },
-    getnCount() {
-      let params = {
-        bid: this.$store.state.userInfo.userid,
-      };
-      this.ajax
-        .get(this.$store.state.api + "getNcount", params)
-        .then((res) => {
-          console.log(res);
-          if (res.data[0].length > 0) {
-            this.$store.commit("update", ["nCount", res.data[0][0].num]);
-          } else {
-            this.$store.commit("update", ["nCount", 0]);
-          }
-        })
-        .catch((err) => {
-          console.error(err);
-        });
-    },
     routerP() {
       const { navTabs } = this.$data;
       let router_path = this.$route.path;

+ 39 - 9
src/components/pages/demo.vue

@@ -1,21 +1,51 @@
 <template>
   <div>
-    <div>{{$store.state.userInfo}}</div>
+    <div>{{ $store.state.userInfo }}</div>
+    <div>
+      <el-cascader
+        size="large"
+        clearable
+        :options="options"
+        v-model="selectedOptions"
+        @change="handleChange"
+      >
+      </el-cascader>
+    </div>
   </div>
 </template>
 
 <script>
+import { regionData, CodeToText } from "element-china-area-data";
+const Data = regionData.filter((ele) => {
+  return ele.value == "440000";
+});
 export default {
-    data() {
-        return {
-        }
+  data() {
+    return {
+      options: Data[0].children,
+      selectedOptions: [], //"440000","440100"
+      loc: "",
+    };
+  },
+  methods: {
+    handleChange() {
+      if (!this.selectedOptions) {
+        return;
+      }
+      var loc = "";
+      for (let i = 0; i < this.selectedOptions.length; i++) {
+        loc += CodeToText[this.selectedOptions[i]];
+      }
+      console.log(loc);
+      console.log(this.selectedOptions);
+      this.loc = "广东省" + loc;
     },
-    mounted () {
-        console.log(this.$store);;
-    },
-}
+  },
+  mounted() {
+    console.log(this.$store);
+  },
+};
 </script>
 
 <style>
-
 </style>

+ 6 - 0
src/main.js

@@ -64,7 +64,13 @@ new Vue({
 
 VueCookies.config('30d')
 
+
 router.beforeEach((to, from, next) => {
+    if (to.matched.length === 0) {
+        from.name ? next({
+          name: from.name
+        }) : next('/login');
+      }
     if (to.meta.title) {
         document.title = to.meta.title
     }

+ 14 - 2
src/router/index.js

@@ -11,7 +11,7 @@ import demo from '@/components/pages/demo'
 
 Vue.use(Router).use(ElementUI)
 
-export default new Router({
+const router = new Router({
     routes: [{
         path: '/login',
         name: 'login',
@@ -56,4 +56,16 @@ export default new Router({
         }
     },
     ]
-})
+})
+
+router.beforeEach((to, from, next) => {
+    if (to.matched.length === 0) {
+        from.name ? next({
+            name: from.name
+        }) : next('/login');
+    } else {
+        next();
+    }
+})
+
+export default router;

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä