Merge branch 'master' of http://git.in.ahbd.net/aielab/jcxt_qd

package-lock.json

@@ -12640,26 +12640,19 @@
     },
     "zrender": {
       "version": "5.2.1",
-<<<<<<< HEAD
+
       "resolved": "https://registry.nlark.com/zrender/download/zrender-5.2.1.tgz",
       "integrity": "sha1-X0u9qRW6bUErCxncJDG+qtBUF7s=",
-=======
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.2.1.tgz",
-      "integrity": "sha512-M3bPGZuyLTNBC6LiNKXJwSCtglMp8XUEqEBG+2MdICDI3d1s500Y4P0CzldQGsqpRVB7fkvf3BKQQRxsEaTlsw==",
->>>>>>> c7dc14ce9f3f586919151161dab15674576e12a0
+
       "requires": {
         "tslib": "2.3.0"
       },
       "dependencies": {
         "tslib": {
           "version": "2.3.0",
-<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/tslib/download/tslib-2.3.0.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.3.0.tgz",
           "integrity": "sha1-gDuM2rPhK6WBpMpByIObuw2ssJ4="
-=======
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
->>>>>>> c7dc14ce9f3f586919151161dab15674576e12a0
+
         }
       }
     }

src/main.js

@@ -6,10 +6,6 @@ import router from './router'
 import './plugins/element.js'
 // 导入全局样式表
 import './assets/css/global.css'
-// 导入echarts
-// import echarts from 'echarts'
-// Vue.prototype.$echarts = echarts
-// // 导入axios数据交互请求
 import axios from 'axios'
 //导入echart
 import * as echarts from 'echarts';