Merge branch 'master' of http://git.mingansei.com/xiaobai/equipment

src/api/common.js

@@ -155,4 +155,15 @@ export function getDicAssetTreeList() {
     url: '/sedirectory/getList',
     method: 'get'
   })
+}
+export function rebutFn(params) {
+  return api({
+    url: '/flow/bohui',
+    method: 'post',
+    data: params,
+    paramsSerializer: function(data) {
+      console.log(require('qs').stringify(data, { indices: false }), 8888888888888)
+      return require('qs').stringify(data, { indices: false })
+    }
+  })
 }

src/components/Notice/message.vue

@@ -129,7 +129,9 @@ export default {
       readListQuery: {
         pageNum: 1,
         pageRow: 20,
-        searchReadMessage: {}
+        searchReadMessage: {},
+        content: '',
+        title: ''
       },
       readMultipleSelection: [],
       recycleMessage: [],

src/views/archive/archive_scan.vue

@@ -161,7 +161,7 @@ export default {
           this.archive.archiveCount = this.paramList.length
 
           this.server({
-            url: '/archive/archive/addNew',
+            url: '/archive',
             method: 'post',
             data: {
               archive: this.archive,

src/views/bggl/components/original_db_list.vue

@@ -285,6 +285,16 @@
         <el-form-item label="驳回意见：" required>
           <el-input v-model="bohuiForm.infoNotes" :rows="5" type="textarea" />
         </el-form-item>
+        <el-form-item label="驳回环节：" required>
+          <el-select v-model="bohuiForm.flowstatus" placeholder="请选择">
+            <el-option
+              v-for="(item,index) in AllFlowUser"
+              :key="index"
+              :label="item.label"
+              :value="item.key"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="上传驳回附件：">
           <span style="color: #dd6161">多张图片可合成一份pdf文件进行上传</span>
           <el-upload
@@ -401,7 +411,7 @@ import Pagination from '@/components/Pagination'
 import Utils from '../../../utils/contact.js'
 import qs from 'qs'
 import Enclosure from '@/views/common/Enclosure'
-
+import { rebutFn } from '@/api/common'
 export default {
   name: 'TODOReport',
   components: { Sticky, Pagination, Enclosure },
@@ -458,8 +468,8 @@ export default {
         }
       ],
       bohuiForm: {
-        fileName: '',
+        infoNotes: '',
-        infoNotes: ''
+        flowstatus: ''
       },
       userList: [],
       ysjlId: '',
@@ -497,7 +507,8 @@ export default {
       }],
       fileList: [],
       dialogFormVisibleSfInfo: false,
-      sfInfo: {}
+      sfInfo: {},
+      AllFlowUser: []
     }
   },
   created() {
@@ -511,11 +522,21 @@ export default {
     this.common.$on('bggl-daiban-list', function() {
       that.handleFilter()
     })
+    this.getAllFlowUser()
   },
   methods: {
     handlePreview(file) {
       window.open(file.url)
     },
+    getAllFlowUser() {
+      this.api({
+        url: '/flow/getAllFlowUserList',
+        methods: 'get'
+      }).then(res => {
+        this.AllFlowUser = res
+        console.log(this.AllFlowUser)
+      })
+    },
     onRemove(file) {
       const array = file.url.split('/')
       if (array.length > 0) {
@@ -563,7 +584,7 @@ export default {
           }
         }
         this.list = data.list
-        this.totalCount = data.totalCount
+        this.totalCount = data.total
         this.common.switchInspection(this.list)
         const messagePush = this.$store.getters.messageCount
         for (let i = 0; i < messagePush.length; i++) {
@@ -678,18 +699,16 @@ export default {
         this.$message('请在列表选择要驳回的数据。')
         return false
       }
-      this.ysjlId = ''
+      this.ysjlId = []
+      const arr = []
       for (let i = 0; i < this.multipleSelection.length; i++) {
         if (this.multipleSelection[i].flowstatus !== 1) {
-          if (i === 0) {
+          arr.push(this.multipleSelection[i].id)
-            this.ysjlId = this.multipleSelection[i].id
-          } else {
-            this.ysjlId = this.ysjlId + ',' + this.multipleSelection[i].id
-          }
         } else {
           this.$message('存在未流转报告。')
         }
       }
+      this.ysjlId = arr
       if (this.ysjlId !== '') {
         this.dialogBohuiVisible = true
       }
@@ -700,16 +719,13 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        console.log(this.ysjlId)
         this.$refs['bohuiForm'].validate(valid => {
           if (valid) {
-            this.api({
+            rebutFn({
-              url: '/flow/bohui',
+              ysjlIds: this.ysjlId,
-              method: 'post',
+              infonotes: this.bohuiForm.infoNotes,
-              params: {
+              flowstatus: this.bohuiForm.flowstatus
-                ids: this.ysjlId,
-                infonotes: this.bohuiForm.infoNotes,
-                fileName: this.bohuiForm.fileName
-              }
             }).then(data => {
               // 根据结果反馈信息
               this.$message({

src/views/monitor/log_info.vue

@@ -3,9 +3,30 @@
     <div class="filter-container">
       <el-form>
         <el-form-item>
-          <el-input v-model="listQuery.createBy" placeholder="用户名" style="width: 150px" size="small" clearable @keyup.enter.native="handleFilter" />
+          <el-input
-          <el-input v-model="listQuery.address" placeholder="IP来源" style="width: 150px" size="small" clearable @keyup.enter.native="handleFilter" />
+            v-model="listQuery.createBy"
-          <el-input v-model="listQuery.description" placeholder="描述" style="width: 150px" size="small" clearable @keyup.enter.native="handleFilter" />
+            placeholder="用户名"
+            style="width: 150px"
+            size="small"
+            clearable
+            @keyup.enter.native="handleFilter"
+          />
+          <el-input
+            v-model="listQuery.address"
+            placeholder="IP来源"
+            style="width: 150px"
+            size="small"
+            clearable
+            @keyup.enter.native="handleFilter"
+          />
+          <el-input
+            v-model="listQuery.description"
+            placeholder="描述"
+            style="width: 150px"
+            size="small"
+            clearable
+            @keyup.enter.native="handleFilter"
+          />
           <el-date-picker
             v-model="value1"
             type="datetimerange"
@@ -15,7 +36,12 @@
             value-format="yyyy-MM-dd HH:mm:ss"
             @keyup.enter.native="handleFilter"
           />
-          <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="small"
+            @click="handleFilter"
+          >
             查询
           </el-button>
         </el-form-item>
@@ -23,11 +49,26 @@
     </div>
     <el-table :data="list" size="small" fit highlight-current-row>
       <el-table-column align="center" label="用户名" prop="createBy" />
-      <el-table-column align="center" label="IP" prop="requestIp" :formatter="formatterIp" />
+      <el-table-column
+        align="center"
+        label="IP"
+        prop="requestIp"
+        :formatter="formatterIp"
+      />
       <el-table-column align="center" label="IP来源" prop="address" />
       <el-table-column align="center" label="描述" prop="description" />
-      <el-table-column align="center" label="方法名称" :show-overflow-tooltip="true" prop="method" />
+      <el-table-column
-      <el-table-column align="center" label="参数" :show-overflow-tooltip="true" prop="params" />
+        align="center"
+        label="方法名称"
+        :show-overflow-tooltip="true"
+        prop="method"
+      />
+      <el-table-column
+        align="center"
+        label="参数"
+        :show-overflow-tooltip="true"
+        prop="params"
+      />
       <el-table-column prop="time" label="请求耗时" align="center">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.time <= 300">
@@ -42,8 +83,66 @@
         </template>
       </el-table-column>
       <el-table-column align="center" label="创建日期" prop="createTime" />
+      <el-table-column
+        align="center"
+        label="参数"
+        :show-overflow-tooltip="true"
+        prop="params"
+      >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="checkDetail(scope.row)"
+          >
+            查看详情
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
-    <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getList" />
+    <pagination
+      v-show="totalCount > 0"
+      :total="totalCount"
+      :page-num.sync="listQuery.pageNum"
+      :page-row.sync="listQuery.pageRow"
+      @pagination="getList"
+    />
+
+    <el-dialog title="详情" :visible.sync="dialogFormVisible">
+      <el-form :model="form">
+        <el-form-item label="接口名称" :label-width="formLabelWidth">
+          <span>{{ row.api }}</span>
+        </el-form-item>
+        <el-form-item label="接口地址" :label-width="formLabelWidth">
+          <span>{{ row.uri }}</span>
+        </el-form-item>
+        <el-form-item label="接口方法类型" :label-width="formLabelWidth">
+          <span>{{ row.requestMethod }}</span>
+        </el-form-item>
+        <el-form-item label="接口参数" :label-width="formLabelWidth">
+          <span>{{ row.requestParams }}</span>
+        </el-form-item>
+        <el-form-item label="方法名称" :label-width="formLabelWidth">
+          <span>{{ row.method }}</span>
+        </el-form-item>
+        <el-form-item label="接口所属模块" :label-width="formLabelWidth">
+          <span>{{ row.module }}</span>
+        </el-form-item>
+        <el-form-item label="接口IP地址" :label-width="formLabelWidth">
+          <span>{{ row.requestIp }}</span>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">
+          取 消
+        </el-button>
+        <el-button
+          type="primary"
+          @click="dialogFormVisible = false"
+        >
+          确 定
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -56,11 +155,24 @@ export default {
     return {
       totalCount: 0,
       list: [],
+      row: {},
+      dialogFormVisible: false,
+      formLabelWidth: '150px',
       listQuery: {
         pageNum: 1,
         pageSize: 20,
         orderBy: 'id desc',
-        logType: true
+        logType: true,
+        address: '',
+        api: '',
+        apiOperation: '',
+        businessType: '',
+        contentType: '',
+        requestMethod: '',
+        requestParams: '',
+        time: '',
+        updateBy: '',
+        uri: ''
       },
       value1: []
     }
@@ -74,11 +186,15 @@ export default {
         url: '/log/list',
         method: 'get',
         params: this.listQuery
-      }).then(data => {
+      }).then((data) => {
         this.list = data.list
         this.totalCount = data.total
       })
     },
+    checkDetail(row) {
+      this.dialogFormVisible = true
+      this.row = row
+    },
     handleFilter() {
       this.listQuery.pageNum = 1
       this.listQuery.createTimeStart = this.value1[0]