瀏覽代碼

同步日志

ggooalice 2 年之前
父節點
當前提交
4352522215

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -4,7 +4,7 @@ var path = require('path')
 // var ip = '47.101.180.183'
 // var ip = '47.100.37.243'
 // var ip = '192.168.2.31'
-var ip = '192.168.2.45'
+var ip = '192.168.2.44'
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 // for (var i in ifaces) {

+ 53 - 0
fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -89,7 +89,9 @@
                     <el-form-item>
                         <div style="color:#999;font-size:13px;">{{ $t('gong') }}<span :style="total>user.company.staffCountMax?'color:red;':''">{{total}}</span>{{ $t('other.people') }}
                         <span v-if="depData == null || depData.id == -1">({{ $t('shangxian') }}{{user.company.staffCountMax}}{{$t('other.people')}})</span>
+                        <el-link style="font-size:13px;margin-left:10px" type="primary" :underline="false" @click="recordMsgDialog = true" v-if="recordMsg.result == 1">同步日志</el-link>
                         </div>
+                        
                     </el-form-item>
                     <el-form-item style="float:right;" v-if="permissions.structureCustomConfig">
                         <el-link type="primary" :underline="false" @click="customConfigShow">{{ $t('customConfiguration') }}</el-link>
@@ -697,6 +699,16 @@
             {{syncMembByCardTimeMsg}}
             </p>
         </el-dialog>
+        <el-dialog title="同步日志" v-if="recordMsgDialog" :visible.sync="recordMsgDialog" customClass="customWidth" width="500px">
+            <el-row style="height:70px;line-height:40px;padding-top:30px;padding-left:20px">
+              <el-col :span="6">操作时间</el-col>
+              <el-col :span="18">{{recordIndate(recordMsg.indate)}}</el-col>
+            </el-row>
+            <el-row style="height:70px;line-height:40px;padding-bottom:30px;padding-left:20px">
+              <el-col :span="6">错误信息</el-col>
+              <el-col :span="18">{{recordMsg.msg}}</el-col>
+            </el-row>
+        </el-dialog>
     </div>
   </div>
 </template>
@@ -760,6 +772,8 @@ export default {
   },
   data() {
     return {
+      recordMsgDialog: false,
+      recordMsg: {indate: [],msg:''},
       roleNameFlg: '',
       syncHistoryReport: true,
       ymonth: null,
@@ -990,6 +1004,42 @@ export default {
     that = this;
   },
   methods: {
+    recordIndate(date){
+            let datestr = ''
+            datestr += date[0]
+            datestr += '-'
+            datestr += date[1] < 10 ? '0' + date[1] : date[1]
+            datestr += '-'
+            datestr += date[2] < 10 ? '0' + date[1] : date[2]
+            datestr += '\u3000'
+            datestr += date[3] < 10 ? '0' + date[1] : date[3]
+            datestr += ':'
+            datestr += date[4] < 10 ? '0' + date[1] : date[4]
+            datestr += ':'
+            datestr += date[5] < 10 ? '0' + date[1] : date[5]
+            return datestr
+    },
+    getRecordMsg(){
+      this.http.post('/company/getSyncInfo',{
+      },res => {
+        if(res.code == 'ok'){
+          this.recordMsg = res.data
+          if(this.recordMsg.result == 0){
+            this.recordMsgDialog = true
+          }
+        }else{
+          this.$message({
+            message: res.msg,
+            type: 'error'
+          })
+        }
+      },err => {
+        this.$message({
+          message: err,
+          type: 'error'
+        })
+      })
+    },
     syncMembByCardTime() {
       this.syncMembByCardTimeResultGialog = true;
       this.syncMembByCardTimeMsg = this.$t('synchronizingtheassociation');
@@ -1107,6 +1157,7 @@ export default {
           companyId: this.user.companyId,
         },
         (res) => {
+          this.getRecordMsg()
           if (res.code == "ok") {
             this.contactSecret = res.data.contactSecret;
             this.contactServer = res.data.contactServer;
@@ -1146,6 +1197,7 @@ export default {
           companyId: this.user.companyId,
         },
         (res) => {
+          this.getRecordMsg()
           loading.close();
           if (res.code == "ok") {
             this.$message({
@@ -3252,6 +3304,7 @@ export default {
     this.acquireRole();
     this.getProfessional();
     this.getStaffCountMax();
+    this.getRecordMsg()
     // 获取企业微信的参数
     // if(this.user.companyId == '1081' || this.user.companyId == '7') {
     //   this.agentConfig()