Etusivu Tutki Apua
Kirjaudu sisään
crowd-test-service
/
crowd-test-service-frontend
2
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

Revert "update conf"

This reverts commit 2935dc411bab6b7ab8acd4b4540205aabbc5f29a
郭超 5 vuotta sitten
vanhempi
68c6d1e699
commit
40ecbece99
8 muutettua tiedostoa jossa 6 lisäystä ja 23 poistoa
Yhdistetty näkymä Näytä diff tilastot
  1. 0 5
      build/webpack.base.conf.js
  2. 1 5
      index.html
  3. 2 2
      package.json
  4. 0 1
      src/components/commons/Header2.0.vue
  5. 0 1
      src/constants/index.js
  6. 1 5
      src/main.js
  7. 1 1
      src/pages/Statistics/StatisticsReport.vue
  8. 1 3
      src/router/index.js

+ 0 - 5
build/webpack.base.conf.js
Näytä tiedosto 

@@ -90,11 +90,6 @@ module.exports = {
 
     tls: 'empty',
 
     tls: 'empty',
 
     child_process: 'empty'
 
     child_process: 'empty'
 
   },
 
   },
 
-  externals: {
 
-    'vue': 'Vue',
 
-    // 'vue-router': 'VueRouter',
 
-    'axios': 'axios',
 
-  }
 
   // externals: {
 
   // externals: {
 
   //   'vue': 'Vue',
 
   //   'vue': 'Vue',
 
   //   'vue-router': 'VueRouter'
 
   //   'vue-router': 'VueRouter'

+ 1 - 5
index.html
Näytä tiedosto 

@@ -6,11 +6,7 @@
 
     <title>crowd-test-service</title>
 
     <title>crowd-test-service</title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
-  <script src="https://cdn.bootcdn.net/ajax/libs/axios/0.20.0/axios.min.js"></script>
 
-  <script src="https://cdn.bootcdn.net/ajax/libs/vue/2.5.2/vue.js"></script>
 
-  <script src="https://cdn.bootcdn.net/ajax/libs/element-ui/2.11.0/index.js"></script>
 
-<!--  <script src="https://cdn.bootcdn.net/ajax/libs/vue-router/3.0.6/vue-router.min.js"></script>-->
 
-  <div id="app"></div>
 
+    <div id="app"></div>
 
     <!-- built files will be auto injected -->
 
     <!-- built files will be auto injected -->
 
   </body>
 
   </body>
 
 </html>
 
 </html>

+ 2 - 2
package.json
Näytä tiedosto 

@@ -14,7 +14,7 @@
 
   },
 
   },
 
   "dependencies": {
 
   "dependencies": {
 
     "axios": "latest",
 
     "axios": "latest",
 
-    "echarts": "^4.9.0",
 
+    "echarts": "^4.2.1",
 
     "element-ui": "^2.11.0",
 
     "element-ui": "^2.11.0",
 
     "font-awesome": "^4.7.0",
 
     "font-awesome": "^4.7.0",
 
     "mockjs": "^1.0.1-beta3",
 
     "mockjs": "^1.0.1-beta3",
 
@@ -22,7 +22,7 @@
 
     "querystring": "^0.2.0",
 
     "querystring": "^0.2.0",
 
     "v-region": "^2.2.2",
 
     "v-region": "^2.2.2",
 
     "vue": "^2.5.2",
 
     "vue": "^2.5.2",
 
-    "vue-router": "^3.0.6",
 
+    "vue-router": "^3.0.1",
 
     "vue-waterfall": "^1.0.6",
 
     "vue-waterfall": "^1.0.6",
 
     "vue-waterfall-easy": "^2.4.4",
 
     "vue-waterfall-easy": "^2.4.4",
 
     "vuex": "^3.1.1",
 
     "vuex": "^3.1.1",

+ 0 - 1
src/components/commons/Header2.0.vue
Näytä tiedosto 

@@ -96,7 +96,6 @@
 
   import Http from '@/js/http.js'
 
   import Http from '@/js/http.js'
 
   import Apis from '@/js/api.js'
 
   import Apis from '@/js/api.js'
 
   import {mapActions} from 'vuex'
 
   import {mapActions} from 'vuex'
 
-  import {notify} from '@/constants/index'
 
 
 
   export default {
 
   export default {
 
     name: "Header2.0",
 
     name: "Header2.0",

+ 0 - 1
src/constants/index.js
Näytä tiedosto 

@@ -1,4 +1,3 @@
 
-
 
 import {Notification} from 'element-ui'
 
 import {Notification} from 'element-ui'
 
 
 
 export const timeChange = (dateString, formdate) => {
 
 export const timeChange = (dateString, formdate) => {

+ 1 - 5
src/main.js
Näytä tiedosto 

@@ -1,6 +1,6 @@
 
 // The Vue build version to load with the `import` command
 
 // The Vue build version to load with the `import` command
 
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 
-// import Vue from 'vue'
 
+import Vue from 'vue'
 
 import App from './App'
 
 import App from './App'
 
 import router from './router'
 
 import router from './router'
 
 import 'font-awesome/css/font-awesome.css'
 
 import 'font-awesome/css/font-awesome.css'
 
@@ -12,10 +12,6 @@ import moment from 'moment'
 
 import vRegion from 'v-region'
 
 import vRegion from 'v-region'
 
 import echarts from "echarts";
 
 import echarts from "echarts";
 
 
 
-
 
-const Vue = require('vue')
 
-
 
-
 
 import {
 
 import {
 
   Avatar,
 
   Avatar,
 
   Alert,
 
   Alert,

+ 1 - 1
src/pages/Statistics/StatisticsReport.vue
Näytä tiedosto 

@@ -1,6 +1,6 @@
 
 <template>
 
 <template>
 
   <div class="statistics-container container">
 
   <div class="statistics-container container">
 
-    <el-card shadow="hover" class="project-statistics-card" v-for="item in agencyList " :key="Object.keys(item)[0]">
 
+    <el-card shadow="hover" class="project-statistics-card" v-for="item in agencyList">
 
       <div class="project-statistics-card-title">{{Object.keys(item)[0]}}</div>
 
       <div class="project-statistics-card-title">{{Object.keys(item)[0]}}</div>
 
       <div class="project-statistics-card-number">{{item[Object.keys(item)[0]]}}</div>
 
       <div class="project-statistics-card-number">{{item[Object.keys(item)[0]]}}</div>
 
     </el-card>
 
     </el-card>

+ 1 - 3
src/router/index.js
Näytä tiedosto 

@@ -1,6 +1,4 @@
 
-// import Vue from 'vue'
 
-const Vue = require('vue')
 
-
 
+import Vue from 'vue'
 
 import Router from 'vue-router'
 
 import Router from 'vue-router'
 
 import Home from '@/components/Home'
 
 import Home from '@/components/Home'
 
 // import Square from '@/components/Square'
 
 // import Square from '@/components/Square'