Merge remote-tracking branch 'origin/project1' into project1

src/api/equipment/basicInfo.js

+import request from '@/utils/request'
+import Qs from 'qs'
+// 查询基础信息列表
+export function listBasicInfo(query) {
+  return request({
+    url: '/wbbaseinfo/queryWbBaseinfoByPagination',
+    method: 'get',
+    params: query
+  })
+}
+export function getlistRole() {
+  return request({
+    url: 'system/role/listAll',
+    method: 'get'
+  })
+}
+
+// 查询角色详细
+export function getRole(businessId) {
+  return request({
+    url: '/system/role/detail/' + businessId,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addRole(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/add',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 修改角色
+export function updateRole(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/update/' + businessId,
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 角色数据权限
+export function dataScope(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/dataScope',
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 角色状态修改
+export function changeRoleStatus(businessId, flag) {
+  const data = {
+    businessId,
+    flag
+  }
+  return request({
+    url: '/system/role/changeStatus',
+    method: 'put',
+    params: data
+  })
+}
+
+// 删除角色
+export function delRole(roleId) {
+  return request({
+    url: '/system/role/deleteLogical/' + roleId,
+    method: 'delete'
+  })
+}
+
+// 导出角色
+export function exportRole(query) {
+  return request({
+    url: '/system/role/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/equipment/check.js

+import request from '@/utils/request'
+import Qs from 'qs'
+// 查询角色列表
+export function listCheck(query) {
+  return request({
+    url: '/wbwarehouse/queryWbWarehouseByPagination',
+    method: 'get',
+    params: query
+  })
+}
+export function getlistRole() {
+  return request({
+    url: 'system/role/listAll',
+    method: 'get'
+  })
+}
+
+// 查询角色详细
+export function getRole(businessId) {
+  return request({
+    url: '/system/role/detail/' + businessId,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addRole(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/add',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 修改角色
+export function updateRole(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/update/' + businessId,
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 角色数据权限
+export function dataScope(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/dataScope',
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 角色状态修改
+export function changeRoleStatus(businessId, flag) {
+  const data = {
+    businessId,
+    flag
+  }
+  return request({
+    url: '/system/role/changeStatus',
+    method: 'put',
+    params: data
+  })
+}
+
+// 删除角色
+export function delRole(roleId) {
+  return request({
+    url: '/system/role/deleteLogical/' + roleId,
+    method: 'delete'
+  })
+}
+
+// 导出角色
+export function exportRole(query) {
+  return request({
+    url: '/system/role/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/equipment/checkProcess.js

+import request from '@/utils/request'
+import Qs from 'qs'
+// 查询角色列表
+export function listCheck(query) {
+  return request({
+    url: '/wbwarehouse/queryWbWarehouseByPagination',
+    method: 'get',
+    params: query
+  })
+}
+export function getlistRole() {
+  return request({
+    url: 'system/role/listAll',
+    method: 'get'
+  })
+}
+
+// 查询角色详细
+export function getRole(businessId) {
+  return request({
+    url: '/system/role/detail/' + businessId,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addRole(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/add',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 修改角色
+export function updateRole(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/update/' + businessId,
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 角色数据权限
+export function dataScope(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/dataScope',
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 角色状态修改
+export function changeRoleStatus(businessId, flag) {
+  const data = {
+    businessId,
+    flag
+  }
+  return request({
+    url: '/system/role/changeStatus',
+    method: 'put',
+    params: data
+  })
+}
+
+// 删除角色
+export function delRole(roleId) {
+  return request({
+    url: '/system/role/deleteLogical/' + roleId,
+    method: 'delete'
+  })
+}
+
+// 导出角色
+export function exportRole(query) {
+  return request({
+    url: '/system/role/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/equipment/equipmentAbandonment.js

+import request from '@/utils/request'
+import Qs from 'qs'
+// 查询角色列表
+export function listCheck(query) {
+  return request({
+    url: '/wbwarehouse/queryWbWarehouseByPagination',
+    method: 'get',
+    params: query
+  })
+}
+export function getlistRole() {
+  return request({
+    url: 'system/role/listAll',
+    method: 'get'
+  })
+}
+
+// 查询角色详细
+export function getRole(businessId) {
+  return request({
+    url: '/system/role/detail/' + businessId,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addRole(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/add',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 修改角色
+export function updateRole(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/update/' + businessId,
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 角色数据权限
+export function dataScope(data) {
+  data = Qs.stringify(data)
+  return request({
+    url: '/system/role/dataScope',
+    method: 'put',
+    data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+
+// 角色状态修改
+export function changeRoleStatus(businessId, flag) {
+  const data = {
+    businessId,
+    flag
+  }
+  return request({
+    url: '/system/role/changeStatus',
+    method: 'put',
+    params: data
+  })
+}
+
+// 删除角色
+export function delRole(roleId) {
+    return request({
+      url: '/system/role/deleteLogical/' + roleId,
+      method: 'delete'
+  })
+}
+
+// 导出角色
+export function exportRole(query) {
+  return request({
+    url: '/system/role/export',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/magnagement.js

+import request from '@/utils/request'
+
+// 查询设备列表
+export function listdevice(query) {
+  return request({
+    url: '/wbwarehouse/queryWbWarehouseByPagination',
+    method: 'get',
+    params: query
+  })
+}
+

src/api/processLibrary/InventoryRecord.js

+import request from '@/utils/request'
+
+export function listLog(queryParams) {
+  return request({
+    url: '/wbwarehouselog/queryWbWarehouseLogByPagination',
+    method: 'get',
+    params: queryParams
+  })
+}

src/api/sample/basicInformation.js

+import request from '@/utils/request'
+
+// 查询列表
+export function queryList(params) {
+  return request({
+    url: '/wbchemistrybaseinfo/queryWbChemistryBaseinfoByPagination',
+    method: 'get',
+    params
+  })
+}

src/components/Table/AllTableArguments/BaseTableArguments.js

+// TODO: 查询条件  (检查查询条件的类型）
+
+export function queryParamsType(pageNum, pageSize, pageTotal) {
+  if (typeof pageNum !== 'number' && typeof pageSize !== 'number' && typeof pageTotal !== 'number') {
+    console.warn('queryParams查询参数的type类型错误!请检查后重新赋值')
+    return null
+  } else {
+    this.pageNum = pageNum
+    this.pageSize = pageSize
+    this.pageTotal = pageTotal
+  }
+}
+
+// TODO: 操作选项的类型判断
+export function operationType(type, label, icon, color, buttonClick, isShow) {
+  this.type = type
+  this.label = label
+  this.icon = icon
+  this.color = color
+  this.buttonClick = buttonClick | function() {}
+  this.isShow = isShow | function(row, $index) {
+    return true
+  }
+}
+
+// TODO: 列的类型以及参数判断
+export function columnDataType(text, status, ownDefined, isSwitch, image, isOperation, prop, label, width, align, operation) {
+  this.text = text
+  this.status = status
+  this.ownDefined = ownDefined
+  this.isSwitch = isSwitch
+  this.image = image
+  this.isOperation = isOperation
+
+  this.prop = prop
+  this.label = label
+  this.width = width
+  this.align = align
+
+  if (operation instanceof operationType) {
+    this.operations = operationType
+  } else {
+    console.warn('operation参数的type类型错误!请检查后重新赋值')
+  }
+}
+
+// TODO: 组件表单所需的所有参数
+export function BaseTableArguments(selection, loading, processList, queryParams, columnData) {
+  // TODO: 选择框是否需要存在    (selection判断表单选择框是否需要存在)
+  if (typeof selection !== 'boolean') {
+    console.warn('selection下拉框参数的type类型错误!请检查后重新赋值')
+  } else {
+    this.selection = selection
+
+    // TODO: 选择框  (根据条件是否可选)
+    this.selectable = (row, index) => {
+      if (row.isSwitch) {
+        return true
+      }
+    }
+  }
+
+  // TODO: 加载进度    (判断是否显示加载进度)
+  if (typeof loading !== 'boolean') {
+    console.warn('loading进度条参数的type类型错误!请检查后重新赋值')
+  } else {
+    this.loading = loading
+  }
+
+  // TODO: 查询参数    (判断查询条件是否符合类型)
+  if (queryParams instanceof queryParamsType) {
+    this.queryParams = queryParamsType
+  }
+
+  // TODO: 每一列的参数
+  if (columnData instanceof columnDataType) {
+    this.columnData = columnData
+  }
+
+  this.processList = processList
+}
+
+// TODO: 组件表单所需的所有参数
+export function BaseTableArgumentsTest(nIndex, selection, loading, processList, queryParams, columnData) {
+  // TODO: 选择框是否需要存在    (selection判断表单选择框是否需要存在)
+  if (typeof selection !== 'boolean') {
+    console.warn('selection下拉框参数的type类型错误!请检查后重新赋值')
+  } else {
+    this.selection = selection
+
+    // TODO: 选择框  (根据条件是否可选)
+    this.selectable = (row, index) => {
+      if (row.isSwitch) {
+        return true
+      }
+    }
+  }
+
+  // TODO: 加载进度    (判断是否显示加载进度)
+  if (typeof loading !== 'boolean') {
+    console.warn('loading进度条参数的type类型错误!请检查后重新赋值')
+  } else {
+    this.loading = loading
+  }
+
+  // TODO: 查询参数    (判断查询条件是否符合类型)
+  if (queryParams instanceof queryParamsType) {
+    this.queryParams = queryParamsType
+  }
+
+  this.nIndex = nIndex
+  this.columnData = columnData
+  this.processList = processList
+}

src/components/Table/AllTableArguments/processTable.js

+export function processTableArguments(processList, queryParams, nIndex, loading) {
+  this.processList = processList
+  this.queryParams = queryParams
+  this.nIndex = nIndex
+  this.loading = loading
+}

src/components/Table/BaseTable/index.vue

+<template>
+  <div>
+    <div class="mb12 font-small-bold">{{ allTableArguments.listName }}</div>
+    <div class="tableList" style="height:600px;">
+      <el-scrollbar style="height: 100%;">
+        <el-table
+          v-loading="allTableArguments.loading"
+          class="processList"
+          border
+          :data="allTableArguments.processList"
+          style="width: 100%"
+          @selection-change="handleSelectionChange"
+        >
+          <!--          <el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" />-->
+          <!--          <el-table-column label="工序名称" prop="processName" :show-overflow-tooltip="true">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              {{ scope.row.processName || '-' }}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column label="生产车间" prop="workshop">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              {{ scope.row.workshop || '-' }}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column label="操作人" prop="createBy" width="210px">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              {{ scope.row.createBy || '-' }}-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="操作"-->
+          <!--            class-name="small-padding fixed-width"-->
+          <!--            width="180px"-->
+          <!--          >-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <div class="processListBtns">-->
+          <!--                <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">-->
+          <!--                  详情-->
+          <!--                </el-button>-->
+          <!--                <el-button :type="typeParent" :size="size" @click="handleUpdate(scope.row)">-->
+          <!--                  修改-->
+          <!--                </el-button>-->
+          <!--                <el-button :type="typeParent" :size="size" @click="handleDelete(scope.row)">-->
+          <!--                  删除-->
+          <!--                </el-button>-->
+          <!--              </div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+
+          <el-table-column type="index" label="序号" width="50" :index="allTableArguments.nIndex" />
+
+          <!-- TODO: 选择框是否开启，selectable控制是否单行禁用 -->
+          <el-table-column v-if="allTableArguments.columObj.selection" type="selection" :selectable="allTableArguments.columObj.selectable" width="50px" />
+
+          <!-- TODO: 普通列 -->
+          <el-table-column
+            v-for="(column,columIndex) in allTableArguments.columObj.columnData"
+            :key="columIndex"
+            :prop="column.prop"
+            :label="column.label"
+            :width="column.width"
+            :fixed="column.fixed"
+            :align="column.align || 'center'"
+            :sortable="column.sortable"
+            :index="columIndex"
+            show-overflow-tooltip
+          >
+            <template v-slot="{row,$index}">
+
+              <!-- 默认展示 -->
+              <span v-if="column.text && column.editRow !== $index">{{ row[column.prop] || '-' }}</span>
+              <!-- 状态对象展示 -->
+              <span v-if="column.status && row[column.prop]">{{ row[column.prop].msg }}</span>
+              <!-- 自定义内容 -->
+              <span v-if="column.ownDefined">{{ column.ownDefinedReturn(row,$index) }}</span>
+
+              <!-- TODO: 时间数据   -->
+              <span v-if="column.time">{{ row[column.prop] | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+              <!-- switch开关 -->
+              <el-switch v-if="column.switch" v-model="row[column.prop]" :inactive-text="row[column.prop] ? column.openText:column.closeText" @change="switchChange(row,$index,column.prop)" />
+              <!-- 图片展示 -->
+              <el-popover trigger="hover" placement="top" popper-class="popper">
+                <img v-if="column.image" :src="viewUrl + row[column.prop]" alt="">
+                <el-image v-if="column.image" slot="reference" :src="viewUrl + row[column.prop]" />
+              </el-popover>
+
+              <!-- 图片数组 -->
+              <el-popover v-if="column.imageArr" trigger="hover" placement="top" popper-class="popper">
+                <img v-if="row[column.prop].length>0" :src="row[column.prop][0]" alt="">
+                <el-image v-if="row[column.prop].length >0" slot="reference" :src="row[column.prop][0]" :preview-src-list="row[column.prop]" />
+              </el-popover>
+
+              <!-- 可编辑input，仅在text默认展示类型才可编辑-->
+              <el-input v-if="column.editRow === $index" v-model="row[column.prop]" v-focus @blur="editInputBlur(row,$index,column.prop,columIndex)" />
+              <!-- 操作按钮 -->
+              <span v-if="column.isOperation" class="processListBtns">
+                <span v-for="(operations, index) in column.operation" :key="index">
+                  <el-button v-if="operations.isShow(row,$index)" :icon="operations.icon" :type="typeParent" :style="{color:operations.color}" :size="size" @click="operations.buttonClick(row,$index)">{{ operations.label }}</el-button>
+                </span>
+              </span>
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+      </el-scrollbar>
+      <div />
+    </div>
+  </div>
+</template>
+
+<script>
+
+import {BaseTableArgumentsTest} from '@/components/Table/AllTableArguments/BaseTableArguments'
+
+export default {
+  name: 'BaseTable',
+  props: {
+    allTableArguments: {
+      type: BaseTableArgumentsTest,
+      default: () => {
+        return {
+          selection: Boolean,
+          loading: Boolean,
+          queryParams: Object,
+          processList: Array,
+          columnData: Array
+        }
+      }
+    },
+    allNamed: {
+      type: Object,
+      default: () => {
+        return {
+          listName: String,
+          label: {
+            SerialNumberNamed: String
+          }
+
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      typeParent: 'text',
+      size: 'mini'
+    }
+  },
+  methods: {
+    handleDetail(row) {
+      this.$emit('handle-detail', row)
+    },
+    handleUpdate(row) {
+      this.$emit('handle-update', row)
+    },
+    handleDelete(row) {
+      this.$emit('handle-delete', row)
+    }
+  }
+}
+
+</script>
+
+<style lang="scss" scoped>
+/* TODO: 这里是控制内容列表的样式 */
+.processListBtns {
+  .el-button {
+    margin: 0 7px;
+  }
+}
+
+/* TODO: 深层穿透，解决底部滚动条问题 */
+.tableList{
+  /deep/ .el-scrollbar__wrap{
+    overflow-x: hidden;
+  }
+  /deep/ .is-horizontal {
+    display: none;
+  }
+}
+
+</style>

src/views/dashboard/index.vue

 <template>
-  <div class="dashboard-container">
-    <div class="dashboard-text">当前用户: {{ name }}</div>
-    <div class="dashboard-text">当前权限: <span v-for="role in roles" :key="role">{{ role }}</span></div>
-  </div>
+<!--  <div class="dashboard-container">-->
+<!--    <div class="dashboard-text">当前用户: {{ name }}</div>-->
+<!--    <div class="dashboard-text">当前权限: <span v-for="role in roles" :key="role">{{ role }}</span></div>-->
+<!--  </div>-->
 </template>
 
 <script>

src/views/equipment/draw.vue

@@ -29,7 +29,7 @@
       </el-form-item>
       <div style="float: right">
         <el-form-item>
-          <el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @btn-click="handleAdd">
+          <el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="handleAdd">
             {{ application }}
           </el-button>
         </el-form-item>

src/views/equipment/processEquipment.vue

@@ -42,7 +42,7 @@
             :type="typePrimary"
             :size="smallSize"
             :icon="addIcon"
-            @btn-click="handleAdd"
+            @click="handleAdd"
           >
             {{ addProcess }}
           </el-button>

src/views/equipment/statistic.vue

@@ -67,8 +67,8 @@ import {
   listRole,
   updateRole
 } from '@/api/system/role'
-import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
-import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
+import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
+import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
 // import { getRolesByInsId } from '../../../api/businessManage/template'
 import * as echarts from 'echarts'
 

src/views/instance/TodoList.vue

-<!--
- * @Descripttion: 待办事项页面
- * @version:
- * @Author: jooey wong
- * @Date: 2020-06-24 11:09:48
- * @LastEditors: jooey wong
- * @LastEditTime: 2020-07-07 15:00:33
--->
-<template>
-  <div class="instance-todo-list">
-    <el-form
-      ref="instance-search-form"
-      size="small"
-      :inline="true"
-      :model="searchForm"
-      class="instance-todo-list-search-param"
-    >
-      <el-form-item label="申请人">
-        <el-input v-model.trim="searchForm.user" :maxlength="30" />
-      </el-form-item>
-      <el-form-item label="申请人所属部门">
-        <el-cascader
-          v-model="searchForm.userDept"
-          :options="userDeptOptions"
-          :props="{ value: 'label',label: 'label' }"
-          :show-all-levels="false"
-          @change="userDeptHandleChange"
-        />
-      </el-form-item>
-      <el-form-item label="业务类型">
-        <el-select v-model="searchForm.process" clearable placeholder="请选择业务类型">
-          <el-option
-            v-for="(item, idx) in processOptions"
-            :key="'process-options-' + idx"
-            :label="item.processName"
-            :value="item.businessId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="serachSubmit" />
-        <el-button
-          type="danger"
-          icon="el-icon-refresh-left"
-          @click="resetSearchForm"
-        />
-      </el-form-item>
-    </el-form>
-    <el-table
-      ref="mainTable"
-      :data="tableData.rows"
-      border
-    >
-      <el-table-column type="index" label="序号" width="50" />
-      <el-table-column prop="userName" label="申请人" />
-      <el-table-column prop="deptName" label="申请人所在部门" />
-      <el-table-column prop="processName" label="业务类型" />
-      <el-table-column prop="createTime" label="任务开始时间" />
-      <el-table-column prop="actName" label="当前任务" />
-      <el-table-column label="操作" width="250">
-        <template slot-scope="scope">
-          <el-button
-            v-if="pageType === 1"
-            size="small"
-            type="primary"
-            @click="routerGo(scope.row)"
-          >
-            办理
-          </el-button>
-          <el-button
-            v-else
-            size="small"
-            type="primary"
-            @click="routerGo(scope.row)"
-          >
-            查看
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      class="instance-todo-list-pagination"
-      :current-page="currentPage"
-      background
-      :page-size="pageSize"
-      layout="total, prev, pager, next, jumper"
-      :total="tableData.total"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
-  </div>
-</template>
-
-<script>
-// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
-// 例如：import 《组件名称》 from '《组件路径》';
-import { toDoTaskBypage, queryWfProcessHis } from '@/api/workflow.js'
-import { treeselect } from '@/api/system/dept'
-export default {
-  // import引入的组件需要注入到对象中才能使用
-  components: {},
-  data() {
-    // 这里存放数据
-    return {
-      // 申请人所属部门选项
-      userDeptOptions: [],
-      // 条件查询form
-      searchForm: {
-        name: '',
-        process: '',
-        user: '',
-        userDept: []
-      },
-      // 所属流程选项
-      processOptions: [],
-      // tableData 存放所有分页数据
-      tableData: {},
-      currentPage: 1, // 默认显示页面为1
-      pageSize: 10 // 每页的数据条数
-    }
-  },
-  // 监听属性 类似于data概念
-  computed: {
-    /**
-     * @author: jooey wong
-     * @description: 因为待办事项、个人待办共用一个页面，所以根据此值区分
-     * @return: {number} pageType 1:待办事项 2：已办事项
-     */
-    pageType() {
-      return this.$route.meta.pageType
-    }
-  },
-  // 监控data中的数据变化
-  watch: {},
-  // 生命周期 - 创建完成（可以访问当前this实例）
-  created() {
-    // queryTodoListData()
-    // 查询表格信息
-    this.queryTableData()
-    // 查询所属流程options
-    this.queryBelongingProcess()
-    // 查询申请人部门
-    this.getTreeselect()
-  },
-  // 生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {},
-  beforeCreate() {}, // 生命周期 - 创建之前
-  beforeMount() {}, // 生命周期 - 挂载之前
-  beforeUpdate() {}, // 生命周期 - 更新之前
-  updated() {}, // 生命周期 - 更新之后
-  beforeDestroy() {}, // 生命周期 - 销毁之前
-  destroyed() {}, // 生命周期 - 销毁完成
-  activated() {},
-  // 方法集合
-  methods: {
-    /** 查询部门下拉树结构 */
-    getTreeselect() {
-      treeselect().then(response => {
-        this.userDeptOptions = []
-        this.userDeptOptions = this.userDeptOptions.concat(response.data)
-      })
-    },
-    /**
-     * @Description: 所属部门改变调
-     * @author liuhuaizhi
-     * @date 2020/7/23
-    */
-    userDeptHandleChange(data) {
-    },
-    /**
-     * @Description: 条件查询
-     * @author liuhuaizhi
-     * @date 2020/7/20
-    */
-    serachSubmit() {
-      this.currentPage = 1
-      this.pageSize = 10
-      this.queryTableData()
-    },
-    /**
-     * @author: jooey wong
-     * @description: 查询所属流程options
-     * @param {}
-     * @return:
-     */
-    queryBelongingProcess() {
-      queryWfProcessHis().then(res => {
-        this.processOptions = res.data
-      })
-    },
-    /**
-     * @author: jooey wong
-     * @description: 查询表格信息
-     * @param {}
-     * @return:
-     */
-    queryTableData() {
-      toDoTaskBypage({ page: this.currentPage, rows: this.pageSize, userName: this.searchForm.user, deptName: (this.searchForm.userDept.length > 0 ? this.searchForm.userDept[this.searchForm.userDept.length - 1] : ''), processId: this.searchForm.process }).then(res => {
-        this.tableData = res
-      }).catch(err => {
-      })
-    },
-    /**
-      * @Description: 页数变化
-      * @author liuhuaizhi
-      * @date 2020/7/17
-     */
-    handleSizeChange() {
-      this.queryTableData()
-    },
-    /**
-     * @Description: 当前页变化
-     * @author liuhuaizhi
-     * @date 2020/7/17
-    */
-    handleCurrentChange(val) {
-      this.currentPage = val
-      this.queryTableData()
-    },
-    /**
-     * @author: jooey wong
-     * @description: 重置查询表单
-     * @return:
-     */
-    resetSearchForm() {
-      this.searchForm = {
-        name: '',
-        process: '',
-        user: '',
-        userDept: []
-      }
-      this.$refs['instance-search-form'].resetFields()
-    },
-    /**
-     * @author: jooey wong
-     * @description: 暂时在这儿写页面跳转，移动后使用mixin函数跳转
-     * @param {Object} row 表格行数据
-     * @return:
-     */
-    routerGo(row) {
-      this.$router.push({
-        path: '/businessManage/template',
-        query: {
-          taskId: row.userTaskId,
-          instanceId: row.instanceId,
-          flowType: 2, // 流程类型
-          processName: row.processName,
-          // 状态
-          instanceStatus: row.instanceStatus,
-          processId: row.processId
-        }
-      })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.instance-todo-list {
-  padding: 12px;
-  &-pagination {
-    text-align: right;
-    margin-top: 8px;
-  }
-}
-</style>

src/views/system/role/index.vue

@@ -340,8 +340,8 @@ export default {
       tOptions: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         roleName: undefined,
         roleKey: undefined,
         flag: undefined

vue.config.js

@@ -79,10 +79,10 @@ module.exports = {
       //   }
       // },
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.1.29:8088/`,
+        target: `http://localhost:8088/`,
         // target: `http://10.5.87.231:10010/internal`,
         // target: `http://117.122.212.91:32012/`,
-        target: `http://192.144.239.97:20070/`,
+        // target: `http://192.144.239.97:20070/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''