Compare commits
No commits in common. "c288c614474594df2d182a70b949de6a8273ba9f" and "d9810b14b5e8a77a5b5d005772ba71654ef8baff" have entirely different histories.
c288c61447
...
d9810b14b5
1192
package-lock.json
generated
1192
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -24,7 +24,7 @@
|
||||
"gulp-replace": "0.6.1",
|
||||
"gulp-shell": "0.6.5",
|
||||
"lodash": "4.17.5",
|
||||
"node-sass": "^6.0.1",
|
||||
"node-sass": "4.9.0",
|
||||
"npm": "^6.9.0",
|
||||
"sass-loader": "6.0.6",
|
||||
"svg-sprite-loader": "3.7.3",
|
||||
|
||||
@ -1 +0,0 @@
|
||||
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1637048631391" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3964" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M608 960c-4.88 0-9.78-1.11-14.31-3.38A32 32 0 0 1 576 928v-96H416c-17.67 0-32-14.33-32-32V672c0-17.67 14.33-32 32-32h160v-96a32 32 0 0 1 51.2-25.6l256 192c8.06 6.04 12.8 15.53 12.8 25.6s-4.74 19.56-12.8 25.6l-256 192c-5.65 4.23-12.4 6.4-19.2 6.4zM448 768h160c17.67 0 32 14.33 32 32v64l170.67-128L640 608v64c0 17.67-14.33 32-32 32H448v64zM927.98 448c-6.81 0-13.67-2.16-19.49-6.64L512 136.37 115.51 441.36c-14.01 10.78-34.1 8.16-44.88-5.85-10.78-14.01-8.15-34.1 5.85-44.87l416-320c11.5-8.85 27.52-8.85 39.02 0l416 320c14.01 10.78 16.63 30.87 5.85 44.87-6.29 8.19-15.78 12.49-25.37 12.49zM344 720h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10zM344 592h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10z" p-id="3965" fill="#13227a"></path><path d="M344 464h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10zM474.5 592h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10zM474.5 464h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10zM605 464h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10z" p-id="3966" fill="#13227a"></path><path d="M491 960H192c-17.67 0-32-14.33-32-32V343c0-17.67 14.33-32 32-32s32 14.33 32 32v553h267c17.67 0 32 14.33 32 32s-14.33 32-32 32z" p-id="3967" fill="#13227a"></path><path d="M832 574c-17.67 0-32-14.33-32-32V343c0-17.67 14.33-32 32-32s32 14.33 32 32v199c0 17.67-14.33 32-32 32z" p-id="3968" fill="#13227a"></path></svg>
|
||||
|
Before Width: | Height: | Size: 2.0 KiB |
@ -1 +0,0 @@
|
||||
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1637048480149" class="icon" viewBox="0 0 1335 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2737" xmlns:xlink="http://www.w3.org/1999/xlink" width="260.7421875" height="200"><defs><style type="text/css"></style></defs><path d="M1233.549 825.047V692.461c60.253-41.004 102.103-130.285 102.103-233.739 0-137.676-73.936-250.078-167.179-257.335v-0.416l-165.918-25.822v-59.615h-56.75V166.2l-134.916-26.535V75.79h-60.698v54.494L514.285 87.01V0h-66.337v76.637L342.18 60.179v0.296c60.55 8.222 103.231 167.046 96.048 359.78C431.045 612.99 376.55 768.12 315.555 771.83l87.189-2.85v40.16l-159.017 8.102v66.842l370.554-30.66 1.41 25.555-195.628 13.342 23.24 11.353v113.975l861.792-106.733v-84.028l-34.934-4.54-36.612 2.7z m-553.36-32.219v-34.49l160.975-6.677v32.085l-160.976 9.082zM528.517 204.503l27.87-13.623v-0.846l1.41 0.148 0.43-0.148v0.282l147.738 23.552v295.787l-145.912-4.11-31.551 3.546V204.503z m-53.1 600.791l8.31-39.179 125.196-4.11 2.122 36.478-135.643 6.826z m204.77 38.883L949.337 819.2v-40.871l-43.527 2.27 4.927-31.224 231.824-14.766 15.91 93.822-478.134 42.86-0.149-27.1z m-406.854-73.58c-56.009-2.122-97.458-133.18-99.981-302.955l-35.01-2.701c-21.562 8.934-17.066 54.895-17.066 54.895H0C0 381.685 105.16 375.02 105.16 375.02l70.85 1.277c12.183-180.135 65.402-319.28 123.785-316.995 62.033 2.404 106.421 163.528 99.135 359.973-7.272 196.43-63.563 353.74-125.596 351.321z m-23.107-449.744c-11.62 0-21.697 22.974-26.743 56.87l30.943 0.712-0.282 92.62-30.245-1.276c4.897 32.204 14.989 54.168 26.327 54.168 16.384 0 29.681-45.516 29.681-101.54 0-56.023-13.297-101.554-29.681-101.554z" fill="#13227a" p-id="2738"></path></svg>
|
||||
|
Before Width: | Height: | Size: 1.7 KiB |
@ -1 +0,0 @@
|
||||
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1637048739666" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5673" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M918.4256 859.648H107.0592a16.2816 16.2816 0 0 1-16.2816-16.3328V180.6336a16.2816 16.2816 0 0 1 16.2816-16.2816h811.3664a16.2816 16.2816 0 0 1 16.3328 16.2816v662.6816a16.3328 16.3328 0 0 1-16.3328 16.3328z m-795.0848-32.6144H902.144V196.9152H123.3408z" p-id="5674" fill="#13227a"></path><path d="M916.48 693.9648H109.2096a16.3328 16.3328 0 1 1 0-32.6144H916.48a16.3328 16.3328 0 0 1 0 32.6144zM183.8592 450.56H113.9712a16.2816 16.2816 0 0 1 0-32.5632h69.888a16.2816 16.2816 0 1 1 0 32.5632z" p-id="5675" fill="#13227a"></path><path d="M197.1712 563.6608a16.3328 16.3328 0 0 1-16.2816-16.3328V320.9728a16.3328 16.3328 0 0 1 32.6144 0v226.3552a16.3328 16.3328 0 0 1-16.3328 16.3328zM904.5504 450.56H834.56a16.2816 16.2816 0 1 1 0-32.5632h69.888a16.2816 16.2816 0 1 1 0 32.5632z" p-id="5676" fill="#13227a"></path><path d="M821.3504 563.6608a16.3328 16.3328 0 0 1-16.3328-16.3328V320.9728a16.3328 16.3328 0 0 1 32.6144 0v226.3552a16.3328 16.3328 0 0 1-16.2816 16.3328zM634.2656 695.1936H391.2704a16.2816 16.2816 0 0 1-16.3328-16.2816v-4.6592a137.8304 137.8304 0 1 1 275.6096 0v4.6592a16.2816 16.2816 0 0 1-16.2816 16.2816z m-226.0992-32.5632h209.152a105.216 105.216 0 0 0-209.152 0zM585.984 274.2272H439.5008a16.2816 16.2816 0 0 1-16.2816-16.2816V179.712a16.3328 16.3328 0 0 1 16.2816-16.2816h146.4832a16.2816 16.2816 0 0 1 16.2816 16.2816v78.2336a16.2816 16.2816 0 0 1-16.2816 16.2816zM455.68 241.664h113.8688v-45.6192H455.68z" p-id="5677" fill="#13227a"></path><path d="M619.9296 357.5296H405.5552A16.2816 16.2816 0 0 1 389.12 341.248V258.048a16.2816 16.2816 0 0 1 16.2816-16.3328h214.3744a16.3328 16.3328 0 0 1 16.3328 16.3328v83.2a16.2816 16.2816 0 0 1-16.1792 16.2816z m-198.0928-32.5632h181.8112v-50.6368H421.8368z" p-id="5678" fill="#13227a"></path><path d="M512.768 449.0752A16.4352 16.4352 0 0 1 502.272 445.44L397.4144 357.4272a16.3328 16.3328 0 0 1 10.24-28.7744h209.92a16.2816 16.2816 0 0 1 10.24 28.7744L523.2128 445.44a16.384 16.384 0 0 1-10.4448 3.6352zM452.7104 361.2672l60.0576 50.2784 60.0064-50.2784z" p-id="5679" fill="#13227a"></path><path d="M512.9216 522.24A16.2816 16.2816 0 0 1 496.64 505.9584v-76.8a16.3328 16.3328 0 0 1 32.6144 0v76.8a16.2816 16.2816 0 0 1-16.3328 16.2816z" p-id="5680" fill="#13227a"></path></svg>
|
||||
|
Before Width: | Height: | Size: 2.6 KiB |
@ -1,10 +1,3 @@
|
||||
/*
|
||||
* @Author: zwq
|
||||
* @Date: 2021-11-15 08:20:28
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-11-15 17:17:47
|
||||
* @Description:
|
||||
*/
|
||||
import Mock from 'mockjs'
|
||||
import * as common from './modules/common'
|
||||
import * as jobSchedule from './modules/job-schedule'
|
||||
@ -18,14 +11,14 @@ import * as sysUser from './modules/sys-user'
|
||||
// tips
|
||||
// 1. 开启/关闭[业务模块]拦截, 通过调用fnCreate方法[isOpen参数]设置.
|
||||
// 2. 开启/关闭[业务模块中某个请求]拦截, 通过函数返回对象中的[isOpen属性]设置.
|
||||
fnCreate(common, true)
|
||||
fnCreate(jobSchedule, true)
|
||||
fnCreate(oss, true)
|
||||
fnCreate(sysConfig, true)
|
||||
fnCreate(sysLog, true)
|
||||
fnCreate(sysMenu, true)
|
||||
fnCreate(sysRole, true)
|
||||
fnCreate(sysUser, true)
|
||||
fnCreate(common, false)
|
||||
fnCreate(jobSchedule, false)
|
||||
fnCreate(oss, false)
|
||||
fnCreate(sysConfig, false)
|
||||
fnCreate(sysLog, false)
|
||||
fnCreate(sysMenu, false)
|
||||
fnCreate(sysRole, false)
|
||||
fnCreate(sysUser, false)
|
||||
|
||||
/**
|
||||
* 创建mock模拟数据
|
||||
|
||||
@ -34,9 +34,6 @@ const mainRoutes = {
|
||||
// 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否
|
||||
// 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
|
||||
{ path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页' } },
|
||||
{ path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工' } },
|
||||
{ path: '/exWarehouse', component: _import('common/ex-warehouse'), name: 'exWarehouse', meta: { title: '货物出库' } },
|
||||
{ path: '/addProcess', component: _import('common/add-process'), name: 'addProcess', meta: { title: '追加加工' } },
|
||||
{ path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } },
|
||||
{ path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } },
|
||||
{ path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } }
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2021-11-15 15:18:18
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-11-15 15:18:19
|
||||
* @Description:
|
||||
-->
|
||||
@ -1,105 +0,0 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2021-11-15 15:17:30
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-11-16 16:59:23
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<div class="mainDiv" style="margin:10px 0 100px">
|
||||
<div class="flexDiv">
|
||||
<div class="wareBox" :class="[count > Math.round(Math.random()*10)?'enableBox':'disableBox',{active:count===isActive}]" v-for="count in 10" v-bind:key="count">
|
||||
<div class="plat">库位{{ count }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexDiv">
|
||||
<div class="wareBox" :class="[count > Math.round(Math.random()*10)?'enableBox':'disableBox',{active:count===isActive}]" v-for="count in 10" v-bind:key="count">
|
||||
<div class="plat">库位{{ count }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="line"></div>
|
||||
<div class="mainDiv" style="margin:100px 0 10px">
|
||||
<div class="flexDiv">
|
||||
<div class="wareBox end-plat" v-for="count in 4" v-bind:key="count">
|
||||
<div class="plat">提升台{{ count }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
isActive: ''
|
||||
}
|
||||
},
|
||||
created () {},
|
||||
methods: {}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.mainDiv{
|
||||
border: 2px solid rgb(145, 174, 255);
|
||||
padding: 20px 0;
|
||||
}
|
||||
.flexDiv {
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
-webkit-justify-content: space-around;
|
||||
justify-content: space-around;
|
||||
}
|
||||
/* 边框特效 */
|
||||
.wareBox:hover {
|
||||
background: linear-gradient(to left, deepskyblue, deepskyblue) left top
|
||||
no-repeat,
|
||||
linear-gradient(to bottom, deepskyblue, deepskyblue) left top no-repeat,
|
||||
linear-gradient(to left, deepskyblue, deepskyblue) right top no-repeat,
|
||||
linear-gradient(to bottom, deepskyblue, deepskyblue) right top no-repeat,
|
||||
linear-gradient(to left, deepskyblue, deepskyblue) left bottom no-repeat,
|
||||
linear-gradient(to bottom, deepskyblue, deepskyblue) left bottom no-repeat,
|
||||
linear-gradient(to left, deepskyblue, deepskyblue) right bottom no-repeat,
|
||||
linear-gradient(to left, deepskyblue, deepskyblue) right bottom no-repeat;
|
||||
background-size: 5px 30px, 30px 5px;
|
||||
color: black;
|
||||
border-radius: 5px;
|
||||
background-color: rgb(190, 224, 241);
|
||||
}
|
||||
.wareBox {
|
||||
cursor: pointer;
|
||||
margin: 10px;
|
||||
height: 100px;
|
||||
padding: 10px;
|
||||
line-height: 90px;
|
||||
text-align: center;
|
||||
border: 2px solid #cdcdc5;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.plat {
|
||||
min-width: 80px;
|
||||
}
|
||||
.line {
|
||||
margin: 20px 0;
|
||||
height: 2px;
|
||||
background-color: gray;
|
||||
border-left: 200px solid #ddd;
|
||||
border-right: 200px solid #ddd;
|
||||
}
|
||||
.enableBox{
|
||||
background: rgb(0, 189, 16);
|
||||
}
|
||||
.disableBox{
|
||||
background: #ddd;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
.end-plat{
|
||||
background-color: rgb(195, 246, 255);
|
||||
}
|
||||
.active{
|
||||
border: 2px solid red;
|
||||
}
|
||||
</style>
|
||||
@ -1,164 +1,39 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-row type="flex" justify="space-around">
|
||||
<el-col :span="6">
|
||||
<el-card class="box-card" shadow="hover" @click.native="$router.push({ name: 'orderProcess' })">
|
||||
<icon-svg class="iconClass" name="guolu"></icon-svg>
|
||||
<h2>进工业炉加工</h2>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-card class="box-card" shadow="hover" @click.native="$router.push({ name: 'exWarehouse' })">
|
||||
<icon-svg class="iconClass" name="chuku"></icon-svg>
|
||||
<h2>出库</h2>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-card class="box-card" shadow="hover" @click.native="$router.push({ name: 'addProcess' })">
|
||||
<icon-svg class="iconClass" name="zaijiagong"></icon-svg>
|
||||
<h2>追加加工</h2>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div class="mod-log">
|
||||
<h3>当前任务列表</h3>
|
||||
<el-table
|
||||
:data="dataList"
|
||||
border
|
||||
height="600px"
|
||||
v-loading="dataListLoading"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-table-column
|
||||
type="index"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="序号"
|
||||
width="50"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="id"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="任务编号"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="username"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="标识卡"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="operation"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="物料名"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="method"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="客户"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="params11"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="窑炉"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="time"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="当前状态"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="ip"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="任务类型"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createDate"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="开始位置"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createDate"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="目标位置"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="createDate"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="库位"
|
||||
>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="mod-home">
|
||||
<h3>项目介绍</h3>
|
||||
<ul>
|
||||
<li>renren-fast-vue基于vue、element-ui构建开发，实现<a href="https://gitee.com/renrenio/renren-fast" target="_blank">renren-fast</a>后台管理前端功能，提供一套更优的前端解决方案</li>
|
||||
<li>前后端分离，通过token进行数据交互，可独立部署</li>
|
||||
<li>主题定制，通过scss变量统一一站式定制</li>
|
||||
<li>动态菜单，通过菜单管理统一管理访问路由</li>
|
||||
<li>数据切换，通过mock配置对接口数据／mock模拟数据进行切换</li>
|
||||
<li>发布时，可动态配置CDN静态资源／切换新旧版本</li>
|
||||
<li>演示地址：<a href="http://demo.open.renren.io/renren-fast" target="_blank">http://demo.open.renren.io/renren-fast</a> (账号密码：admin/admin)</li>
|
||||
</ul>
|
||||
<h3>获取帮助</h3>
|
||||
<ul>
|
||||
<li>官方社区：<a href="https://www.renren.io/community" target="_blank">https://www.renren.io/community</a></li>
|
||||
<li>前端Git地址：<a href="https://github.com/renrenio/renren-fast-vue" target="_blank">https://github.com/renrenio/renren-fast-vue</a></li>
|
||||
<li>后台Git地址：<a href="https://gitee.com/renrenio/renren-fast" target="_blank">https://gitee.com/renrenio/renren-fast</a></li>
|
||||
<li>代码生成器：<a href="https://gitee.com/renrenio/renren-generator" target="_blank">https://gitee.com/renrenio/renren-generator</a></li>
|
||||
<li>如需关注项目最新动态，请Watch、Star项目，同时也是对项目最好的支持</li>
|
||||
</ul>
|
||||
<h3>官方QQ群</h3>
|
||||
<ul>
|
||||
<li>高级群：324780204(大牛云集，跟大牛学习新技能)</li>
|
||||
<li>普通群：145799952(学习交流，互相解答各种疑问)</li>
|
||||
</ul>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
dataList: [],
|
||||
pageIndex: 1,
|
||||
pageSize: 10,
|
||||
dataListLoading: false
|
||||
export default {
|
||||
}
|
||||
},
|
||||
created () {
|
||||
this.getDataList()
|
||||
},
|
||||
methods: {
|
||||
// 获取数据列表
|
||||
getDataList () {
|
||||
this.dataListLoading = true
|
||||
this.$http({
|
||||
url: this.$http.adornUrl('/sys/log/list'),
|
||||
method: 'get',
|
||||
params: this.$http.adornParams({
|
||||
page: this.pageIndex,
|
||||
limit: this.pageSize
|
||||
})
|
||||
}).then(({ data }) => {
|
||||
if (data && data.code === 0) {
|
||||
this.dataList = data.page.list
|
||||
} else {
|
||||
this.dataList = []
|
||||
}
|
||||
this.dataListLoading = false
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.mod-log {
|
||||
margin-top: 100px;
|
||||
}
|
||||
.box-card{
|
||||
background-color: rgb(235, 254, 255);
|
||||
text-align: center;
|
||||
cursor: pointer;
|
||||
}
|
||||
.iconClass{
|
||||
width: 100px;
|
||||
height: 100px;
|
||||
}
|
||||
<style>
|
||||
.mod-home {
|
||||
line-height: 1.5;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
@ -1,102 +0,0 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
:title="!dataForm.id ? '新增' : '修改'"
|
||||
:close-on-click-modal="false"
|
||||
:visible.sync="visible">
|
||||
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
|
||||
<el-form-item label="标识卡" prop="paramKey">
|
||||
<el-input v-model="dataForm.paramKey" placeholder="标识卡"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="产品名称" prop="paramValue">
|
||||
<el-input v-model="dataForm.paramValue" placeholder="产品名称"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="数量" prop="number">
|
||||
<el-input v-model="dataForm.remark" placeholder="数量"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="重量" prop="remark">
|
||||
<el-input v-model="dataForm.remark" placeholder="重量"></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
visible: false,
|
||||
dataForm: {
|
||||
id: 0,
|
||||
paramKey: '',
|
||||
paramValue: '',
|
||||
remark: ''
|
||||
},
|
||||
dataRule: {
|
||||
paramKey: [
|
||||
{ required: true, message: '参数名不能为空', trigger: 'blur' }
|
||||
],
|
||||
paramValue: [
|
||||
{ required: true, message: '参数值不能为空', trigger: 'blur' }
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
init (id) {
|
||||
this.dataForm.id = id || 0
|
||||
this.visible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs['dataForm'].resetFields()
|
||||
if (this.dataForm.id) {
|
||||
this.$http({
|
||||
url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
|
||||
method: 'get',
|
||||
params: this.$http.adornParams()
|
||||
}).then(({data}) => {
|
||||
if (data && data.code === 0) {
|
||||
this.dataForm.paramKey = data.config.paramKey
|
||||
this.dataForm.paramValue = data.config.paramValue
|
||||
this.dataForm.remark = data.config.remark
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
// 表单提交
|
||||
dataFormSubmit () {
|
||||
this.$refs['dataForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$http({
|
||||
url: this.$http.adornUrl(`/sys/config/${!this.dataForm.id ? 'save' : 'update'}`),
|
||||
method: 'post',
|
||||
data: this.$http.adornData({
|
||||
'id': this.dataForm.id || undefined,
|
||||
'paramKey': this.dataForm.paramKey,
|
||||
'paramValue': this.dataForm.paramValue,
|
||||
'remark': this.dataForm.remark
|
||||
})
|
||||
}).then(({data}) => {
|
||||
if (data && data.code === 0) {
|
||||
this.$message({
|
||||
message: '操作成功',
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
onClose: () => {
|
||||
this.visible = false
|
||||
this.$emit('refreshDataList')
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$message.error(data.msg)
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -1,75 +0,0 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2021-11-15 17:43:13
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-11-15 18:20:05
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:title="!pointType ? '选择起点' : '选择窑炉'"
|
||||
:close-on-click-modal="false"
|
||||
:visible.sync="visible"
|
||||
>
|
||||
<div class="wareBox" v-for="count in 4" v-bind:key="count" @click="setPoint(count)">
|
||||
<div class="plat">提升平台{{count}}</div>
|
||||
</div>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
visible: false,
|
||||
pointType: ''
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
init (pointType) {
|
||||
this.pointType = pointType
|
||||
this.visible = true
|
||||
this.$nextTick(() => {
|
||||
console.log(pointType)
|
||||
})
|
||||
},
|
||||
setPoint (count) {
|
||||
console.log(count, this.pointType)
|
||||
this.visible = false
|
||||
this.$emit('refreshPoint', count, this.pointType)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
/* 边框特效 */
|
||||
.wareBox:hover {
|
||||
background: linear-gradient(to left, deepskyblue, deepskyblue) left top
|
||||
no-repeat,
|
||||
linear-gradient(to bottom, deepskyblue, deepskyblue) left top no-repeat,
|
||||
linear-gradient(to left, deepskyblue, deepskyblue) right top no-repeat,
|
||||
linear-gradient(to bottom, deepskyblue, deepskyblue) right top no-repeat,
|
||||
linear-gradient(to left, deepskyblue, deepskyblue) left bottom no-repeat,
|
||||
linear-gradient(to bottom, deepskyblue, deepskyblue) left bottom no-repeat,
|
||||
linear-gradient(to left, deepskyblue, deepskyblue) right bottom no-repeat,
|
||||
linear-gradient(to left, deepskyblue, deepskyblue) right bottom no-repeat;
|
||||
background-size: 5px 30px, 30px 5px;
|
||||
color: black;
|
||||
border-radius: 5px;
|
||||
background-color: rgb(190, 224, 241);
|
||||
}
|
||||
.wareBox{
|
||||
cursor:pointer;
|
||||
margin: 10px;
|
||||
height: 100px;
|
||||
padding: 10px;
|
||||
line-height: 90px;
|
||||
text-align: center;
|
||||
border: 2px solid #cdcdc5;
|
||||
border-radius: 5px;
|
||||
}
|
||||
</style>
|
||||
@ -1,232 +0,0 @@
|
||||
<template>
|
||||
<div class="mod-config">
|
||||
<el-form :inline="true">
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item style="margin-left:8%">
|
||||
任务起点位置 :
|
||||
<el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startBtnName}}</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item style="margin-left:2%">
|
||||
窑炉 :
|
||||
<el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnBtnName}}</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item style="margin-left:10%">
|
||||
<el-button type="primary" @click="submitTask()">提交任务</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-table
|
||||
:data="dataList"
|
||||
border
|
||||
v-loading="dataListLoading"
|
||||
style="width: 100%;">
|
||||
<el-table-column
|
||||
type="index"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="序号"
|
||||
width="50">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="id"
|
||||
header-align="center"
|
||||
align="center"
|
||||
width="80"
|
||||
label="标识卡">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="paramKey"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="客户信息">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="paramValue"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="订单号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="remark"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="产品名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="card"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="材料号牌">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="number"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="数量">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="weight"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="重量">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="unit"
|
||||
header-align="center"
|
||||
align="center"
|
||||
label="单位">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
fixed="right"
|
||||
header-align="center"
|
||||
align="center"
|
||||
width="150"
|
||||
label="操作">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
|
||||
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-pagination
|
||||
@size-change="sizeChangeHandle"
|
||||
@current-change="currentChangeHandle"
|
||||
:current-page="pageIndex"
|
||||
:page-sizes="[10, 20, 50, 100]"
|
||||
:page-size="pageSize"
|
||||
:total="totalPage"
|
||||
layout="total, sizes, prev, pager, next, jumper">
|
||||
</el-pagination>
|
||||
<!-- 弹窗, 新增 / 修改 -->
|
||||
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
||||
<process-point v-if="processPointVisible" ref="processPoint" @refreshPoint="setPoint"></process-point>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import AddOrUpdate from './order-process-add'
|
||||
import ProcessPoint from './order-process-point'
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
startBtnName: '选择起点',
|
||||
kilnBtnName: '选择窑炉',
|
||||
dataList: [],
|
||||
pageIndex: 1,
|
||||
pageSize: 10,
|
||||
totalPage: 0,
|
||||
dataListLoading: false,
|
||||
addOrUpdateVisible: false,
|
||||
processPointVisible: false
|
||||
}
|
||||
},
|
||||
components: {
|
||||
AddOrUpdate,
|
||||
ProcessPoint
|
||||
},
|
||||
activated () {
|
||||
this.getDataList()
|
||||
},
|
||||
methods: {
|
||||
// 获取数据列表
|
||||
getDataList () {
|
||||
this.dataListLoading = true
|
||||
this.$http({
|
||||
url: this.$http.adornUrl('/sys/config/list'),
|
||||
method: 'get',
|
||||
params: this.$http.adornParams({
|
||||
'page': this.pageIndex,
|
||||
'limit': this.pageSize
|
||||
})
|
||||
}).then(({data}) => {
|
||||
if (data && data.code === 0) {
|
||||
this.dataList = data.page.list
|
||||
this.totalPage = data.page.totalCount
|
||||
} else {
|
||||
this.dataList = []
|
||||
this.totalPage = 0
|
||||
}
|
||||
this.dataListLoading = false
|
||||
})
|
||||
},
|
||||
// 每页数
|
||||
sizeChangeHandle (val) {
|
||||
this.pageSize = val
|
||||
this.pageIndex = 1
|
||||
this.getDataList()
|
||||
},
|
||||
// 当前页
|
||||
currentChangeHandle (val) {
|
||||
this.pageIndex = val
|
||||
this.getDataList()
|
||||
},
|
||||
// 新增 / 修改
|
||||
addOrUpdateHandle (id) {
|
||||
this.addOrUpdateVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addOrUpdate.init(id)
|
||||
})
|
||||
},
|
||||
// 获取点位
|
||||
getPoint (pointType) {
|
||||
this.processPointVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.processPoint.init(pointType)
|
||||
})
|
||||
},
|
||||
setPoint (count, pointType) {
|
||||
if (!pointType) {
|
||||
this.startBtnName = count
|
||||
} else {
|
||||
this.kilnBtnName = count
|
||||
}
|
||||
},
|
||||
submitTask () {
|
||||
if (this.dataList.length === 0) {
|
||||
this.$message({
|
||||
message: '任务为空，请新增一条托盘信息',
|
||||
type: 'warning'
|
||||
})
|
||||
} else if (this.startBtnName === '选择起点') {
|
||||
this.$message({
|
||||
message: '请选择任务起点',
|
||||
type: 'warning'
|
||||
})
|
||||
} else if (this.kilnBtnName === '选择窑炉') {
|
||||
this.$message({
|
||||
message: '请选择窑炉',
|
||||
type: 'warning'
|
||||
})
|
||||
}
|
||||
},
|
||||
// 删除
|
||||
deleteHandle (id) {
|
||||
this.$confirm(`确定对[id=${id}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.$http({
|
||||
url: this.$http.adornUrl('/sys/config/delete'),
|
||||
method: 'post',
|
||||
data: this.$http.adornData(id, false)
|
||||
}).then(({data}) => {
|
||||
if (data && data.code === 0) {
|
||||
this.$message({
|
||||
message: '操作成功',
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
onClose: () => {
|
||||
this.getDataList()
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$message.error(data.msg)
|
||||
}
|
||||
})
|
||||
}).catch(() => {})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -6,24 +6,10 @@
|
||||
:collapse="sidebarFold"
|
||||
:collapseTransition="false"
|
||||
class="site-sidebar__menu">
|
||||
<el-submenu index="orderProcess">
|
||||
<template slot="title">
|
||||
<el-menu-item index="home" @click="$router.push({ name: 'home' })">
|
||||
<icon-svg name="shouye" class="site-sidebar__menu-icon"></icon-svg>
|
||||
<span slot="title" @click="$router.push({ name: 'home' })">首页</span>
|
||||
</template>
|
||||
<el-menu-item index="orderProcess" @click="$router.push({ name: 'orderProcess' })">
|
||||
<icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
|
||||
<span slot="title">订单加工</span>
|
||||
<span slot="title">首页</span>
|
||||
</el-menu-item>
|
||||
<el-menu-item index="exWarehouse" @click="$router.push({ name: 'exWarehouse' })">
|
||||
<icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
|
||||
<span slot="title">货物出库</span>
|
||||
</el-menu-item>
|
||||
<el-menu-item index="addProcess" @click="$router.push({ name: 'addProcess' })">
|
||||
<icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
|
||||
<span slot="title">追加加工</span>
|
||||
</el-menu-item>
|
||||
</el-submenu>
|
||||
<el-submenu index="demo">
|
||||
<template slot="title">
|
||||
<icon-svg name="shoucang" class="site-sidebar__menu-icon"></icon-svg>
|
||||
|
||||
@ -1,21 +1,14 @@
|
||||
/*
|
||||
* @Author: zwq
|
||||
* @Date: 2021-11-15 08:20:28
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-11-15 10:22:19
|
||||
* @Description:
|
||||
*/
|
||||
/**
|
||||
* 开发环境
|
||||
*/
|
||||
;(function () {
|
||||
window.SITE_CONFIG = {}
|
||||
window.SITE_CONFIG = {};
|
||||
|
||||
// api接口请求地址
|
||||
window.SITE_CONFIG['baseUrl'] = 'http://demo.open.renren.io/renren-fast-server'
|
||||
window.SITE_CONFIG['baseUrl'] = 'http://localhost:8080/renren-fast';
|
||||
|
||||
// cdn地址 = 域名 + 版本号
|
||||
window.SITE_CONFIG['domain'] = './' // 域名
|
||||
window.SITE_CONFIG['version'] = '' // 版本号(年月日时分)
|
||||
window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version
|
||||
})()
|
||||
window.SITE_CONFIG['domain'] = './'; // 域名
|
||||
window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分)
|
||||
window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version;
|
||||
})();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user