Merge remote-tracking branch 'origin/master'

k94314517

2024-06-11 4925a060c636417792a64f07c1b800e409cbd0cd

Merge remote-tracking branch 'origin/master'

 admin/package-lock.json

@@ -13952,6 +13952,14 @@
      "integrity": "sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=",
      "dev": true
    },
    "vue-json-viewer": {
      "version": "2.2.22",
      "resolved": "https://registry.npmmirror.com/vue-json-viewer/-/vue-json-viewer-2.2.22.tgz",
      "integrity": "sha512-3oPH5BxoUWva/qp7wNJj+15FBXyi9Yu5VDW4mCWivjHR1pUpMv34fjqqxML7jh2uOqm1S/3Xks5nQ5JjC5+OWw==",
      "requires": {
        "clipboard": "^2.0.4"
      }
    },
    "vue-loader": {
      "version": "15.9.7",
      "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-15.9.7.tgz",

 admin/package.json

@@ -26,6 +26,7 @@
    "qrcodejs2": "0.0.2",
    "vue": "^2.6.11",
    "vue-clipboard2": "^0.3.1",
    "vue-json-viewer": "^2.2.22",
    "vue-router": "^3.5.1",
    "vuescroll": "^4.17.3",
    "vuex": "^3.4.0"

 admin/src/api/business/platformInterfaceLog.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
import request from '../../utils/request'

// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/visitsAdmin/cloudService/business/platformInterfaceLog/page', data, {
    trim: true
  })
}

// åˆ›å»º
export function create (data) {
  return request.post('/visitsAdmin/cloudService/business/platformInterfaceLog/create', data)
}

// ä¿®æ”¹
export function updateById (data) {
  return request.post('/visitsAdmin/cloudService/business/platformInterfaceLog/updateById', data)
}

 admin/src/components/business/OperaInterfaceLogWindow.vue

@@ -1,49 +1,102 @@
<template>
    <GlobalWindow
    <el-dialog
        :title="title"
        width="60%"
        :withFooter="false"
        :visible.sync="visible"
        :confirm-working="isWorking"
        append-to-body
        @confirm="confirm"
    >
        <div class="box">
            {{form.content}}
        </div>
    </GlobalWindow>
      <div class="codeEditBox">
        <json-viewer
            :value="form.formatContent"
            :expand-depth="5"
            copyable
            boxed
            :expanded="false"
            @copied="copyText"
            sort
            :show-array-index="false"
            class="w-100%">
          <template slot="copy">
            <i class="el-icon-document-copy" title="复制">复制代码</i>
          </template>
        </json-viewer>
      </div>
    </el-dialog>
</template>

<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  export default {
    name: 'OperaInterfaceLogWindow',
    extends: BaseOpera,
    components: { GlobalWindow },
    data () {
      return {
        // è¡¨å•æ•°æ®
        form: {
          content: ''
        },
        // éªŒè¯è§„则
        rules: {
        }
      }
import BaseOpera from '@/components/base/BaseOpera'
import JsonViewer from 'vue-json-viewer'

export default {
  name: 'OperaInterfaceLogWindow',
  extends: BaseOpera,
  components: { JsonViewer },
  data () {
    return {
      // è¡¨å•æ•°æ®
      form: {
        content: '',
        formatContent: {}
      },
      // éªŒè¯è§„则
      rules: {
      },
      copyable: { copyText: 'copy', copiedText: 'copied' }
    }
  },
  created () {
    this.config({
      api: '/business/interfaceLog',
      'field.id': 'id'
    })
  },
  methods: {
    copyText (val) {
      this.$message.success('内容已成功复制到剪切板！')
    },
    created () {
      this.config({
        api: '/business/interfaceLog',
        'field.id': 'id'
    open (title, target) {
      this.title = title
      this.visible = true
      // æ–°å»º
      if (target == null) {
        this.$nextTick(() => {
          this.$refs.form.resetFields()
          this.form[this.configData['field.id']] = null
        })
        return
      }
      // ç¼–辑
      this.$nextTick(() => {
        for (const key in this.form) {
          this.form[key] = target[key]
        }
        try {
          this.form.formatContent = JSON.parse(this.form.content)
        } catch (e) {
          this.form.formatContent = this.form.content
        }
      })
    }
  }
}
</script>

<style lang="scss" scoped>
    .box {
        width: 100%;
        font-size: 15px;
        color: #222222;
        word-wrap: break-word;
    .codeEditBox {
      width: 100%;
      height: 90%;
      overflow:auto;
      display: block;
      border: 1px solid #dcdee2;
      overflow-y: auto;
    }
    ::v-deep .el-dialog__body{height:70vh;overflow-y: auto}
    ::v-deep .el-dialog{height:78vh;overflow: hidden}
    .jv-container {
      //height: 60vh;
    }
</style>

 admin/src/components/common/Menu.vue

@@ -61,7 +61,7 @@
        return
      }
      // ç‚¹å‡»å½“前菜单不做处理
      if (menuConfig.url === this.$route.path && menuConfig.params === this.$route.query.param) {
      if (menuConfig.url === this.$route.path && (menuConfig.params ==null || menuConfig.params==undefined || menuConfig.params=='' ||  menuConfig.params === this.$route.query.param)) {
        return
      }
      if (menuConfig.url == null || menuConfig.url.trim().length === 0) {

 admin/src/views/business/approvalConfiguration.vue

@@ -32,13 +32,13 @@
                <div class="content">
                  <div v-if="item.objIds && item.objIds.length === 1 ">
                    <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
                    <span v-if="item.approveType == 0"> æˆ–ç­¾</span>
                    <span v-if="item.approveType == 1"> ä¼šç­¾</span>
                    <span v-if="item.approveType == 0 && item.type == '0'"> æˆ–ç­¾</span>
                    <span v-if="item.approveType == 1 && item.type == '0'"> ä¼šç­¾</span>
                  </div>
                  <div v-else-if="item.objIds && item.objIds.length > 1">
                    <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}等</span>
                    <span v-if="item.approveType == 0"> æˆ–ç­¾</span>
                    <span v-if="item.approveType == 1"> ä¼šç­¾</span>
                    <span>{{ item.objIds[0].name }} ç­‰</span>
                    <span v-if="item.approveType == 0 && item.type == '0'"> æˆ–ç­¾</span>
                    <span v-if="item.approveType == 1 && item.type == '0'"> ä¼šç­¾</span>
                  </div>
                  <div v-else>请选择</div>
                  <i class="el-icon-arrow-right"></i>
@@ -277,7 +277,7 @@
          item.active = true
          if (item.objIds && item.objIds.length > 0) {
            const objIds = item.objIds.map(i => {
              return i.id + '-' + i.name
              return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
            })
            this.$set(this.searchForm, 'objIds', objIds)
          } else {
@@ -298,18 +298,19 @@
              item.objIds = item.memberList.map(i => {
                return {
                  id: i.id,
                  name: i.name
                  name: i.name,
                  companyName: i.companyName
                }
              })
            }
          })
          this.apprList = arr
          this.flowClick(0)
          this.$forceUpdate()
        }

        // console.log(res);
      })
      this.flowClick(0)
      this.$forceUpdate()
    },
    onSubmit () {
      const { apprList, activeType } = this

 admin/src/views/business/approvalReport.vue

@@ -28,13 +28,13 @@
                <div class="content">
                  <div v-if="item.objIds && item.objIds.length === 1 ">
                    <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
                    <span v-if="item.approveType == 0"> æˆ–ç­¾</span>
                    <span v-if="item.approveType == 1"> ä¼šç­¾</span>
                    <span v-if="item.approveType == 0 && item.type == '0'"> æˆ–ç­¾</span>
                    <span v-if="item.approveType == 1 && item.type == '0'"> ä¼šç­¾</span>
                  </div>
                  <div v-else-if="item.objIds && item.objIds.length > 1">
                    <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}等</span>
                    <span v-if="item.approveType == 0"> æˆ–ç­¾</span>
                    <span v-if="item.approveType == 1"> ä¼šç­¾</span>
                    <span>{{ item.objIds[0].name }} ç­‰</span>
                    <span v-if="item.approveType == 0 && item.type == '0'"> æˆ–ç­¾</span>
                    <span v-if="item.approveType == 1 && item.type == '0'"> ä¼šç­¾</span>
                  </div>
                  <div v-else>请选择</div>
                  <i class="el-icon-arrow-right"></i>
@@ -264,7 +264,7 @@
          item.active = true
          if (item.objIds && item.objIds.length > 0) {
            const objIds = item.objIds.map(i => {
              return i.id + '-' + i.name
              return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
            })
            this.$set(this.searchForm, 'objIds', objIds)
          } else {
@@ -285,18 +285,19 @@
              item.objIds = item.memberList.map(i => {
                return {
                  id: i.id,
                  name: i.name
                  name: i.name,
                  companyName: i.companyName
                }
              })
            }
          })
          this.apprList = arr
          this.flowClick(0)
          this.$forceUpdate()
        }

        // console.log(res);
      })
      this.flowClick(0)
      this.$forceUpdate()
    },
    onSubmit () {
      const { apprList, activeType } = this

 admin/src/views/business/platformInterfaceLog.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,145 @@
<template>
    <TableLayout :permissions="['business:interfacelog:query']">
        <!-- æœç´¢è¡¨å• -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="接口名称" prop="name">
                <el-input v-model="searchForm.name" placeholder="请输入接口名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="类型" prop="type">
                <el-select v-model="searchForm.type" @change="search" placeholder="请选择">
                    <el-option label="调用" value="0"></el-option>
                    <el-option label="推送接受" value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="起止时间" prop="startDate">
                <el-date-picker
                    @change="seleTime"
                    v-model="time"
                    type="datetimerange"
                    format="yyyy-MM-dd HH:mm:ss"
                    value-format="yyyy-MM-dd HH:mm:ss"
                    range-separator="至"
                    start-placeholder="开始时间"
                    end-placeholder="结束时间">
                </el-date-picker>
            </el-form-item>
            <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
                <el-radio-button label="0">当天</el-radio-button>
                <el-radio-button label="1">近7天</el-radio-button>
                <el-radio-button label="2">近30天</el-radio-button>
            </el-radio-group>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
            </section>
        </el-form>
        <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
        <template v-slot:table-wrap>
            <el-table
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe
            >
                <el-table-column prop="name" label="接口名称" min-width="180px"></el-table-column>
                <el-table-column prop="url" label="地址信息" min-width="180px"></el-table-column>
                <el-table-column label="类型" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.type == 0">调用</span>
                        <span v-if="row.type == 1">推送接收</span>
                    </template>
                </el-table-column>
                <el-table-column label="平台" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.plat == 0">海康安防平台</span>
                        <span v-if="row.plat == 1">ERP系统</span>
                    </template>
                </el-table-column>
                <el-table-column prop="request" label="请求参数" min-width="100px">
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('请求参数', {content: row.request})">查看</el-button>
                    </template>
                </el-table-column>
                <el-table-column prop="repose" label="响应参数" min-width="100px">
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.operaInterfaceLogWindow.open('响应参数', {content: row.repose})">查看</el-button>
                    </template>
                </el-table-column>
                <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            >
            </pagination>
        </template>
        <!-- æ–°å»º/修改 -->
        <OperaInterfaceLogWindow ref="operaInterfaceLogWindow" @success="handlePageChange"/>
    </TableLayout>
</template>

<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaInterfaceLogWindow from '@/components/business/OperaInterfaceLogWindow'
import { timeForMat } from '@/utils/util'
export default {
  name: 'InterfaceLog',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaInterfaceLogWindow },
  data () {
    return {
      // æœç´¢
      searchForm: {
        name: '',
        type: '',
        endDate: '',
        startDate: '',
        radio: '0'
      },
      time: []
    }
  },
  created () {
    this.config({
      module: '三方平台接口交互记录',
      api: '/business/platformInterfaceLog',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.changeRadio('0')
  },
  methods: {
    changeRadio (e) {
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      }
      this.search()
    },
    seleTime (e) {
      this.searchForm.startDate = e[0]
      this.searchForm.endDate = e[1]
      this.searchForm.radio = null
      this.search()
    },
    reset () {
      this.$refs.searchForm.resetFields()
      this.searchForm.startDate = ''
      this.searchForm.endDate = ''
      this.time = []
      this.search()
    }
  }
}
</script>

 admin/src/views/operation/danger/record.vue

@@ -125,7 +125,8 @@
        queryEndTime: '',
        areaId: null,
        cateId: null,
        status:null
        status: null,
        radio: 0
      },
      cateList: [],
      areaList: [],

 admin/src/views/operation/serviceCar/apprConfig.vue

@@ -32,13 +32,13 @@
                <div class="content">
                  <div v-if="item.objIds && item.objIds.length === 1 ">
                    <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
                    <span v-if="item.approveType == 0"> æˆ–ç­¾</span>
                    <span v-if="item.approveType == 1"> ä¼šç­¾</span>
                    <span v-if="item.approveType == 0 && item.type == '0'"> æˆ–ç­¾</span>
                    <span v-if="item.approveType == 1 && item.type == '0'"> ä¼šç­¾</span>
                  </div>
                  <div v-else-if="item.objIds && item.objIds.length > 1">
                    <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}等</span>
                    <span v-if="item.approveType == 0"> æˆ–ç­¾</span>
                    <span v-if="item.approveType == 1"> ä¼šç­¾</span>
                    <span>{{ item.objIds[0].name }} ç­‰</span>
                    <span v-if="item.approveType == 0 && item.type == '0'"> æˆ–ç­¾</span>
                    <span v-if="item.approveType == 1 && item.type == '0'"> ä¼šç­¾</span>
                  </div>
                  <div v-else>请选择</div>
                  <i class="el-icon-arrow-right"></i>
@@ -286,7 +286,7 @@
          item.active = true
          if (item.objIds && item.objIds.length > 0) {
            const objIds = item.objIds.map(i => {
              return i.id + '-' + i.name
              return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
            })
            this.$set(this.searchForm, 'objIds', objIds)
          } else {
@@ -307,18 +307,19 @@
              item.objIds = item.memberList.map(i => {
                return {
                  id: i.id,
                  name: i.name
                  name: i.name,
                  companyName: i.companyName
                }
              })
            }
          })
          this.apprList = arr
          this.flowClick(0)
          this.$forceUpdate()
        }

        // console.log(res);
      })
      this.flowClick(0)
      this.$forceUpdate()
    },
    onSubmit () {
      const { apprList, activeType } = this

 admin/src/views/operation/serviceCar/apprRecord.vue

@@ -132,7 +132,8 @@
        queryStartTime: '',
        queryEndTime: '',
        type: null,
        status:null
        status: null,
        radio: 0
      },
      cateList: [],
      areaList: [],

 h5/pages/staff/task/index.vue

@@ -27,13 +27,13 @@
          @click="statusClick(1)"
          :class="{ active: search.queryType === 1 }"
          class="box_head_item"
          >已处理 {{ headData.noticeDealNum }}</view
          >已处理</view
        >
        <view
          @click="statusClick(2)"
          :class="{ active: search.queryType === 2 }"
          class="box_head_item"
          >我发起的 {{ headData.noticeCreateNum }}</view
          >我发起的</view
        >
        <view
          @click="statusClick(3)"

 h5/pages/staff/task/visitorApprove.vue

@@ -138,7 +138,7 @@
      </view>
    </view>
    <view class="emyty"></view>
    <view class="main_footer">
    <view v-if="info.approveDateVO!=null&& info.approveDateVO.canBeApproved!=null && info.approveDateVO.canBeApproved ==1" class="main_footer">
      <view class="btn" @click="handleSub(3)">拒绝</view>
      <view class="btn agree" @click="handleSub(2)">同意</view>
    </view>

 h5/pages/staff/task/visitorReport.vue

@@ -131,7 +131,7 @@
      </view>
    </view>
    <view class="emyty"></view>
    <view class="main_footer">
    <view v-if="info.approveDateVO!=null&& info.approveDateVO.canBeApproved!=null && info.approveDateVO.canBeApproved ==1" class="main_footer">
      <view class="btn" @click="handleSub(3)">拒绝</view>
      <view class="btn agree" @click="handleSub(2)">同意</view>
    </view>