Browse Source

init

master
汪菘 2 years ago
parent
commit
0a8796fc97
  1. 2
      qd/src/api/acs/device/device.js
  2. 1
      qd/src/api/acs/instruction/instruction.js
  3. 4
      qd/src/api/acs/route/routeLine.js
  4. 2
      qd/src/api/acs/stage/stage.js
  5. 2
      qd/src/api/acs/task/task.js
  6. 1
      qd/src/components/Echarts/BarChart2.vue
  7. 16
      qd/src/layout/components/Navbar.vue
  8. 6
      qd/src/main.js
  9. 2
      qd/src/router/index.js
  10. 4
      qd/src/views/acs/device/driver/oumulong_plc.vue
  11. 4
      qd/src/views/acs/device/driver/traffic_light.vue
  12. 58
      qd/src/views/acs/device/opc/index.vue
  13. 4
      qd/src/views/acs/route/routeLine/index.vue
  14. 77
      qd/src/views/acs/route/routeLoc/index.vue
  15. 55
      qd/src/views/acs/route/routePlan/index.vue
  16. 2
      qd/src/views/acs/stage/actor/index.vue
  17. 49
      qd/src/views/acs/stage/index.vue
  18. 2
      qd/src/views/acs/task/taskFeedback/index.vue
  19. 34
      qd/src/views/bigscreen/task.vue
  20. 16
      qd/src/views/monitor/log/logQuery.vue
  21. 14
      qd/src/views/monitor/lucene/index.vue
  22. 2
      qd/src/views/monitor/lucene/search.vue
  23. 127
      qd/src/views/system/devicedriver/index.vue
  24. 44
      qd/src/views/system/param/index.vue

2
qd/src/api/acs/device/device.js

@ -159,4 +159,4 @@ export function reload() {
export default { add, edit, del, selectDeviceList, selectDeviceListByRegion, callAgv, responseAgv, selectDeviceDevicerInfo, autoCreateTask,
changeDeviceStatus, cleanTask, queryStorageExtra, selectConDeviceList, saveBarcode, selectDeviceListOne, selectDeviceListTwo, selectDeviceListThree,
addMaterial, cleanMaterial, changeFenceStatus,reload }
addMaterial, cleanMaterial, changeFenceStatus, reload }

1
qd/src/api/acs/instruction/instruction.js

@ -1,6 +1,5 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/instruction',

4
qd/src/api/acs/route/routeLine.js

@ -22,7 +22,7 @@ export function edit(data) {
method: 'put',
data
})
}export function enabled(data) {
} export function enabled(data) {
return request({
url: 'api/routeLine/enabled',
method: 'put',
@ -37,4 +37,4 @@ export function reload() {
})
}
export default { add, edit, del,enabled,reload }
export default { add, edit, del, enabled, reload }

2
qd/src/api/acs/stage/stage.js

@ -31,4 +31,4 @@ export function selectStageList() {
})
}
export default { add, edit, del,selectStageList }
export default { add, edit, del, selectStageList }

2
qd/src/api/acs/task/task.js

@ -95,5 +95,5 @@ export function specialTaskCreate(data) {
})
}
export default { add, edit, del, finish, cancel, createTaskByClick, deviceAskTask, ordinaryTaskCreate, specialTaskCreate, createInst,reload }
export default { add, edit, del, finish, cancel, createTaskByClick, deviceAskTask, ordinaryTaskCreate, specialTaskCreate, createInst, reload }

1
qd/src/components/Echarts/BarChart2.vue

@ -7,7 +7,6 @@ import echarts from 'echarts'
require('echarts/theme/macarons') // echarts theme
import { debounce } from '@/utils'
export default {
props: {
className: {

16
qd/src/layout/components/Navbar.vue

@ -1,20 +1,24 @@
<template>
<div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
@toggleClick="toggleSideBar"/>
<hamburger
id="hamburger-container"
:is-active="sidebar.opened"
class="hamburger-container"
@toggleClick="toggleSideBar"
/>
<breadcrumb id="breadcrumb-container" class="breadcrumb-container"/>
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item"/>
<search id="header-search" class="right-menu-item" />
<!--<el-tooltip content="项目文档" effect="dark" placement="bottom">
<Doc class="right-menu-item hover-effect" />
</el-tooltip>-->
<el-tooltip content="全屏缩放" effect="dark" placement="bottom">
<screenfull id="screenfull" class="right-menu-item hover-effect"/>
<screenfull id="screenfull" class="right-menu-item hover-effect" />
</el-tooltip>
<!--<el-tooltip content="布局设置" effect="dark" placement="bottom">
@ -26,7 +30,7 @@
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
<img :src="Avatar" class="user-avatar">
<i class="el-icon-caret-bottom"/>
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown">
<span style="display:block;" @click="show = true">

6
qd/src/main.js

@ -5,10 +5,10 @@ import Cookies from 'js-cookie'
import 'normalize.css/normalize.css'
import Element from 'element-ui'
//列自适应宽度:https://github.com/legendJaden/AFTableColumn
// 列自适应宽度:https://github.com/legendJaden/AFTableColumn
import AFTableColumn from 'af-table-column'
//可编辑grid插件
// 可编辑grid插件
import 'xe-utils'
import VXETable from 'vxe-table'
import 'vxe-table/lib/style.css'
@ -22,7 +22,6 @@ import 'mavon-editor/dist/css/index.css'
// 数据字典
import dict from './components/Dict'
import scroll from 'vue-seamless-scroll'
Vue.use(scroll)
@ -52,7 +51,6 @@ Vue.use(AFTableColumn)
Vue.use(VXETable)
Vue.prototype.$XModal = VXETable.modal
Vue.use(VueHighlightJS)
Vue.use(mavonEditor)
Vue.use(permission)

2
qd/src/router/index.js

@ -13,7 +13,7 @@ const whiteList = ['/login', '/bigscreen/task', '/bigscreen/request']// no redir
router.beforeEach((to, from, next) => {
if (to.meta.title) {
//document.title = to.meta.title + ' - ' + Config.title
// document.title = to.meta.title + ' - ' + Config.title
document.title = to.meta.title
}
NProgress.start()

4
qd/src/views/acs/device/driver/oumulong_plc.vue

@ -258,8 +258,8 @@ export default {
// code,mode
if (data.code.indexOf('mode') !== -1) {
const dbValue = data.db
//
const beforeStr = dbValue.substring(0,5)
//
const beforeStr = dbValue.substring(0, 5)
//
const endNumber = dbValue.substring(5)
//

4
qd/src/views/acs/device/driver/traffic_light.vue

@ -248,8 +248,8 @@ export default {
// code,mode
if (data.code.indexOf('mode') !== -1) {
const dbValue = data.db
//
const beforeStr = dbValue.substring(0,5)
//
const beforeStr = dbValue.substring(0, 5)
//
const endNumber = dbValue.substring(5)
//

58
qd/src/views/acs/device/opc/index.vue

@ -14,9 +14,9 @@
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<rrOperation/>
<rrOperation />
</div>
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@ -27,32 +27,32 @@
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="OPC编码" prop="opc_code">
<el-input v-model="form.opc_code" style="width: 370px;"/>
<el-input v-model="form.opc_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="OPC名称" prop="opc_name">
<el-input v-model="form.opc_name" style="width: 370px;"/>
<el-input v-model="form.opc_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="OPC地址">
<el-input v-model="form.opc_host" style="width: 370px;"/>
<el-input v-model="form.opc_host" style="width: 370px;" />
</el-form-item>
<el-form-item label="用户名">
<el-input v-model="form.user" style="width: 370px;"/>
<el-input v-model="form.user" style="width: 370px;" />
</el-form-item>
<el-form-item label="密码" prop="password">
<el-input v-model="form.password" style="width: 370px;" type="password"/>
<el-input v-model="form.password" style="width: 370px;" type="password" />
<el-button :loading="crud.cu === 2" type="primary" @click="getDetail()">详情</el-button>
</el-form-item>
<el-form-item label="程序ID">
<el-input v-model="form.prog_id" style="width: 370px;"/>
<el-input v-model="form.prog_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="注册表ID">
<el-input v-model="form.cls_id" style="width: 370px;"/>
<el-input v-model="form.cls_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="domain">
<el-input v-model="form.domain" style="width: 370px;"/>
<el-input v-model="form.domain" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea"/>
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -63,18 +63,18 @@
<el-dialog title="PLC管理" :visible.sync="dialogPlcFormVisible" width="550px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-input v-model="form.opc_server_id" type="hidden" prop="opc_server_id"/>
<el-input v-model="form.opc_server_id" type="hidden" prop="opc_server_id" />
<el-form-item label="PLC编码" prop="plc_code">
<el-input v-model="form.plc_code" style="width: 370px;"/>
<el-input v-model="form.plc_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="OPC名称" prop="plc_opc_name">
<el-input v-model="form.plc_opc_name" style="width: 370px;" disabled/>
<el-input v-model="form.plc_opc_name" style="width: 370px;" disabled />
</el-form-item>
<el-form-item label="PLC名称" prop="plc_name">
<el-input v-model="form.plc_name" style="width: 370px;"/>
<el-input v-model="form.plc_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="PLC地址" prop="plc_host">
<el-input v-model="form.plc_host" style="width: 370px;"/>
<el-input v-model="form.plc_host" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -97,18 +97,18 @@
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="opc_code" label="OPC编码" width="100"/>
<el-table-column prop="opc_name" label="OPC名称"/>
<el-table-column prop="opc_host" label="OPC地址" min-width="130"/>
<el-table-column prop="type" label="类型"/>
<el-table-column prop="user" label="用户名" min-width="100"/>
<el-table-column prop="password" label="密码"/>
<el-table-column prop="prog_id" label="程序ID" min-width="150"/>
<el-table-column prop="cls_id" label="注册表ID" min-width="150"/>
<el-table-column prop="domain" label="domain"/>
<el-table-column prop="remark" label="备注" min-width="100"/>
<el-table-column prop="createtime" label="创建时间"/>
<el-table-column type="selection" width="55" />
<el-table-column prop="opc_code" label="OPC编码" width="100" />
<el-table-column prop="opc_name" label="OPC名称" />
<el-table-column prop="opc_host" label="OPC地址" min-width="130" />
<el-table-column prop="type" label="类型" />
<el-table-column prop="user" label="用户名" min-width="100" />
<el-table-column prop="password" label="密码" />
<el-table-column prop="prog_id" label="程序ID" min-width="150" />
<el-table-column prop="cls_id" label="注册表ID" min-width="150" />
<el-table-column prop="domain" label="domain" />
<el-table-column prop="remark" label="备注" min-width="100" />
<el-table-column prop="createtime" label="创建时间" />
<el-table-column label="操作" width="200px" align="center" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleClick(scope.row,'1')">修改</el-button>
@ -120,7 +120,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>

4
qd/src/views/acs/route/routeLine/index.vue

@ -159,7 +159,7 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="line_uuid" label="路线标识" />
<el-table-column prop="device_code" label="设备编码" width="120"/>
<el-table-column prop="device_code" label="设备编码" width="120" />
<el-table-column v-if="false" prop="device_code" label="设备名称" />
<el-table-column prop="route_plan_id" label="路由方案" width="140">
<template slot-scope="scope">
@ -337,7 +337,7 @@ export default {
}).catch(err => {
console.log(err.response.data.message)
})
},
}
}
}
</script>

77
qd/src/views/acs/route/routeLoc/index.vue

@ -3,43 +3,48 @@
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
:title="crud.status.title" width="500px">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="坐标标识" prop="ioc_uuid">
<el-input v-model="form.ioc_uuid" style="width: 370px;"/>
<el-input v-model="form.ioc_uuid" style="width: 370px;" />
</el-form-item>
<el-form-item label="设备编码" prop="device_code">
<el-input v-model="form.device_code" style="width: 370px;"/>
<el-input v-model="form.device_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="坐标值" prop="ioc_value">
<el-input v-model="form.ioc_value" style="width: 370px;"/>
<el-input v-model="form.ioc_value" style="width: 370px;" />
</el-form-item>
<el-form-item label="路由方案标识">
<el-input v-model="form.route_plan_id" style="width: 370px;"/>
<el-input v-model="form.route_plan_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;"/>
<el-input v-model="form.remark" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用" prop="is_active">
<el-input v-model="form.is_active" style="width: 370px;"/>
<el-input v-model="form.is_active" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否删除" prop="is_delete">
<el-input v-model="form.is_delete" style="width: 370px;"/>
<el-input v-model="form.is_delete" style="width: 370px;" />
</el-form-item>
<el-form-item label="创建者" prop="create_by">
<el-input v-model="form.create_by" style="width: 370px;"/>
<el-input v-model="form.create_by" style="width: 370px;" />
</el-form-item>
<el-form-item label="创建时间" prop="create_time">
<el-input v-model="form.create_time" style="width: 370px;"/>
<el-input v-model="form.create_time" style="width: 370px;" />
</el-form-item>
<el-form-item label="修改者">
<el-input v-model="form.update_by" style="width: 370px;"/>
<el-input v-model="form.update_by" style="width: 370px;" />
</el-form-item>
<el-form-item label="修改时间">
<el-input v-model="form.update_time" style="width: 370px;"/>
<el-input v-model="form.update_time" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -48,22 +53,32 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
@selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55"/>
<el-table-column prop="ioc_uuid" label="坐标标识"/>
<el-table-column prop="device_code" label="设备编码"/>
<el-table-column prop="ioc_value" label="坐标值"/>
<el-table-column prop="route_plan_id" label="路由方案标识"/>
<el-table-column prop="remark" label="备注"/>
<el-table-column prop="is_active" label="是否启用"/>
<el-table-column prop="is_delete" label="是否删除"/>
<el-table-column prop="create_by" label="创建者"/>
<el-table-column prop="create_time" label="创建时间"/>
<el-table-column prop="update_by" label="修改者"/>
<el-table-column prop="update_time" label="修改时间"/>
<el-table-column v-permission="['admin','routeLoc:edit','routeLoc:del']" label="操作" width="150px"
align="center">
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="small"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="ioc_uuid" label="坐标标识" />
<el-table-column prop="device_code" label="设备编码" />
<el-table-column prop="ioc_value" label="坐标值" />
<el-table-column prop="route_plan_id" label="路由方案标识" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="is_active" label="是否启用" />
<el-table-column prop="is_delete" label="是否删除" />
<el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="update_by" label="修改者" />
<el-table-column prop="update_time" label="修改时间" />
<el-table-column
v-permission="['admin','routeLoc:edit','routeLoc:del']"
label="操作"
width="150px"
align="center"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
@ -73,7 +88,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>

55
qd/src/views/acs/route/routePlan/index.vue

@ -3,19 +3,24 @@
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
:title="crud.status.title" width="500px">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item v-if="false" label="方案标识" prop="plan_uuid">
<el-input v-model="form.plan_uuid" style="width: 370px;"/>
<el-input v-model="form.plan_uuid" style="width: 370px;" />
</el-form-item>
<el-form-item label="编码" prop="plan_code">
<el-input v-model="form.plan_code" style="width: 370px;"/>
<el-input v-model="form.plan_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="名称" prop="plan_name">
<el-input v-model="form.plan_name" style="width: 370px;"/>
<el-input v-model="form.plan_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="描述信息" prop="description">
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
@ -27,19 +32,29 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
@selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="plan_uuid" label="方案标识"/>
<el-table-column prop="plan_code" label="编码"/>
<el-table-column prop="plan_name" label="名称"/>
<el-table-column prop="remark" label="备注"/>
<el-table-column prop="create_by" label="创建者"/>
<el-table-column prop="create_time" label="创建时间"/>
<el-table-column prop="update_by" label="修改者"/>
<el-table-column prop="update_time" label="修改时间"/>
<el-table-column v-permission="['admin','routePlan:edit','routePlan:del']" label="操作" width="150px"
align="center">
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="small"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="plan_uuid" label="方案标识" />
<el-table-column prop="plan_code" label="编码" />
<el-table-column prop="plan_name" label="名称" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="update_by" label="修改者" />
<el-table-column prop="update_time" label="修改时间" />
<el-table-column
v-permission="['admin','routePlan:edit','routePlan:del']"
label="操作"
width="150px"
align="center"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
@ -49,7 +64,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>

2
qd/src/views/acs/stage/actor/index.vue

@ -137,7 +137,7 @@ export default {
create_time: [
{ required: true, message: '创建时间不能为空', trigger: 'blur' }
]
} }
}}
},
methods: {
// false

49
qd/src/views/acs/stage/index.vue

@ -3,22 +3,27 @@
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
:title="crud.status.title" width="500px">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item v-if="false" label="舞台标识" prop="stage_uuid">
<el-input v-model="form.stage_uuid" style="width: 370px;"/>
<el-input v-model="form.stage_uuid" style="width: 370px;" />
</el-form-item>
<el-form-item label="舞台编码" prop="stage_code">
<el-input v-model="form.stage_code" style="width: 370px;"/>
<el-input v-model="form.stage_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="舞台名字" prop="stage_name">
<el-input v-model="form.stage_name" style="width: 370px;"/>
<el-input v-model="form.stage_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="描述信息" prop="description">
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea"/>
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -27,17 +32,23 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
@selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="stage_uuid" label="舞台标识"/>
<el-table-column prop="stage_code" label="舞台编码"/>
<el-table-column prop="stage_name" label="舞台名字"/>
<el-table-column prop="remark" label="备注"/>
<el-table-column prop="create_by" label="创建者"/>
<el-table-column prop="create_time" label="创建时间" min-width="135"/>
<el-table-column prop="update_by" label="修改者"/>
<el-table-column prop="update_time" label="修改时间" min-width="135"/>
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="small"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="stage_uuid" label="舞台标识" />
<el-table-column prop="stage_code" label="舞台编码" />
<el-table-column prop="stage_name" label="舞台名字" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" min-width="135" />
<el-table-column prop="update_by" label="修改者" />
<el-table-column prop="update_time" label="修改时间" min-width="135" />
<el-table-column v-permission="['admin','stage:edit','stage:del']" label="操作" width="150px" align="center">
<template slot-scope="scope">
<udOperation
@ -48,7 +59,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>

2
qd/src/views/acs/task/taskFeedback/index.vue

@ -194,7 +194,7 @@ export default {
create_time: [
{ required: true, message: '创建时间不能为空', trigger: 'blur' }
]
} }
}}
},
methods: {
// false

34
qd/src/views/bigscreen/task.vue

@ -15,7 +15,7 @@
</el-col>
</el-row>
<el-row style="border: 1px solid #938d8d;margin-left: 10px;margin-right: 10px;margin-bottom: 10px;">
<el-input value="各区域叫料未操作" style="width: 200px;"/>
<el-input value="各区域叫料未操作" style="width: 200px;" />
<div class="" style="height: 200px;border: 1px solid #938d8d;">
<!-- 表头 -->
<div class="warp-title">
@ -43,12 +43,12 @@
v-for="(item, index) in tableData1"
:style="{backgroundColor:((index+1)%2 == 0) ? '#f0f9eb' : '#ffffff'}"
>
<span class="data" style="width: 150px" v-text="formatterStatus(item.status)"/>
<span class="date" style="width: 150px" v-text="item.region"/>
<span class="date" style="width: 150px" v-text="item.device_code"/>
<span class="date" style="width: 150px" v-text="item.material"/>
<span class="date" style="width: 150px" v-text="item.qty"/>
<span class="date" style="width: 150px" v-text="item.remark"/>
<span class="data" style="width: 150px" v-text="formatterStatus(item.status)" />
<span class="date" style="width: 150px" v-text="item.region" />
<span class="date" style="width: 150px" v-text="item.device_code" />
<span class="date" style="width: 150px" v-text="item.material" />
<span class="date" style="width: 150px" v-text="item.qty" />
<span class="date" style="width: 150px" v-text="item.remark" />
</li>
</ul>
</vue-seamless-scroll>
@ -57,7 +57,7 @@
</el-row>
<el-row style="border: 1px solid #938d8d;margin-left: 10px;margin-right: 10px;margin-top: 80px;">
<el-input value="各区域叫料执行中" style="width: 200px;"/>
<el-input value="各区域叫料执行中" style="width: 200px;" />
<div class="" style="height: 250px;border: 1px solid #938d8d;">
<!-- 表头 -->
<div class="warp-title">
@ -85,12 +85,12 @@
v-for="(item, index) in tableData2"
:style="{backgroundColor:((index+1)%2 == 0) ? '#f0f9eb' : '#ffffff'}"
>
<span class="data" style="width: 150px" v-text="formatterInstructStatus(item.title)"/>
<span class="data" style="width: 150px" v-text="item.start_point_code"/>
<span class="data" style="width: 150px" v-text="item.next_point_code"/>
<span class="data" style="width: 150px" v-text="item.material"/>
<span class="data" style="width: 150px" v-text="item.quantity"/>
<span class="data" style="width: 150px" v-text="item.remark"/>
<span class="data" style="width: 150px" v-text="formatterInstructStatus(item.title)" />
<span class="data" style="width: 150px" v-text="item.start_point_code" />
<span class="data" style="width: 150px" v-text="item.next_point_code" />
<span class="data" style="width: 150px" v-text="item.material" />
<span class="data" style="width: 150px" v-text="item.quantity" />
<span class="data" style="width: 150px" v-text="item.remark" />
</li>
</ul>
</vue-seamless-scroll>
@ -101,9 +101,9 @@
</template>
<script>
//https://blog.csdn.net/weixin_43992867/article/details/110622449
//https://blog.csdn.net/qq_42540989/article/details/102579726
//https://blog.csdn.net/weixin_42201180/article/details/107557277
// https://blog.csdn.net/weixin_43992867/article/details/110622449
// https://blog.csdn.net/qq_42540989/article/details/102579726
// https://blog.csdn.net/weixin_42201180/article/details/107557277
import deviceCrud from '@/api/acs/device/device'
import instructionCrud from '@/api/acs/instruction/instruction'

16
qd/src/views/monitor/log/logQuery.vue

@ -53,17 +53,17 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="task_code" label="任务编码" width="70"/>
<el-table-column prop="log_type" label="日志类型" width="70"/>
<el-table-column prop="method" label="方法" min-width="140" show-overflow-tooltip/>
<el-table-column prop="status_code" label="状态码" width="80"/>
<el-table-column prop="requestparam" label="请求参数" :formatter="paramFormate" show-overflow-tooltip/>
<el-table-column prop="task_code" label="任务编码" width="70" />
<el-table-column prop="log_type" label="日志类型" width="70" />
<el-table-column prop="method" label="方法" min-width="140" show-overflow-tooltip />
<el-table-column prop="status_code" label="状态码" width="80" />
<el-table-column prop="requestparam" label="请求参数" :formatter="paramFormate" show-overflow-tooltip />
<el-table-column prop="responseparam" label="返回参数" :formatter="paramFormate2" show-overflow-tooltip>
<template slot-scope="scope">
{{ is_null(scope.row.responseparam) }}
</template>
</el-table-column>
<el-table-column prop="requesturl" label="请求地址" show-overflow-tooltip/>
<el-table-column prop="requesturl" label="请求地址" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具号" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="remark" label="备注" />
@ -99,7 +99,7 @@ export default {
del: false,
download: false,
reset: false
}, }
}}
)
},
data() {
@ -131,7 +131,7 @@ export default {
responseparam: [
{ required: true, message: '返回参数不能为空', trigger: 'blur' }
]
} }
}}
},
methods: {
// false

14
qd/src/views/monitor/lucene/index.vue

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div class="head-container">
<Search/>
<Search />
<crudOperation>
<el-button
slot="left"
@ -24,15 +24,15 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="id" label="id"/>
<el-table-column prop="resource_name" label="资源号"/>
<el-table-column prop="create_datetime" label="创建时间"/>
<el-table-column prop="content" label="内容详情"/>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="id" label="id" />
<el-table-column prop="resource_name" label="资源号" />
<el-table-column prop="create_datetime" label="创建时间" />
<el-table-column prop="content" label="内容详情" />
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</template>

2
qd/src/views/monitor/lucene/search.vue

@ -21,7 +21,7 @@
end-placeholder="结束日期"
align="right"
/>
<rrOperation/>
<rrOperation />
</div>
</template>

127
qd/src/views/system/devicedriver/index.vue

@ -2,56 +2,56 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-input v-model="query.driverCode" clearable size="small" placeholder="输入驱动编码" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
<el-input v-model="query.driverName" clearable size="small" placeholder="输入驱动名称" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
<el-select class="filter-item" style="width: 200px" size="small" v-model="query.fitDeviceTypes" placeholder="驱动类型" @change="crud.toQuery" clearable>
<el-option label="输送机-Conveyor" value="conveyor"></el-option>
<el-option label="固定货台-Station" value="station"></el-option>
<el-option label="堆垛机-Stacker" value="stacker"></el-option>
<el-option label="自动导引搬运车辆-AGV" value="agv"></el-option>
</el-select>
<rrOperation />
</div>
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-input v-model="query.driverCode" clearable size="small" placeholder="输入驱动编码" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
<el-input v-model="query.driverName" clearable size="small" placeholder="输入驱动名称" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
<el-select v-model="query.fitDeviceTypes" class="filter-item" style="width: 200px" size="small" placeholder="驱动类型" clearable @change="crud.toQuery">
<el-option label="输送机-Conveyor" value="conveyor" />
<el-option label="固定货台-Station" value="station" />
<el-option label="堆垛机-Stacker" value="stacker" />
<el-option label="自动导引搬运车辆-AGV" value="agv" />
</el-select>
<rrOperation />
</div>
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :visible.sync="dialogFormVisible" width="700px">
<el-form :model="form" size="small" label-width="110px">
<el-dialog :visible.sync="dialogFormVisible" width="700px">
<el-form :model="form" size="small" label-width="110px">
<el-form-item label="驱动编码:" prop="driverCode">
<el-input v-model="form.driverCode" style="width: 450px;" readonly/>
<el-input v-model="form.driverCode" style="width: 450px;" readonly />
</el-form-item>
<el-form-item label="驱动名称:" prop="driverName">
<el-input v-model="form.driverName" style="width: 450px;" readonly/>
<el-input v-model="form.driverName" style="width: 450px;" readonly />
</el-form-item>
<el-form-item label="驱动描述:">
<el-input v-model="form.driverDescription" style="width: 450px;" readonly/>
<el-input v-model="form.driverDescription" style="width: 450px;" readonly />
</el-form-item>
<el-form-item label="设备驱动类型:">
{{form.deviceDriverType}}
{{ form.deviceDriverType }}
</el-form-item>
<el-form-item label="适用驱动类型:">
<el-tag v-for="city in form.fitDeviceTypes" :label="city" :key="city" effect="dark">{{city}}</el-tag>
<el-tag v-for="city in form.fitDeviceTypes" :key="city" :label="city" effect="dark">{{ city }}</el-tag>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> </el-button>
</span>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> </el-button>
</span>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="driverCode" label="驱动编码" />
<el-table-column prop="driverName" label="驱动名称" />
<el-table-column prop="driverDescription" label="驱动描述"/>
<el-table-column prop="deviceDriverType" label="设备驱动类型"/>
<el-table-column prop="fitDeviceTypes" label="适用驱动类型"/>
<el-table-column prop="driverDescription" label="驱动描述" />
<el-table-column prop="deviceDriverType" label="设备驱动类型" />
<el-table-column prop="fitDeviceTypes" label="适用驱动类型" />
<el-table-column label="驱动详情" width="100px">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleClick(scope.row)">查看详情</el-button>
</template>
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleClick(scope.row)">查看详情</el-button>
</template>
</el-table-column>
</el-table>
</div>
@ -66,23 +66,23 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = { driverCode: null, driverName: null, driverDescription: null,deviceDriverType:null,fitDeviceTypes:null}
const defaultForm = { driverCode: null, driverName: null, driverDescription: null, deviceDriverType: null, fitDeviceTypes: null }
export default {
name: 'devicedriver',
components: { pagination, crudOperation, rrOperation, udOperation },
name: 'Devicedriver',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm)],
cruds() {
return CRUD({
title: '设备',
url: 'api/devicedriver',
idField: 'id',
sort: 'id',
crudMethod: { },
optShow:{
download:true,
reset:true
}
})
title: '设备',
url: 'api/devicedriver',
idField: 'id',
sort: 'id',
crudMethod: { },
optShow: {
download: true,
reset: true
}
})
},
data() {
return {
@ -91,27 +91,26 @@ export default {
},
rules: {
},
dialogFormVisible: false,
queryTypeOptions: [
{ key: 'driverCode', display_name: '驱动编码' },
{ key: 'driverName', display_name: '驱动名称' },
{ key: 'fitDeviceTypes', display_name: '驱动类型' }
]
}
},
methods: {
//
handleClick(row) {
this.form = row;
this.dialogFormVisible=true;
},
// false
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
},
dialogFormVisible: false,
queryTypeOptions: [
{ key: 'driverCode', display_name: '驱动编码' },
{ key: 'driverName', display_name: '驱动名称' },
{ key: 'fitDeviceTypes', display_name: '驱动类型' }
]
}
},
methods: {
//
handleClick(row) {
this.form = row
this.dialogFormVisible = true
},
// false
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>

44
qd/src/views/system/param/index.vue

@ -3,7 +3,7 @@
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@ -14,13 +14,13 @@
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="编码" prop="code">
<el-input v-model="form.code" style="width: 370px;"/>
<el-input v-model="form.code" style="width: 370px;" />
</el-form-item>
<el-form-item label="名字" prop="name">
<el-input v-model="form.name" style="width: 370px;"/>
<el-input v-model="form.name" style="width: 370px;" />
</el-form-item>
<el-form-item label="值" prop="value">
<el-input v-model="form.value" style="width: 370px;"/>
<el-input v-model="form.value" style="width: 370px;" />
</el-form-item>
<el-form-item label="启用" prop="is_active">
<el-radio-group v-model="form.is_active" size="mini">
@ -29,7 +29,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="description">
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea"/>
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -46,19 +46,19 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column v-if="false" prop="id" label="id"/>
<el-table-column prop="code" label="编码"/>
<el-table-column prop="name" label="名称"/>
<el-table-column prop="value" label="值"/>
<el-table-column prop="remark" label="备注"/>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="id" label="id" />
<el-table-column prop="code" label="编码" />
<el-table-column prop="name" label="名称" />
<el-table-column prop="value" label="值" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="is_active" label="启用" width="75px">
<template slot-scope="scope">
<span v-if="scope.row.is_active==0"></span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column prop="create_by" label="创建者"/>
<el-table-column prop="create_by" label="创建者" />
<el-table-column v-permission="['admin','param:edit','param:del']" label="操作" width="150px" align="center">
<template slot-scope="scope">
<udOperation
@ -69,7 +69,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>
@ -99,7 +99,7 @@ export default {
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '系统参数', url: 'api/param', idField: 'id', sort: 'id,desc', crudMethod: { ...crudParam } })
return CRUD({ title: '系统参数', url: 'api/param', idField: 'id', sort: 'id,desc', crudMethod: { ...crudParam }})
},
data() {
return {
@ -128,6 +128,9 @@ export default {
}
}
},
created() {
this.webSocket()
},
methods: {
// false
[CRUD.HOOK.beforeRefresh]() {
@ -135,7 +138,7 @@ export default {
},
webSocket() {
const that = this
if (typeof (WebSocket) == 'undefined') {
if (typeof (WebSocket) === 'undefined') {
this.$notify({
title: '提示',
message: '当前浏览器无法接收实时报警信息,请使用谷歌浏览器!',
@ -143,7 +146,7 @@ export default {
duration: 0
})
} else {
let id = '123'
const id = '123'
// tokenvuex
// socket使IP
const socketUrl = process.env.VUE_APP_WS_API + id
@ -151,17 +154,16 @@ export default {
// socket
this.socket.onopen = function() {
console.log('浏览器WebSocket已打开')
that.socket.send("测试客户端发送消息");
that.socket.send('测试客户端发送消息')
}
// socket
this.socket.onmessage = function(msg) {
console.log(msg);
console.log(msg)
// json
/* const data = JSON.parse(msg.data);*/
}
// socket
@ -177,12 +179,8 @@ export default {
this.socket.onclose = function() {
console.log('WebSocket已关闭')
}
}
}
},
created() {
this.webSocket()
}
}
</script>

Loading…
Cancel
Save