From a345267885499d34c81bf9b55cc12cf36c669fdd Mon Sep 17 00:00:00 2001
From: jxj_yjl <1490736767@qq.com>
Date: Wed, 17 May 2023 15:58:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=B6=A6=E9=A1=B9=E7=9B=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                            |  4 ++--
 src/store/index.js                               | 16 ++++++++--------
 src/views/companyAdmin/companyDiagram.vue        | 16 ++++++++++++++++
 .../electricityManage/alarmValueSet.vue          |  1 +
 .../projectSummary/cooperationUnit.vue           |  7 +++++++
 5 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index d68caa7c..384ff3e6 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -86,8 +86,8 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
   // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
   // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
-  // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
-  axios.defaults.baseURL = 'http://182.90.224.147:30262/'//港投(成润)项目线上(2)
+  axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
+  // axios.defaults.baseURL = 'http://182.90.224.147:30262/'//港投(成润)项目线上(2)
     // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
 
 
diff --git a/src/store/index.js b/src/store/index.js
index bc25e386..fdbdd31c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -48,12 +48,12 @@ export default new Vuex.Store({
     BASEURL: baseUrl
       ? baseUrl
       : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    UPLOADURL:
-      window.location.protocol +
-      "//" +
-      window.location.host +
-      "/upload/image", //正式环境
-    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    // UPLOADURL:
+    //   window.location.protocol +
+    //   "//" +
+    //   window.location.host +
+    //   "/upload/image", //正式环境
+    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
     //---------------------------------------------------------------------------------------------
     // BASEURL: baseUrl
     //   ? baseUrl
@@ -95,8 +95,8 @@ export default new Vuex.Store({
     // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
     // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
     // FILEURL: 'http://42.194.144.62:8088/image/',//中建四   
-    // UPLOADURL: 'http://182.90.224.147:30262/upload/image',//四川成润
-    // FILEURL: 'http://182.90.224.147:30262/image/',//四川成润
+    UPLOADURL: 'http://182.90.224.147:15551/upload/image',//四川成润
+    FILEURL: 'http://182.90.224.147:15551/image/',//四川成润
 
     ACCOUNTTYPE: [
       "系统管理员",
diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue
index 78049ba7..1439c429 100644
--- a/src/views/companyAdmin/companyDiagram.vue
+++ b/src/views/companyAdmin/companyDiagram.vue
@@ -337,6 +337,7 @@
       :visible.sync="addAccountDialog"
       :modal-append-to-body="false"
       width="667px"
+      @close="close"
     >
       <div class="dialog_content">
         <el-form
@@ -1774,6 +1775,20 @@ export default {
     this.loadProvincesCityList()
   },
   methods: {
+    close(){
+      this.addAccountForm={
+        account: '',
+        accountType: 3, //1系统管理员，2企业总部管理员账号,3区域账号，4城市账号，5项目账号
+        department: '',
+        password: '',
+        realName: '',
+        sn: '',
+        userTel: '',
+        jobId: '',
+        externalAccount: ''
+      }
+      this.addCompanyDialog=false
+    },
     leftChangeState(item) {
       console.log(item)
       console.log(this.selectValue)
@@ -2654,6 +2669,7 @@ export default {
       this.addAccountDialog = true
       this.$nextTick(() => {
         this.$refs['addAccountForm'].clearValidate()
+        // this.addAccountForm={}
       })
     },
     //显示编辑账号弹框
diff --git a/src/views/projectFront/electricityManage/alarmValueSet.vue b/src/views/projectFront/electricityManage/alarmValueSet.vue
index 288adc9c..1a0f890b 100644
--- a/src/views/projectFront/electricityManage/alarmValueSet.vue
+++ b/src/views/projectFront/electricityManage/alarmValueSet.vue
@@ -149,6 +149,7 @@
       :title="$t('message.alarmValueSet.Popup_title')[Popup.type]"
       :visible.sync="Popup.show"
       width="667px"
+      :modal-append-to-body="false"
     >
       <div class="dialog_content">
         <el-form
diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue
index 1a8619d5..03125958 100644
--- a/src/views/projectFront/projectSummary/cooperationUnit.vue
+++ b/src/views/projectFront/projectSummary/cooperationUnit.vue
@@ -197,6 +197,7 @@
       :close-on-click-modal="false"
       :visible.sync="addEnterpriseDialog"
       width="750px"
+      @close="close"
     >
       <vue-scroll class="adddialog" style="height: 618px">
         <div class="dialog_content" ref="enterpriseDialog">
@@ -747,6 +748,12 @@ export default {
     this.getParentEnterpriseList();
   },
   methods: {
+    close(){
+      this.addEnterpriseDialog=false
+      this.$nextTick(() => {
+        this.$refs['enterpriseForm'].clearValidate()
+      })
+    },
     //获取 单位类型
     getEnterpriseType() {
       let data = {};