suojin
/
jonhon-mes-web
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

样式调整

Browse Source
master
zhangdi 3 months ago
parent 1b208adfd2
commit f486cab5d7
4 changed files with 189 additions and 193 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      index.html
  2. 2
      public/js/Sortable.min.js
  3. 2
      src/page/index/sidebar/index.vue
  4. 252
      src/views/tankSolutionSystem/info.vue

2
index.html
Unescape View File

@ -18,6 +18,8 @@
<link rel='stylesheet' href='/iconfont/common/iconfont.css'> <link rel='stylesheet' href='/iconfont/common/iconfont.css'>
<link rel='stylesheet' href='/css/loading.css'> <link rel='stylesheet' href='/css/loading.css'>
<link rel='stylesheet' href='/css/saber.css'> <link rel='stylesheet' href='/css/saber.css'>
<!-- 导入需要的包 （一定要放到index.html中的head标签里） -->
<script src="/js/Sortable.min.js"></script>
<title>电镀智能化生产管理系统</title> <title>电镀智能化生产管理系统</title>
</head> </head>

2
public/js/Sortable.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/page/index/sidebar/index.vue
Unescape View File

@ -574,7 +574,7 @@ export default {
} }
.radio_four_menu{ .radio_four_menu{
width: 220px !important; // width: 220px !important;
margin: 0 auto !important; margin: 0 auto !important;
color: #fff !important; color: #fff !important;
} }

252
src/views/tankSolutionSystem/info.vue
Unescape View File

@ -3,37 +3,32 @@
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud" <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad" > @refresh-change="refreshChange" @on-load="onLoad">
<template #menu-left> <template #menu-left>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" <el-button type="danger" icon="el-icon-delete" @click="handleDelete">删 除
>删 除
</el-button> </el-button>
<el-button <el-button type="success" icon="el-icon-upload" @click="handleImport">导入
type="success"
icon="el-icon-upload"
@click="handleImport"
>导入
</el-button> </el-button>
<el-button <el-button type="primary" icon="el-icon-setting" @click="handleSetting">批量设置
type="primary"
icon="el-icon-setting"
@click="handleSetting"
>批量设置
</el-button> </el-button>
</template> </template>
<template #menu="{ row }"> <template #menu="{ row }">
<el-button type="primary" text plain style="border: 0; background-color: transparent !important" <el-button type="primary" text plain style="border: 0; background-color: transparent !important"
size="medium" @click.stop="handleIssue(row)" > size="medium" @click.stop="handleIssue(row)">
<el-icon><Pointer /></el-icon> 下发 <el-icon>
<Pointer />
</el-icon> 下发
</el-button> </el-button>
</template> </template>
<template #targetLimit-form="{type}"> <template #targetLimit-form="{ type }">
<div style="width: 100%;display: flex;justify-content: space-between;" v-show="type == 'add' || type == 'edit'"> <div style="width: 100%;display: flex;justify-content: space-between;"
<el-input style="width: 47%;" placeholder="请输入"></el-input>~<el-input style="width: 47%;" placeholder="请输入"></el-input> v-show="type == 'add' || type == 'edit'">
<el-input style="width: 47%;" placeholder="请输入"></el-input>~<el-input style="width: 47%;"
placeholder="请输入"></el-input>
</div> </div>
<div v-show="type == 'view'">5 ~ 10</div> <div v-show="type == 'view'">5 ~ 10</div>
</template> </template>
<template #assayCycle1-form="{type}"> <template #assayCycle1-form="{ type }">
<div style="width: 100%;" v-show="type == 'add' || type == 'edit'"> <div style="width: 100%;" v-show="type == 'add' || type == 'edit'">
<el-select style="width: 200px;margin-bottom: 10px;"> <el-select style="width: 200px;margin-bottom: 10px;">
<el-option label="每周" :value="1"></el-option> <el-option label="每周" :value="1"></el-option>
@ -66,12 +61,8 @@
<el-dialog title="批量设置" append-to-body v-model="setBox" width="555px"> <el-dialog title="批量设置" append-to-body v-model="setBox" width="555px">
<el-form v-model="settingForm" label-width="80px"> <el-form v-model="settingForm" label-width="80px">
<el-form-item label="有效期"> <el-form-item label="有效期">
<el-date-picker <el-date-picker v-model="settingForm.reallyDate" type="date" style="width: 100%;"
v-model="settingForm.reallyDate" placeholder="请选择有效期" />
type="date"
style="width: 100%;"
placeholder="请选择有效期"
/>
</el-form-item> </el-form-item>
<el-form-item label="主管工艺"> <el-form-item label="主管工艺">
<el-select v-model="settingForm.chargeCraft"></el-select> <el-select v-model="settingForm.chargeCraft"></el-select>
@ -89,15 +80,18 @@
<script> <script>
export default { export default {
data(){ data() {
return{ return {
excelBox:false, excelBox: false,
loading:false, loading: false,
setBox:false, setBox: false,
data:[], data: [],
settingForm:{}, settingForm: {},
checkList:[1,2,3,4,5,6,7], checkList: [1, 2, 3, 4, 5, 6, 7],
option:{ option: {
// sortable:true,
rowSort: false,
columnSort: true,
tip: false, tip: false,
size: 'medium', size: 'medium',
simplePage: true, simplePage: true,
@ -112,7 +106,7 @@ export default {
viewBtn: true, viewBtn: true,
delBtn: true, delBtn: true,
editBtnText: '修改', editBtnText: '修改',
viewBtnText:'详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
menuWidth: 330, menuWidth: 330,
dialogWidth: 1200, dialogWidth: 1200,
@ -124,16 +118,16 @@ export default {
excelBtn: true, excelBtn: true,
index: false, index: false,
showOverflowTooltip: true, showOverflowTooltip: true,
column:[ column: [
{ {
label: '作业中心', label: '作业中心',
prop: 'wcName', prop: 'wcName',
type: 'select', type: 'select',
sortable: true, sortable: true,
width:150, width: 150,
filter: true, filter: true,
span: 8, span: 8,
search:true, search: true,
rules: [ rules: [
{ {
required: true, required: true,
@ -156,9 +150,9 @@ export default {
label: '槽号', label: '槽号',
prop: 'slotNo', prop: 'slotNo',
search: true, search: true,
type:'select', type: 'select',
sortable: true, sortable: true,
width:120, width: 120,
filter: true, filter: true,
span: 8, span: 8,
dicData: [ dicData: [
@ -184,7 +178,7 @@ export default {
prop: 'testEle', prop: 'testEle',
search: false, search: false,
sortable: true, sortable: true,
width:120, width: 120,
filter: true, filter: true,
span: 8, span: 8,
rules: [ rules: [
@ -200,7 +194,7 @@ export default {
prop: 'proContent', prop: 'proContent',
search: false, search: false,
sortable: true, sortable: true,
width:120, width: 120,
filter: true, filter: true,
span: 8, span: 8,
rules: [ rules: [
@ -216,9 +210,9 @@ export default {
prop: 'targetLimit', prop: 'targetLimit',
search: false, search: false,
sortable: true, sortable: true,
width:120, width: 120,
filter: true, filter: true,
hide:true, hide: true,
span: 8, span: 8,
rules: [ rules: [
{ {
@ -233,11 +227,11 @@ export default {
prop: 'targetUpperLimit', prop: 'targetUpperLimit',
search: false, search: false,
sortable: true, sortable: true,
width:120, width: 120,
filter: true, filter: true,
addDisplay:false, addDisplay: false,
viewDisplay:false, viewDisplay: false,
editDisplay:false, editDisplay: false,
span: 8, span: 8,
rules: [ rules: [
{ {
@ -252,10 +246,10 @@ export default {
prop: 'targetLowerLimit', prop: 'targetLowerLimit',
search: false, search: false,
sortable: true, sortable: true,
addDisplay:false, addDisplay: false,
viewDisplay:false, viewDisplay: false,
editDisplay:false, editDisplay: false,
width:120, width: 120,
filter: true, filter: true,
span: 8, span: 8,
rules: [ rules: [
@ -271,7 +265,7 @@ export default {
prop: 'targetValue', prop: 'targetValue',
search: false, search: false,
sortable: true, sortable: true,
width:120, width: 120,
filter: true, filter: true,
span: 8, span: 8,
rules: [ rules: [
@ -288,7 +282,7 @@ export default {
search: false, search: false,
type: 'select', type: 'select',
sortable: true, sortable: true,
width:120, width: 120,
filter: true, filter: true,
span: 8, span: 8,
rules: [ rules: [
@ -315,9 +309,9 @@ export default {
search: false, search: false,
type: 'select', type: 'select',
sortable: true, sortable: true,
width:120, width: 120,
filter: true, filter: true,
hide:true, hide: true,
span: 8, span: 8,
rules: [ rules: [
{ {
@ -343,9 +337,9 @@ export default {
disabled: true, disabled: true,
search: false, search: false,
sortable: true, sortable: true,
width:120, width: 120,
filter: true, filter: true,
hide:true, hide: true,
span: 8, span: 8,
rules: [ rules: [
{ {
@ -360,7 +354,7 @@ export default {
prop: 'addPoints', prop: 'addPoints',
search: false, search: false,
sortable: true, sortable: true,
width:120, width: 120,
filter: true, filter: true,
span: 8, span: 8,
rules: [ rules: [
@ -376,10 +370,10 @@ export default {
prop: 'assayCycle', prop: 'assayCycle',
search: false, search: false,
sortable: true, sortable: true,
addDisplay:false, addDisplay: false,
viewDisplay:false, viewDisplay: false,
editDisplay:false, editDisplay: false,
width:120, width: 120,
filter: true, filter: true,
span: 8, span: 8,
rules: [ rules: [
@ -395,8 +389,8 @@ export default {
prop: 'reallyDate', prop: 'reallyDate',
search: false, search: false,
sortable: true, sortable: true,
type:'date', type: 'date',
width:120, width: 120,
filter: true, filter: true,
span: 8, span: 8,
rules: [ rules: [
@ -412,10 +406,10 @@ export default {
prop: 'lastTest', prop: 'lastTest',
search: false, search: false,
sortable: true, sortable: true,
addDisplay:false, addDisplay: false,
viewDisplay:false, viewDisplay: false,
editDisplay:false, editDisplay: false,
width:150, width: 150,
filter: true, filter: true,
span: 8, span: 8,
rules: [ rules: [
@ -429,10 +423,10 @@ export default {
{ {
label: '槽液到期日期', label: '槽液到期日期',
prop: 'dueDate', prop: 'dueDate',
type:'date', type: 'date',
search: false, search: false,
sortable: true, sortable: true,
width:150, width: 150,
filter: true, filter: true,
span: 8, span: 8,
rules: [ rules: [
@ -446,10 +440,10 @@ export default {
{ {
label: '化验人', label: '化验人',
prop: 'userName', prop: 'userName',
type:'select', type: 'select',
search: false, search: false,
sortable: true, sortable: true,
width:120, width: 120,
filter: true, filter: true,
span: 8, span: 8,
rules: [ rules: [
@ -463,10 +457,10 @@ export default {
{ {
label: '主管工艺', label: '主管工艺',
prop: 'chargeCraft', prop: 'chargeCraft',
type:'select', type: 'select',
search: false, search: false,
sortable: true, sortable: true,
width:120, width: 120,
filter: true, filter: true,
span: 16, span: 16,
rules: [ rules: [
@ -482,10 +476,10 @@ export default {
prop: 'updateTime', prop: 'updateTime',
search: false, search: false,
sortable: true, sortable: true,
width:120, width: 120,
addDisplay:false, addDisplay: false,
viewDisplay:false, viewDisplay: false,
editDisplay:false, editDisplay: false,
filter: true, filter: true,
span: 8, span: 8,
rules: [ rules: [
@ -501,8 +495,8 @@ export default {
prop: 'assayCycle1', prop: 'assayCycle1',
search: false, search: false,
sortable: true, sortable: true,
hide:true, hide: true,
width:120, width: 120,
filter: true, filter: true,
span: 24, span: 24,
rules: [ rules: [
@ -515,7 +509,7 @@ export default {
}, },
] ]
}, },
form:{ form: {
}, },
page: { page: {
@ -523,7 +517,7 @@ export default {
currentPage: 1, currentPage: 1,
total: 0, total: 0,
}, },
excelOption:{ excelOption: {
submitBtn: false, submitBtn: false,
emptyBtn: false, emptyBtn: false,
column: [ column: [
@ -550,11 +544,11 @@ export default {
}, },
} }
}, },
mounted(){ mounted() {
}, },
methods:{ methods: {
getName(val){ getName(val) {
return val == 1 ? '周一' : val == 2 ? '周二' : val == 3 ? '周三' : val == 4 ? '周四' : val == 5 ? '周五' : val == 6 ? '周六' : '周日' return val == 1 ? '周一' : val == 2 ? '周二' : val == 3 ? '周三' : val == 4 ? '周四' : val == 5 ? '周五' : val == 6 ? '周六' : '周日'
}, },
handleImport() { handleImport() {
@ -614,14 +608,14 @@ export default {
}).then(() => { }).then(() => {
}) })
}, },
handleSetting(){ handleSetting() {
if (this.selectionList.length === 0) { if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据'); this.$message.warning('请选择至少一条数据');
return; return;
} }
this.setBox = true this.setBox = true
}, },
handleIssue(row){ handleIssue(row) {
this.$confirm('此操作将产生新的任务, 是否继续?', { this.$confirm('此操作将产生新的任务, 是否继续?', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -629,58 +623,56 @@ export default {
}).then(() => { }).then(() => {
}) })
}, },
onLoad(){ onLoad() {
this.loading = true this.loading = true
this.data = [ this.data = [
{ {
id:'1', id: '1',
wcName:'化学镀镍作业中心', wcName: '化学镀镍作业中心',
slotNo:'11#氰化镀铜槽', slotNo: '11#氰化镀铜槽',
testEle:'碳酸钠', testEle: '碳酸钠',
proContent:'0', proContent: '0',
targetUpperLimit:'10', targetUpperLimit: '10',
targetLowerLimit:'5', targetLowerLimit: '5',
targetValue:'3', targetValue: '3',
drugName:'111', drugName: '111',
addPoints:'0', addPoints: '0',
assayCycle:'7', assayCycle: '7',
reallyDate:'2025-10-09', reallyDate: '2025-10-09',
lastTest:'2023-06-13', lastTest: '2023-06-13',
dueDate:'2023-06-20', dueDate: '2023-06-20',
userName:'崔殿龙', userName: '崔殿龙',
chargeCraft:'崔殿龙', chargeCraft: '崔殿龙',
updateTime:'2024-01-12' updateTime: '2024-01-12'
}, },
{ {
id:'2', id: '2',
wcName:'化学镀镍作业中心', wcName: '化学镀镍作业中心',
slotNo:'22#氰化镀铜槽', slotNo: '22#氰化镀铜槽',
testEle:'碳酸钠', testEle: '碳酸钠',
proContent:'0', proContent: '0',
targetUpperLimit:'10', targetUpperLimit: '10',
targetLowerLimit:'5', targetLowerLimit: '5',
targetValue:'3', targetValue: '3',
drugName:'111', drugName: '111',
addPoints:'0', addPoints: '0',
assayCycle:'7', assayCycle: '7',
reallyDate:'2025-10-09', reallyDate: '2025-10-09',
lastTest:'2023-06-13', lastTest: '2023-06-13',
dueDate:'2023-06-20', dueDate: '2023-06-20',
userName:'崔殿龙', userName: '崔殿龙',
chargeCraft:'崔殿龙', chargeCraft: '崔殿龙',
updateTime:'2024-01-12' updateTime: '2024-01-12'
} }
] ]
this.page.total = this.data.length this.page.total = this.data.length
this.loading = false this.loading = false
setTimeout(() =>{ setTimeout(() => {
this.selectionClear() this.selectionClear()
},500) }, 500)
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped></style>
</style>
Write Preview
Loading…
Cancel
Save