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

src/api/magnagement.js

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

src/components/Table/AllTableArguments/BaseTableArguments.js

@@ -80,9 +80,8 @@ export function BaseTableArguments(selection, loading, processList, queryParams,
   this.processList = processList
 }
 
-
 // TODO: 组件表单所需的所有参数
-export function BaseTableArgumentsTest(selection, loading, processList, queryParams, columnData) {
+export function BaseTableArgumentsTest(nIndex, selection, loading, processList, queryParams, columnData) {
   // TODO: 选择框是否需要存在    (selection判断表单选择框是否需要存在)
   if (typeof selection !== 'boolean') {
     console.warn('selection下拉框参数的type类型错误!请检查后重新赋值')
@@ -109,8 +108,7 @@ export function BaseTableArgumentsTest(selection, loading, processList, queryPar
     this.queryParams = queryParamsType
   }
 
+  this.nIndex = nIndex
   this.columnData = columnData
-
-
   this.processList = processList
 }

src/components/Table/BaseTable/index.vue

@@ -52,6 +52,7 @@
           <!--            </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" />
@@ -77,6 +78,7 @@
               <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开关 -->

src/views/equipment/check.vue

@@ -178,7 +178,6 @@ import {
   delRole,
   exportRole,
   getRole,
-  listRole,
   updateRole
 } from '@/api/system/role'
 import {listCheck} from '@/api/equipment/check'

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/processManagement/basicProcessManagement/index.vue

@@ -390,15 +390,15 @@ export default {
       this.open = !this.open
     },
     // TODO: 获取所选行详情信息操作
-    handleDetail(row) {
+    handleDetail(row, $index) {
       this.singleDetails = this.formReset
       this.singleDetails = row
       this.title = '详情信息'
       this.openDetails = !this.openDetails
     },
     /** TODO: 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
+    handleUpdate(row, $index) {
+      this.form = { ...this.formReset }
       this.title = '修改工序'
       const updProcessName = row.processName
       for (const pd of this.simulateProcessList) {
@@ -449,7 +449,7 @@ export default {
       return tip
     },
     /** TODO:删除按钮操作 */
-    handleDelete(row) {
+    handleDelete(row, $index) {
       this.$confirm('是否确认操作？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/views/system/role/index.vue

@@ -267,8 +267,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'
 export default {
   name: 'Role',

vue.config.js

@@ -79,11 +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://127.0.0.1:8088/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''