fix: BUG修改

src/assets/js/http.js

@@ -84,7 +84,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+  axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
@@ -93,7 +93,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
   // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
-  axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址
+  // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
 
 

src/store/index.js

@@ -48,23 +48,24 @@ export default new Vuex.Store({
     PAGESIZRS: [10, 20, 30, 50],
     // UPLOADURL:' http://101.43.164.214:11111/upload/image/',//  百色
     // FILEURL:' http://101.43.164.214:11111/image/',// 百色
-    // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
+    UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
-    // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
+    FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
-    // WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
+    WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
     // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
     // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
 
-    BASEURL: baseUrl
+    // BASEURL: baseUrl
-      ? baseUrl
+    //   ? baseUrl
-      : window.location.protocol + "//" + window.location.host + "/", //正式环境
+    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    UPLOADURL:
+    // UPLOADURL:
-      window.location.protocol +
+    //   window.location.protocol +
-      "//" +
+    //   "//" +
-      window.location.host +
+    //   window.location.host +
-      "/upload/image", //正式环境
+    //   "/upload/image", //正式环境
-    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
     // WORKFLOWURL: 'http://182.90.224.237:9811/#/workspace/forms',//测试平台工作流地址
-    WORKFLOWURL: 'http://182.90.224.237:9814/#/workspace/forms',//鞍钢平台工作流地址
+    // WORKFLOWURL: 'http://182.90.224.237:9814/#/workspace/forms',//鞍钢平台工作流地址
+    // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址
     //---------------------------------------------------------------------------------------------
     // BASEURL: baseUrl
     //   ? baseUrl

src/views/companyAdmin/operationLog.vue

@@ -43,7 +43,7 @@
       </el-form>
     </div>
     <div class="table_wrap whiteBlock">
-      <el-table class="tables" :data="tableData">
+      <el-table class="tables" style="height: calc(100% - 80px);" :data="tableData">
         <el-table-column
           type="index"
           width="50"
@@ -92,6 +92,7 @@
         ></el-table-column>
       </el-table>
       <el-pagination
+        style="margin-top: 40px;"
         class="pagerBox"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"

src/views/projectFront/configManage/groupStructureManagement.vue

@@ -100,6 +100,7 @@
           </el-table-column>
         </el-table>
       <el-pagination
+          style="margin-top: 40px;"
           class="pagerBox"
           @size-change="SizeChange"
           @current-change="CurrentChange"

src/views/projectFront/configManage/personnelAccess.vue

@@ -56,12 +56,16 @@
       </el-form>
     </div>
     <div class="table_wrap whiteBlock">
-      <vue-scroll style="height: 70%">
+      <!-- <vue-scroll style="height: calc(100% - 20px)"> -->
-        <el-table class="tables" :data="List">
+        <el-table class="tables" style="height: calc(100% - 20px); max-height: calc(100% - 20px);" :data="List">
           <el-table-column
             prop="account"
             :label="$t('message.personnelAccess.Labid')"
           ></el-table-column>
+          <el-table-column
+            prop="account"
+            label="组织名称"
+          ></el-table-column>
           <el-table-column
             prop="workerName"
             :label="$t('message.personnelAccess.Labname')"
@@ -127,7 +131,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </vue-scroll>
+      <!-- </vue-scroll> -->
       <!-- <el-pagination
         class="pagerBox"
         @size-change="SizeChange"

src/views/projectFront/configManage/roleManage.vue

@@ -36,8 +36,8 @@
       </el-form>
     </div>
     <div class="table_wrap whiteBlock">
-      <vue-scroll style="height: 70%">
+      <!-- <vue-scroll style="height: calc(100% - 20px)"> -->
-        <el-table class="tables" :data="List">
+        <el-table class="tables" style="height: calc(100% - 20px);max-height: calc(100% - 20px);" :data="List">
           <!--align="center"-->
           <el-table-column prop="roleName" :label="$t('message.roleManage.juese')" align="center"></el-table-column>
           <!-- 是否能进入设备中台 -->
@@ -67,7 +67,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </vue-scroll>
+      <!-- </vue-scroll> -->
       <!-- <el-pagination
         class="pagerBox"
         @size-change="SizeChange"