Merge branch 'zxj_dev' of gitlab.33.cn:HF_web/OKR into zxj_dev

package-lock.json

@@ -1290,8 +1290,13 @@
     },
     "@types/parse-json": {
       "version": "4.0.0",
+<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
+=======
+      "resolved": "https://registry.nlark.com/@types/parse-json/download/@types/parse-json-4.0.0.tgz",
+      "integrity": "sha1-L4u0QUNNFjs1+4/9zNcTiSf/uMA=",
+>>>>>>> 48f6b4acfa3de81f6dca141eacf6433300d8a133
       "dev": true
     },
     "@types/q": {
@@ -2445,7 +2450,12 @@
       "version": "4.5.13",
       "resolved": "https://registry.nlark.com/@vue/cli-plugin-vuex/download/@vue/cli-plugin-vuex-4.5.13.tgz",
       "integrity": "sha1-mGRti8HmnPbGpsui/tPqzgNWw2A=",
+<<<<<<< HEAD
       "dev": true
+=======
+      "dev": true,
+      "requires": {}
+>>>>>>> 48f6b4acfa3de81f6dca141eacf6433300d8a133
     },
     "@vue/cli-service": {
       "version": "3.12.1",
@@ -2751,7 +2761,12 @@
       "version": "1.1.2",
       "resolved": "https://registry.nlark.com/@vue/preload-webpack-plugin/download/@vue/preload-webpack-plugin-1.1.2.tgz",
       "integrity": "sha1-zrkktOyzucQ4ccekKaAvhCPmIas=",
+<<<<<<< HEAD
       "dev": true
+=======
+      "dev": true,
+      "requires": {}
+>>>>>>> 48f6b4acfa3de81f6dca141eacf6433300d8a133
     },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
@@ -2966,7 +2981,12 @@
       "version": "5.3.1",
       "resolved": "https://registry.nlark.com/acorn-jsx/download/acorn-jsx-5.3.1.tgz",
       "integrity": "sha1-/IZh4Rt6wVOcR9v+oucrOvNNJns=",
+<<<<<<< HEAD
       "dev": true
+=======
+      "dev": true,
+      "requires": {}
+>>>>>>> 48f6b4acfa3de81f6dca141eacf6433300d8a133
     },
     "acorn-node": {
       "version": "1.8.2",
@@ -3015,13 +3035,23 @@
       "version": "1.0.1",
       "resolved": "https://registry.nlark.com/ajv-errors/download/ajv-errors-1.0.1.tgz",
       "integrity": "sha1-81mGrOuRr63sQQL72FAUlQzvpk0=",
+<<<<<<< HEAD
       "dev": true
+=======
+      "dev": true,
+      "requires": {}
+>>>>>>> 48f6b4acfa3de81f6dca141eacf6433300d8a133
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.nlark.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz",
       "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=",
+<<<<<<< HEAD
       "dev": true
+=======
+      "dev": true,
+      "requires": {}
+>>>>>>> 48f6b4acfa3de81f6dca141eacf6433300d8a133
     },
     "alphanum-sort": {
       "version": "1.0.2",

src/main.ts

@@ -5,7 +5,6 @@ import router from './router'
 import store from './store'
 import "tailwindcss/tailwind.css"
 import './style.less'
-
 Vue.config.productionTip = false
 
 new Vue({