lilinfeng 2 months ago
parent
commit
d91484b8eb

+ 11 - 3
.env.production

@@ -1,9 +1,17 @@
 # 生产默认配置
 ENV = 'production'
 
-VUE_APP_BASE_API = 'http://192.168.103.104:58080' #测试地址
 
-# VUE_APP_BASE_API = 'http://28.168.123.222:58080' #双活地址
+ #测试地址
+# VUE_APP_BASE_API = 'http://192.168.103.104:58080'
+VUE_APP_BASE_API = 'https://test.api.shidaiyun.net'
 
-# VUE_APP_BASE_API =  "https://api.shidaiyun.net" #正式地址
 
+
+
+#双活地址
+# VUE_APP_BASE_API = 'http://28.168.123.222:58080' 
+
+
+#正式地址
+# VUE_APP_BASE_API =  "https://api.shidaiyun.net" 

+ 1 - 1
package.json

@@ -133,4 +133,4 @@
     "> 1%",
     "last 2 versions"
   ]
-}
+}

+ 2 - 2
src/main.js

@@ -24,8 +24,8 @@ import * as filters from './filters' // global filters
 
 
 //引入echarts
-// import * as echarts from 'echarts'
-// Vue.prototype.$echarts = echarts
+import * as echarts from 'echarts'
+Vue.prototype.$echarts = echarts
 
 
 // 自定义按钮权限指令

+ 0 - 1
src/store/modules/user.js

@@ -120,7 +120,6 @@ const actions = {
             resolve(data)
           })
         } else {
-          clg(response)
           reject(response)
         }
 

+ 10 - 3
src/utils/apiUrl.js

@@ -5,7 +5,14 @@ module.exports = {
   // APIURl: "http://192.168.103.104:58080",
   APIURl: "https://test.api.shidaiyun.net",
   // APIURl: "https://api.shidaiyun.net",
-  minioPath: process.env.NODE_ENV === 'development' ? 'https://oss.shidaiyun.net/' : 'http://192.168.103.105:18000/'
-  // minioPath: process.env.NODE_ENV === 'development' ? 'https://oss.shidaiyun.net/' : 'http://28.168.105.206:9000/' //双活
-  // minioPath: 'https://oss.shidaiyun.net/'
+
+
+  //测试
+  // minioPath: process.env.NODE_ENV === 'development' ? 'https://oss.shidaiyun.net/' : 'http://192.168.103.105:18000/'
+
+  //双活
+  // minioPath: process.env.NODE_ENV === 'development' ? 'https://oss.shidaiyun.net/' : 'http://28.168.105.206:9000/'
+
+  //正式
+  minioPath: 'https://oss.shidaiyun.net/'
 };

+ 1 - 1
src/views/governmentCloud/questionnaireInvestigation/Statistics.vue

@@ -320,7 +320,7 @@ export default {
         openChart(questionnaire) {
             this.dialogChartVisible = true
             this.$nextTick(() => {
-                // this.basic_dashboard_type(questionnaire)
+                this.basic_dashboard_type(questionnaire)
             })
         }
     },

+ 2 - 2
src/views/login/index.vue

@@ -161,13 +161,13 @@ export default {
                     console.log(query)
 
                     this.$store.dispatch('user/login', query).then(res => {
-                        // this.$message.success('登录成功,正在跳转')
+                        this.$message.success('登录成功,正在跳转')
                         this.$router.push({
                             path: this.redirect || '/home',
                             query: this.otherQuery
                         })
                     }).catch((res) => {
-                        // this.$message.error(res.msg)
+                        this.$message.error(res.msg)
                         if (this.needCode) {
                             this.changeImg()
                             this.loginForm.code = ''