oa问题修复

src/config.js

@@ -9,6 +9,7 @@ export default {
   //#endif
 
   //#ifdef H5
+  // baseUrl: "https://gateWay.usky.cn/prod-api",
   baseUrl: import.meta.env.MODE === "production" ? `https://${window.location.host}/prod-api` : `http://192.168.10.165:801/dev-api`,
   //#endif
 

src/pages/business/common/projectMange/list/index.vue

@@ -100,7 +100,7 @@
               }}</span>
             </view>
             <view class="content-area-row_wrap-view" style="display: block">
-              成员：<span>{{ proxy.$common.mapping("nickName", "userId", base.projectMember, userDate) }} </span>
+              成员：<span >{{ proxy.$common.mapping("nickName", "userId", base.projectMember, userDate) }} </span>
             </view>
           </view>
         </view>

src/pages/business/common/projectMange/record/index.vue

@@ -146,6 +146,20 @@
         }"
         @click="handleModal('delete', `确认删除“ ${eventList.createBy} ” 的“ ${eventList.reportDate} ” 的日报？`)"
       ></u-button>
+      <u-button
+        class="custom-style"
+        type="info"
+        size="normal"
+        :text="`查看${eventList.createBy}的所有日报`"
+        :customStyle="{
+          height: '50px',
+          color: '#3c9cff',
+          borderWidth: 0,
+          borderRadius: 0,
+          borderBottomWidth: '1px',
+        }"
+        @click="handleSubmit('update', eventList)"
+      ></u-button>
       <u-button
         class="custom-style"
         type="info"

src/pages/business/fireIot/repairManage/repairDetails.vue

@@ -28,7 +28,7 @@
       <view class="bg-white p15 mb15">
         <uni-section class="block mb10" title="基本信息" type="line"></uni-section>
 
-        <view class="tableType3 p0">
+        <view class="tableType1-1 p0">
           <u-row v-for="da in dataList" :key="da">
             <u-col span="4">
               <view style="text-align: right; padding: 0px 5px 0px 5px">{{ da.title }}</view>

src/pages/business/oa/approval/index.vue

@@ -165,11 +165,11 @@
    */
   function toForm(formSign){
     console.log(formSign)
-    if(formSign == "QJD" || formSign == "JBD" || formSign == "SXSQ"){
+    // if(formSign == "QJD" || formSign == "JBD" || formSign == "SXSQ"){
       uni.navigateTo({
         url: `/pages/business/oa/approval/formType?formSign=${formSign}`
       })
-    }
+    // }
   }
   function navItemClick(index){
     uni.navigateTo({

src/pages/login.vue

@@ -180,7 +180,7 @@ function init() {
   useStore.GetWxOpenId(1); //调用获取微信公众号openId
 
   if (window.location.host) {
-    linkUrl.value = window.location.host;
+    // linkUrl.value = window.location.host;
     // linkUrl.value = "192.168.10.165:13200";
     // linkUrl.value = "localhost:81";
     // linkUrl.value = "120.26.164.249:13212";

src/pages/mine.vue

@@ -77,6 +77,12 @@
                 <view>检查更新</view>
               </view>
             </view>
+            <view class="list-cell list-cell-arrow" @click="proxy.$tab.navigateTo(`/pages/mine/secure/loginLog/index`)">
+              <view class="menu-item">
+                <view class="iconfont oaIcon-rizhi menu-item-icon"></view>
+                <view class="title">登录日志</view>
+              </view>
+            </view>
             <!-- <view class="list-cell list-cell-arrow" @click="proxy.$settingStore.handleSetting()">
               <view class="menu-item">
                 <view class="iconfont oaIcon-shezhi menu-item-icon"></view>

src/pages/mine/secure/index.vue

@@ -51,11 +51,6 @@
       </view>
 
       <view class="menu-list mt0 mlr0">
-        <view class="list-cell list-cell-arrow" @click="proxy.$tab.navigateTo(`/pages/mine/secure/loginLog/index`)">
-          <view class="menu-item">
-            <view class="title">登录日志</view>
-          </view>
-        </view>
         <view class="list-cell list-cell-arrow" @click="proxy.$modal.showToast('模块建设中~')" v-if="proxy.$common.isVisible()">
           <view class="menu-item">
             <view class="title">常用设备管理</view>

src/static/scss/public.scss

@@ -148,6 +148,31 @@ uni-input {
     }
   }
 }
+.tableType1-1 {
+
+  .u-row {
+    align-items: initial !important;
+    line-height: 28px;
+    border: 1px #e5e5e5 solid;
+    border-bottom: 0px;
+
+    >.u-col {
+      border-right: 1px #e5e5e5 solid;
+      white-space: normal;
+      word-break: break-all;
+    }
+
+    >.u-col:last-child {
+      border-right: 0px #e5e5e5 solid;
+    }
+  }
+
+  .u-row:last-child {
+    .u-col {
+      border-bottom: 1px #e5e5e5 solid;
+    }
+  }
+}
 
 //自写table表格样式-横向
 .tableType2 {
@@ -212,6 +237,7 @@ uni-input {
     }
   }
 }
+
 .tableType4 {
   .u-row {
     align-items: initial !important;