diff --git a/src/assets/js/api/doc.js b/src/assets/js/api/doc.js
index 5a971735..52d5da2c 100644
--- a/src/assets/js/api/doc.js
+++ b/src/assets/js/api/doc.js
@@ -7,4 +7,5 @@ export const addCompanyFileApi = data => post('xmgl/companyFile/add', data); //
 export const editCompanyFileApi = data => post('xmgl/companyFile/edit', data); //编辑企业文件资料信息
 export const deleteCompanyFileApi = data => post('xmgl/companyFile/delete', data); //删除企业文件资料信息
 export const getCompanyFileListApi  = data => post('xmgl/companyFile/list', data); //分页查询企业的文件资料记录
-export const updateFileDownloadNumApi  = data => post('xmgl/companyFile/updateFileDownloadNum', data); //增加文件资料下载次数
\ No newline at end of file
+export const updateFileDownloadNumApi  = data => post('xmgl/companyFile/updateFileDownloadNum', data); //增加文件资料下载次数
+export const updateFileDownloadNameApi  = data => post('xmgl/companyFile/getFile', data); // 更改文件名后同步下载后的文件名
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 1fc6cceb..2cd18345 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -89,7 +89,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
   // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式
     // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
-    axios.defaults.baseURL ='http://192.168.34.221:8188' //郭圣雄本地
+    axios.defaults.baseURL ='http://192.168.34.221:12360/' //郭圣雄本地
     // axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地
     // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
     // axios.defaults.baseURL ='http://61.145.163.135:12345' //坪山沙湖
diff --git a/src/store/index.js b/src/store/index.js
index 73ab3b3d..a6c01999 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -44,8 +44,8 @@ export default new Vuex.Store({
   
   state: {
     PAGESIZRS: [10, 20, 30, 50],
-    UPLOADURL:'http://192.168.34.221:8070/upload/image',// 郭正雄
-    FILEURL:'http://192.168.34.221:8070/image/',//郭正雄
+    UPLOADURL:'http://192.168.34.221:12360/upload/image',// 郭正雄
+    FILEURL:'http://192.168.34.221:12360/image/',//郭正雄
     // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
     // FILEURL:'http://10.0.1.43:6023/image/',//测试
     BASEURL: baseUrl
@@ -98,8 +98,8 @@ export default new Vuex.Store({
     // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地
     // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
     // 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://42.194.144.62:8088/upload/image',//中建四
+    // FILEURL: 'http://42.194.144.62:8088/image/',//中建四   
     // UPLOADURL: 'http://182.90.224.147:15551/upload/image',//四川成润(内部线上)
     // FILEURL: 'http://182.90.224.147:15551/image/',//四川成润（内部线上）
     // UPLOADURL: 'http://118.121.198.147:23232/upload/image',//四川成润（正式）
diff --git a/src/views/companyAdmin/docManage.vue b/src/views/companyAdmin/docManage.vue
index 1fd896c0..4a8cd126 100644
--- a/src/views/companyAdmin/docManage.vue
+++ b/src/views/companyAdmin/docManage.vue
@@ -232,7 +232,8 @@ import {
   addCompanyFileApi,
   deleteCompanyFileApi,
   editCompanyFileApi,
-  updateFileDownloadNumApi
+  updateFileDownloadNumApi,
+  updateFileDownloadNameApi
 } from '@/assets/js/api/doc.js'
 
 export default {
@@ -351,7 +352,10 @@ export default {
     saveFn() {
       this.$refs['editForm'].validate((valid) => {
         if (valid) {
+          console.log(this.editForm)
           editCompanyFileApi(this.editForm).then((res) => {
+            updateFileDownloadNameApi({ fileUrl: this.$store.state.FILEURL + this.editForm.filePath,fileName: this.editForm.fileName}).then((res) => {
+            })
             this.editDialog = false
             this.getListData()
             this.$message.success(
@@ -384,7 +388,8 @@ export default {
     //下载文件
     downFn(item) {
       // console.log('http://182.90.224.147:30262/image/'+item.id);
-      window.location.href = this.$store.state.FILEURL+item.id;
+      console.log(this.$store.state.FILEURL+item.id,'下载')
+      // window.location.href = this.$store.state.FILEURL+item.id;
       // if (item) {
       //   let arr = []
       //   arr = JSON.parse(item)
@@ -401,6 +406,7 @@ export default {
         // a.click();
         // this.$message.succe(res.message);
         this.downloadUrl = this.$store.state.FILEURL + item.id
+        this.getListData()
 
       })
     },
diff --git a/src/views/companyAdmin/material/materialContract.vue b/src/views/companyAdmin/material/materialContract.vue
index 0c04be2f..51943a8f 100644
--- a/src/views/companyAdmin/material/materialContract.vue
+++ b/src/views/companyAdmin/material/materialContract.vue
@@ -221,6 +221,8 @@
               <el-input
                 v-model="contractForm.contractAmount"
                 :placeholder="$t('message.companyDiagram.PleaseEnter')"
+                type="number"
+                oninput="if(value.length>11)value=value.slice(0,11)"
               ></el-input>
             </el-form-item>
             <el-form-item :label="'合同形式'" prop="contractForm">
@@ -239,6 +241,7 @@
               <el-input
                 v-model="contractForm.contractNumber"
                 :placeholder="$t('message.companyDiagram.PleaseEnter')"
+                onkeyup="value=value.replace(/[^\x00-\xff]/g, '')"
               ></el-input>
             </el-form-item>
             <el-form-item :label="'合同状态'" prop="contractState">
@@ -884,36 +887,43 @@
             <el-input
               v-model="additionalCostForm.costNum"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
+              type="number"
             ></el-input>
           </el-form-item>
           <el-form-item :label="'含税金额(万元)'" prop="taxAmount">
             <el-input
               v-model="additionalCostForm.taxAmount"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
+              type="number"
             ></el-input>
           </el-form-item>
           <el-form-item :label="'税率(%)'" prop="taxRate">
             <el-input
               v-model="additionalCostForm.taxRate"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
+              type="number"
+              oninput="if(value > 100) value = 100; if(value < 0 || value == '' || value == null) value = ''; if(value.length>3)value=value.slice(0,3);"
             ></el-input>
           </el-form-item>
           <el-form-item :label="'含税单价(元)'" prop="taxUnitPrice">
             <el-input
               v-model="additionalCostForm.taxUnitPrice"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
+              type="number"
             ></el-input>
           </el-form-item>
           <el-form-item :label="'无税金额(万元)'" prop="taxlessAmount">
             <el-input
               v-model="additionalCostForm.taxlessAmount"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
+              type="number"
             ></el-input>
           </el-form-item>
           <el-form-item :label="'无税单价(元)'" prop="taxlessUnitPrice">
             <el-input
               v-model="additionalCostForm.taxlessUnitPrice"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
+              type="number"
             ></el-input>
           </el-form-item>
           <!-- <el-form-item :label="'状态'" prop="state">
diff --git a/src/views/companyAdmin/qualityAndSafety/hiddenDangerLibrary.vue b/src/views/companyAdmin/qualityAndSafety/hiddenDangerLibrary.vue
index aac120c4..ba4a477b 100644
--- a/src/views/companyAdmin/qualityAndSafety/hiddenDangerLibrary.vue
+++ b/src/views/companyAdmin/qualityAndSafety/hiddenDangerLibrary.vue
@@ -18,15 +18,15 @@
         </div>
         <vue-scroll class="treeList">
           <div style="padding-top: 10px">
-            <ul v-for="(name, index) in dataList" :key="index">
-              <li :class="{ active: index == current && currentTwo == -1 }">
+            <ul v-for="(name, indexs) in dataList" :key="indexs">
+              <li :class="{ active: indexs == current && currentTwo == -1 }">
                 <div
                   class="clickName"
-                  @click="next(index, $event, name, 1)"
+                  @click="next(indexs, $event, name, 1)"
                   style="display: inline-block"
                 >
                   <div class="imgbox">
-                    <i v-if="current != index" class="el-icon-caret-right"></i>
+                    <i v-if="current != indexs" class="el-icon-caret-right"></i>
                     <i v-else class="el-icon-caret-bottom"></i>
                   </div>
                   <el-popover
@@ -93,7 +93,7 @@
               <ul
                 v-for="(item, i) in name.children"
                 id="child"
-                v-if="current == index"
+                v-if="current == indexs"
                 :key="i"
               >
                 <!-- <li :class="{actives:index==current&&i==threeIndex}"> -->
@@ -447,6 +447,7 @@ export default {
       dialogVisible2: false,
       dialogVisible3: false,
       current: -1,
+      currentIndex: 0,
       dataList: [],
       threeData: [],
       //   editId: "",
@@ -692,7 +693,23 @@ export default {
       this.loadRigthtList();
     },
     next(index, $event, data, type) {
+      
+      if(index == this.current) {
+        console.log('收起')
+        this.current = -1
+      }else {
+        console.log('展开')
+        this.current = index;
+      }
       console.log("data", data);
+      console.log("$event", $event);
+      console.log("index", index);
+      console.log("type", type);
+      console.log("this.current", this.current);
+      
+      
+
+
       this.currentTwo = -1;
       // 
       if (this.current != index) {
@@ -708,7 +725,6 @@ export default {
       //     this.current = index;
       //   }
       // console.log(this.parentid1)
-      this.current = index;
       this.loadRigthtList();
     },
     loadList() {
diff --git a/src/views/companyAdmin/systemSetup/enterpriseInfo.vue b/src/views/companyAdmin/systemSetup/enterpriseInfo.vue
index d4959091..b8a062ec 100644
--- a/src/views/companyAdmin/systemSetup/enterpriseInfo.vue
+++ b/src/views/companyAdmin/systemSetup/enterpriseInfo.vue
@@ -310,7 +310,7 @@ export default {
               this.$message.success(
                 this.$t('message.companyDiagram.editSuccess')
               ) //编辑成功！
-              this.getDetail()
+              this.loginOut()
             }
           })
         } else {
@@ -319,6 +319,47 @@ export default {
         }
       })
     },
+    loginOut() {
+      this.$store.commit('setUserInfo', null)
+      this.$store.commit('setMapBackArr', [])
+      this.$store.commit('setMoudle', null)
+      this.$store.commit('setProDetail', null)
+      window.localStorage.removeItem('isIframe')
+      window.localStorage.removeItem('soundList')
+      let json = {
+        name: '工作站',
+        id: 1,
+        url: '/projectV2/taskList',
+        menuList: [
+          {
+            id: 100000,
+            menuName: '任务清单',
+            path: '/projectV2/taskList'
+          },
+          {
+            id: 100001,
+            menuName: '通知公告',
+            path: '/projectV2/noticeList'
+          },
+          {
+            id: 100002,
+            menuName: '工作日程',
+            path: '/projectV2/workerSchedule'
+          }
+        ]
+      }
+      this.$store.commit('setCurModule', json)
+      // sessionStorage.clear();
+      // this.$router.push('/login')
+      if (COMPANY == 'nanchang' || COMPANY == '') {
+        window.open('/index.html#/login', '_self')
+      } else {
+        window.open('/#/login', '_self')
+      }
+      // this.$router.push('/')
+      window._paq.push(['trackEvent', '点击', '退出登录', '退出登录'])
+    },
+
     handleAvatarSuccess(res, file) {
       this.upload_btn1 = true;
       this.form.loginLogo = this.$store.state.FILEURL + res.data[0].imageUrl
diff --git a/src/views/projectFront/dangerousBigProject/checkTable.vue b/src/views/projectFront/dangerousBigProject/checkTable.vue
index 4beb67d7..dd5093cc 100644
--- a/src/views/projectFront/dangerousBigProject/checkTable.vue
+++ b/src/views/projectFront/dangerousBigProject/checkTable.vue
@@ -958,6 +958,9 @@ export default {
       // 
       if (this.current != index) {
         this.threeIndex = -1;
+        this.current = index;
+      }else {
+        this.current = -1
       }
 
       this.threeData = [];
@@ -969,7 +972,7 @@ export default {
       //     this.current = index;
       //   }
       // console.log(this.parentid1)
-      this.current = index;
+      
       this.leftId = data.id;
       this.loadRigthtList();
     },
diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index c374cfa8..8ab80e1f 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -2028,7 +2028,7 @@ export default {
     exportM() {
       window.location.href =
         this.$http.defaults.baseURL +
-        '/xmgl/download/exporExcelWorkerTemplate?projectSn=' +
+        'xmgl/download/exporExcelWorkerTemplate?projectSn=' +
         this.projectSn
     },
     // 下发通行设备
diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue
index 19f340a8..336403e2 100644
--- a/src/views/projectFront/laborManage/personModule/laborComponent.vue
+++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue
@@ -2301,7 +2301,7 @@ export default {
     exportM() {
       window.location.href =
         this.$http.defaults.baseURL +
-        '/xmgl/download/exporExcelWorkerTemplate?projectSn=' +
+        'xmgl/download/exporExcelWorkerTemplate?projectSn=' +
         this.projectSn
     },
     // 下发通行设备
diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue
index 9dd2b0d5..10c71c37 100644
--- a/src/views/projectFront/projectSummary/cooperationUnit.vue
+++ b/src/views/projectFront/projectSummary/cooperationUnit.vue
@@ -304,6 +304,7 @@
                   <el-input
                     v-model="enterpriseForm.bankname"
                     :placeholder="$t('message.laborMange.placeholder2')"
+                    type="number"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -343,6 +344,7 @@
                   <el-input
                     v-model="enterpriseForm.bankcardnumber"
                     :placeholder="$t('message.laborMange.placeholder2')"
+                    type="number"
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -369,6 +371,7 @@
                   <el-input
                     v-model="enterpriseForm.businessNumber"
                     :placeholder="$t('message.laborMange.placeholder2')"
+                    oninput ="value=value.replace(/^[a-zA-Z0-9]{10,20}$/)"
                   ></el-input>
                 </el-form-item>
               </el-col>
diff --git a/src/views/projectFront/scheduleManage/projectNodeManage2.vue b/src/views/projectFront/scheduleManage/projectNodeManage2.vue
index bfda9aaa..c69fbb89 100644
--- a/src/views/projectFront/scheduleManage/projectNodeManage2.vue
+++ b/src/views/projectFront/scheduleManage/projectNodeManage2.vue
@@ -440,6 +440,7 @@ export default {
     this.createUserId = this.$store.state.userInfo.userId
     this.uploadUrl = this.$store.state.UPLOADURL
     this.fileUrl = this.$store.state.FILEURL
+    this.downUrl = this.$http.defaults.baseURL + 'xmgl/progressTask/downloadTemplate'
     this.getProgressListData()
   },
   methods: {
@@ -452,8 +453,8 @@ export default {
     },
     // 下载模板
     downloadFn() {
-      this.downUrl = this.$store.state.BASEURL + '/api/xmgl/progressTask/downloadTemplate'
-      // window.location.href=this.downUrl
+      this.downUrl = this.$http.defaults.baseURL + 'xmgl/progressTask/downloadTemplate'
+      // window.open(this.downUrl)
     },
     // 导入成功
     handleImportSuccess(res) {