yangchunjin/SoonWorkerD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化bug

Browse Source
This commit is contained in:
24kycj
2026-01-19 02:46:47 +08:00
parent 9c471a494c
commit b277ef38b3
8 changed files with 374 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/components/tabBar/tabBar.vue
+21 -12
View File
@@ -8,8 +8,9 @@
</div>
<div class="top_left_line"></div>
<div class="flex_box flex_col_top tab_box">
<div @click="goPath(item)" v-for="item in tabs" :key="item.id" class="flex_box flex_row_center flex_col tab_item" :class="{'tab_item1': active===item.id}">
<div class="tab_name">{{item.name}}</div>
<div @click="goPath(item)" v-for="item in tabs" :key="item.id"
class="flex_box flex_row_center flex_col tab_item" :class="{ 'tab_item1': active === item.id }">
<div class="tab_name">{{ item.name }}</div>
<div class="tab_line"></div>
</div>
</div>
@@ -20,9 +21,9 @@
</template>
<script>
import { mapGetters } from 'vuex'
import UserInfo from '../userInfo/userInfo.vue';
export default {
import { mapGetters } from 'vuex'
import UserInfo from '../userInfo/userInfo.vue';
export default {
name: 'TabBar',
components: { UserInfo },
props: {
@@ -31,7 +32,7 @@
default: 1
}
},
data () {
data() {
return {
tabs: [
{
@@ -67,38 +68,42 @@
this.$router.replace(e.path)
}
}
}
}
</script>
<style lang="scss" scoped>
.top_box {
.top_box {
height: 86px;
padding: 0 32px;
background-color: #ffffff;
border-bottom: 8px solid #F8F8F8;
.top_left {
.top_btn1 {
cursor: pointer;
padding: 0 16px;
height: 30px;
background: #00C325;
background: #009688;
border-radius: 4px;
margin-right: 16px;
font-weight: 500;
font-size: 15px;
color: #FFFFFF;
img {
width: 18px;
height: 18px;
margin-right: 8px;
}
}
.top_left_line {
width: 2px;
height: 30px;
background: #E0E0E0;
margin: 0 16px;
}
.tab_box {
.tab_item {
padding: 20px 16px;
@@ -107,25 +112,29 @@
color: #000000;
line-height: 24px;
cursor: pointer;
.tab_name {
padding-bottom: 4px;
}
.tab_line {
display: none;
width: 24px;
height: 4px;
background: #00C325;
background: #009688;
border-radius: 4px;
}
}
.tab_item1 {
color: #00C325;
color: #009688;
font-weight: bold;
.tab_line {
display: block;
}
}
}
}
}
}
</style>
src/renderer/components/userInfo/userInfo.vue
+9 -8
View File
@@ -1,17 +1,17 @@
<template>
<div>
<div class="flex_box top_right">
<div class="top_right_name">你好，{{name}}</div>
<div class="top_right_name">你好，{{ name }}</div>
<!-- <div @click="goOut" class="top_right_btn">登出</div> -->
</div>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
export default {
import { mapGetters } from 'vuex'
export default {
name: 'UserInfo',
data () {
data() {
return {
}
@@ -26,24 +26,25 @@
})
}
}
}
}
</script>
<style lang="scss" scoped>
.top_right {
.top_right {
.top_right_name {
font-weight: 500;
font-size: 21px;
color: #000000;
padding: 0 24px;
}
.top_right_btn {
font-weight: 500;
font-size: 21px;
color: #00C325;
color: #009688;
line-height: 50px;
padding-left: 24px;
cursor: pointer;
}
}
}
</style>
src/renderer/components/workAdd/workAdd.vue
+52 -43
View File
@@ -4,12 +4,11 @@
:close-on-click-modal="false" :show-close="false">
<div class="work_body" v-loading="submitLoading" element-loading-text="正在准备任务，您也可以直接右上角关闭作业窗口"
element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
<div
v-if="currentStep && parseInt(currentStep) >= 8"
class="bg_box"
style="position: absolute; top: 0; left: 0; z-index: 10; width: 100%; height: 100%; background-color: rgba(0, 0, 0, 0.5)"></div>
<div v-if="currentStep && parseInt(currentStep) >= 8" class="bg_box"
style="position: absolute; top: 0; left: 0; z-index: 10; width: 100%; height: 100%; background-color: rgba(0, 0, 0, 0.5)">
</div>
<div @click="close" class="close_box">
<img src="@/assets/images/Close_icon.png" />
<i class="el-icon-close"></i>
</div>
<div class="work_box">
<div class="flex_box flex_row_between work_top">
@@ -21,13 +20,14 @@
<div class="guide_desc">{{ guideStep[8].step }}</div>
<div class="guide_btns">
<el-button @click="exitGuide" class="guide_btn1" size="mini" type="text">跳过引导</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1" size="mini">上一步</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1"
size="mini">上一步</el-button>
<el-button @click="nextStep" class="guide_btn2" size="mini" type="primary">{{ currentStep ==
guideStep.length
- 1 ? '完成引导' : '下一步' }}</el-button>
</div>
</div>
<div class="flex_box" slot="reference" :class="{ 'guide_body': currentStep == 8}">
<div class="flex_box" slot="reference" :class="{ 'guide_body': currentStep == 8 }">
<div class="flex_box work_top_item">
<div class="work_top_label">光盘类型：</div>
<div class="work_top_val">
@@ -63,13 +63,14 @@
<div class="guide_desc">{{ guideStep[11].step }}</div>
<div class="guide_btns">
<el-button @click="exitGuide" class="guide_btn1" size="mini" type="text">跳过引导</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1" size="mini">上一步</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1"
size="mini">上一步</el-button>
<el-button @click="nextStep" class="guide_btn2" size="mini" type="primary">{{ currentStep ==
guideStep.length
- 1 ? '完成引导' : '下一步' }}</el-button>
</div>
</div>
<div slot="reference" :class="{ 'guide_body': currentStep == 11}">
<div slot="reference" :class="{ 'guide_body': currentStep == 11 }">
<div @click="openSetDialog" class="flex_box work_top_set">
<img src="@/assets/images/Setting_icon.png" />
<div>高级作业设置</div>
@@ -88,13 +89,14 @@
<div class="guide_desc">{{ guideStep[9].step }}</div>
<div class="guide_btns">
<el-button @click="exitGuide" class="guide_btn1" size="mini" type="text">跳过引导</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1" size="mini">上一步</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1"
size="mini">上一步</el-button>
<el-button @click="nextStep" class="guide_btn2" size="mini" type="primary">{{ currentStep ==
guideStep.length
- 1 ? '完成引导' : '下一步' }}</el-button>
</div>
</div>
<div slot="reference" :class="{ 'guide_body': currentStep == 9}">
<div slot="reference" :class="{ 'guide_body': currentStep == 9 }">
<div v-if="form.copy_type == 3 || form.copy_type == 4" class="flex_box flex_row_center work_no">
<img src="@/assets/images/ElBanCircle.png" />
</div>
@@ -119,7 +121,8 @@
<div class="work_files">
<div class="work_files_box">
<!-- 文件列表 -->
<files ref="files" :copyType="form.copy_type" :onSizechange="sizeChange" :complete="upload_over"></files>
<files ref="files" :copyType="form.copy_type" :onSizechange="sizeChange" :complete="upload_over">
</files>
</div>
<div class="work_files_progress">
<el-progress :text-inside="true" :percentage="file_percent" :format="format"
@@ -138,13 +141,14 @@
<div class="guide_desc">{{ guideStep[10].step }}</div>
<div class="guide_btns">
<el-button @click="exitGuide" class="guide_btn1" size="mini" type="text">跳过引导</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1" size="mini">上一步</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1"
size="mini">上一步</el-button>
<el-button @click="nextStep" class="guide_btn2" size="mini" type="primary">{{ currentStep ==
guideStep.length
- 1 ? '完成引导' : '下一步' }}</el-button>
</div>
</div>
<div slot="reference" :class="{ 'guide_body': currentStep == 10}">
<div slot="reference" :class="{ 'guide_body': currentStep == 10 }">
<!-- <div v-if="form.copy_type == 3" class="flex_box flex_row_center work_no">
<img src="@/assets/images/ElBanCircle.png" />
</div> -->
@@ -166,7 +170,7 @@
<img class="wook_soon_img" :src="soonImg" />
<div @click="showList = !showList" class="flex_box flex_row_center wook_soon_btn"
:class="{ wook_soon_btn1: !showList }">
<img src="@/assets/images/Arrow_up_icon.png" />
<i class="el-icon-arrow-up"></i>
</div>
</div>
<div class="wook_soon_list">
@@ -181,7 +185,8 @@
</div>
</div>
<div @click="openFile2" v-if="item.type == 3 || item.type == 4 || item.type == 5"
class="wook_soon_add">添加字段
class="wook_soon_add">
添加字段
</div>
</div>
</div>
@@ -213,13 +218,14 @@
<div class="guide_desc">{{ guideStep[12].step }}</div>
<div class="guide_btns">
<el-button @click="exitGuide" class="guide_btn1" size="mini" type="text">跳过引导</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1" size="mini">上一步</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1"
size="mini">上一步</el-button>
<el-button @click="nextStep" class="guide_btn2" size="mini" type="primary">{{ currentStep ==
guideStep.length
- 1 ? '完成引导' : '下一步' }}</el-button>
</div>
</div>
<div class="flex_box footer_btns" slot="reference" :class="{ 'guide_body': currentStep == 12}">
<div class="flex_box footer_btns" slot="reference" :class="{ 'guide_body': currentStep == 12 }">
<el-button type="primary" class="footer_save" @click="workSave" :loading="saveFlag">保存</el-button>
<el-button type="primary" class="footer_submit" @click="workSubmit" :loading="submitFlag">提交</el-button>
</div>
@@ -263,37 +269,37 @@
<div class="flex_box set_item">
<div class="set_label">刻录完成后校验光盘：</div>
<div class="set_val">
<el-switch v-model="setForm.isCheck" active-color="#07C160" inactive-color="#aaa"> </el-switch>
<el-switch v-model="setForm.isCheck" active-color="#009688" inactive-color="#aaa"> </el-switch>
</div>
</div>
<div class="flex_box set_item">
<div class="set_label">刻录完成后关闭光盘：</div>
<div class="set_val">
<el-switch v-model="setForm.isClose" active-color="#07C160" inactive-color="#aaa"> </el-switch>
<el-switch v-model="setForm.isClose" active-color="#009688" inactive-color="#aaa"> </el-switch>
</div>
</div>
<div class="flex_box set_item">
<div class="set_label">刻录完成后删除缓存：</div>
<div class="set_val">
<el-switch v-model="setForm.isDel" active-color="#07C160" inactive-color="#aaa"> </el-switch>
<el-switch v-model="setForm.isDel" active-color="#009688" inactive-color="#aaa"> </el-switch>
</div>
</div>
<div class="flex_box set_item">
<div class="set_label">作业失败打印标签：</div>
<div class="set_val">
<el-switch v-model="setForm.isPrint" active-color="#07C160" inactive-color="#aaa"> </el-switch>
<el-switch v-model="setForm.isPrint" active-color="#009688" inactive-color="#aaa"> </el-switch>
</div>
</div>
<div class="flex_box set_item">
<div class="set_label">允许跨盘：</div>
<div class="set_val">
<el-switch v-model="setForm.isArrow" active-color="#07C160" inactive-color="#aaa"> </el-switch>
<el-switch v-model="setForm.isArrow" active-color="#009688" inactive-color="#aaa"> </el-switch>
</div>
</div>
<div class="flex_box set_item">
<div class="set_label">是否虚拟刻录：</div>
<div class="set_val">
<el-switch v-model="setForm.is_sim" active-color="#07C160" inactive-color="#aaa"> </el-switch>
<el-switch v-model="setForm.is_sim" active-color="#009688" inactive-color="#aaa"> </el-switch>
</div>
</div>
<div v-if="setForm.isArrow" class="flex_box flex_col_top set_item">
@@ -796,7 +802,7 @@ export default {
return
}
if (that.form.copy_type == 3) {
if(that.cdList.length > 0) {
if (that.cdList.length > 0) {
that.$store
.dispatch('chat/websocketsend', {
req_name: 'openCDDevByPath',
@@ -1237,15 +1243,17 @@ export default {
.close_box {
position: absolute;
z-index: 99;
top: 0;
right: 0;
top: 24px;
right: 24px;
cursor: pointer;
padding: 24px 24px 0 0;
img {
width: 28px;
height: 28px;
}
width: 30px;
height: 30px;
color: #000;
border-radius: 4px;
display: flex;
align-items: center;
justify-content: center;
font-size: 30px;
}
.work_box {
@@ -1301,11 +1309,13 @@ export default {
font-weight: 500;
font-size: 18px;
color: #333;
&:hover {
background: rgba(0, 195, 37, 0.32);
border: 1px solid rgba(0, 195, 37, 0.32);
color: #00c325;
color: #009688;
}
img {
width: 22px;
height: 22px;
@@ -1362,10 +1372,11 @@ export default {
font-size: 16px;
color: #333;
margin-right: 22px;
&:hover {
background: rgba(0, 195, 37, 0.32);
border: 1px solid rgba(0, 195, 37, 0.32);
color: #00c325;
color: #009688;
}
img {
@@ -1515,15 +1526,12 @@ export default {
width: 56px;
height: 56px;
z-index: 9;
background: #ffffff;
background: #fff;
border-radius: 4px;
transition: all 0.5s;
cursor: pointer;
img {
width: 25px;
height: 16px;
}
color: #000;
font-size: 24px;
}
.wook_soon_btn1 {
@@ -1671,6 +1679,7 @@ export default {
border: 1px solid #999;
padding: 0;
margin-right: 22px;
&:hover {
background: #00bcc3;
color: #ffffff;
@@ -1680,7 +1689,7 @@ export default {
.footer_submit {
width: 166px;
height: 45px;
background: #00c325;
background: #009688;
border-radius: 4px;
font-weight: 500;
font-size: 19px;
@@ -1780,7 +1789,7 @@ export default {
.set_btn2 {
width: 120px;
height: 40px;
background: #00c325;
background: #009688;
border-radius: 4px;
font-weight: 500;
font-size: 16px;
src/renderer/views/dashboard/index.vue
+77 -69
View File
@@ -4,7 +4,8 @@
<div
v-if="beginStep && (currentStep || currentStep === 0) && parseInt(currentStep) < 8 && parseInt(currentStep) >= 0"
class="bg_box"
style="position: absolute; top: 0; left: 0; z-index: 10; width: 100%; height: 100%; background-color: rgba(0, 0, 0, 0.5)"></div>
style="position: absolute; top: 0; left: 0; z-index: 10; width: 100%; height: 100%; background-color: rgba(0, 0, 0, 0.5)">
</div>
<!-- 头部 -->
<div class="flex_box flex_row_between top_box">
<div class="flex_box top_left">
@@ -16,7 +17,8 @@
<div class="guide_desc">{{ guideStep[7].step }}</div>
<div class="guide_btns">
<el-button @click="exitGuide" class="guide_btn1" size="mini" type="text">跳过引导</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1" size="mini">上一步</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1"
size="mini">上一步</el-button>
<el-button @click="nextStep" class="guide_btn2" size="mini" type="primary">{{ currentStep ==
guideStep.length
- 1 ? '完成引导' : '下一步' }}</el-button>
@@ -41,13 +43,15 @@
<div class="guide_desc">{{ guideStep[6].step }}</div>
<div class="guide_btns">
<el-button @click="exitGuide" class="guide_btn1" size="mini" type="text">跳过引导</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1" size="mini">上一步</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1"
size="mini">上一步</el-button>
<el-button @click="nextStep" class="guide_btn2" size="mini" type="primary">{{ currentStep ==
guideStep.length
- 1 ? '完成引导' : '下一步' }}</el-button>
</div>
</div>
<div @click="goSet('/manage')" class="flex_box flex_row_center top_btn2" slot="reference" :class="{ 'guide_body': beginStep && currentStep == 6 }">
<div @click="goSet('/manage')" class="flex_box flex_row_center top_btn2" slot="reference"
:class="{ 'guide_body': beginStep && currentStep == 6 }">
<img src="@/assets/images/Setting_icon.png" />
<div>系统设置</div>
</div>
@@ -62,14 +66,16 @@
<div class="guide_desc">{{ guideStep[4].step }}</div>
<div class="guide_btns">
<el-button @click="exitGuide" class="guide_btn1" size="mini" type="text">跳过引导</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1" size="mini">上一步</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1"
size="mini">上一步</el-button>
<el-button @click="nextStep" class="guide_btn2" size="mini" type="primary">{{ currentStep ==
guideStep.length
- 1 ? '完成引导' : '下一步' }}</el-button>
</div>
</div>
<div slot="reference" class="flex_box flex_row_center top_left_status_box" :class="{ 'guide_body': beginStep && currentStep == 4 }">
<el-switch @change="serviceChange" class="top_left_status" :value="workStatus" active-color="#07C160"
<div slot="reference" class="flex_box flex_row_center top_left_status_box"
:class="{ 'guide_body': beginStep && currentStep == 4 }">
<el-switch @change="serviceChange" class="top_left_status" :value="workStatus" active-color="#009688"
inactive-color="#aaa"> </el-switch>
</div>
</el-popover>
@@ -82,7 +88,8 @@
<div class="guide_desc">{{ guideStep[5].step }}</div>
<div class="guide_btns">
<el-button @click="exitGuide" class="guide_btn1" size="mini" type="text">跳过引导</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1" size="mini">上一步</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1"
size="mini">上一步</el-button>
<el-button @click="nextStep" class="guide_btn2" size="mini" type="primary">{{ currentStep ==
guideStep.length
- 1 ? '完成引导' : '下一步' }}</el-button>
@@ -147,7 +154,8 @@
<div class="device_info_box">
<div class="device_info_main" :class="{ device_info_main1: infoStatus === 1 }">
<div class="device_info_item">
<div class="device_info_title">国产光盘刻录一体机 DP-{{ printer_info.printer_name }}<span v-if="printer_info.printer_path">({{ printer_info.printer_path }})</span></div>
<div class="device_info_title">国产光盘刻录一体机 DP-{{ printer_info.printer_name }}<span
v-if="printer_info.printer_path">({{ printer_info.printer_path }})</span></div>
<div class="flex_box flex_row_between device_info_options">
<div v-if="printer_info.strongList[2]" class="device_info_option">
<div class="device_info_option_box">
@@ -162,7 +170,8 @@
<el-dropdown trigger="click" :disabled="currentRunVal !== 6"
@command="(e) => handleCommandCD(e, 2)">
<div class="el-dropdown-link flex_box flex_row_center device_info_option_b">
<div class="device_info_option_b_text">{{ printer_info.printer_name && printer_info.printer_name.indexOf('SE3') > -1 ? '组合' :
<div class="device_info_option_b_text">{{ printer_info.printer_name &&
printer_info.printer_name.indexOf('SE3') > -1 ? '组合' :
CDTypes[changeCD.req_info.strong_list[1].strong_type] }} {{
printer_info.strongList[2].cd_num }}张</div>
<i v-if="currentRunVal === 6" class="el-icon-caret-bottom"></i>
@@ -188,7 +197,8 @@
<el-dropdown trigger="click" :disabled="currentRunVal !== 6"
@command="(e) => handleCommandCD(e, 1)">
<div class="el-dropdown-link flex_box flex_row_center device_info_option_b">
<div class="device_info_option_b_text">{{ printer_info.printer_name && printer_info.printer_name.indexOf('SE3') > -1 ? '组合' :
<div class="device_info_option_b_text">{{ printer_info.printer_name &&
printer_info.printer_name.indexOf('SE3') > -1 ? '组合' :
CDTypes[changeCD.req_info.strong_list[0].strong_type] }} {{
printer_info.strongList[1].cd_num }}张</div>
<i v-if="currentRunVal === 6" class="el-icon-caret-bottom"></i>
@@ -248,16 +258,17 @@
<div class="device_info_text">系统序列号：{{ printer_info.serial_no }}</div>
<div class="device_info_text">主机名：{{ printer_info.system_name }}</div>
<div class="device_info_text">主机IP：{{ printer_info.system_ip }}</div>
<div class="device_info_text">缓存空间：{{ $filterSize(printer_info.free_cache_space) }}（共{{ $filterSize(printer_info.total_cache_space) }}）</div>
<div class="device_info_text">缓存空间：{{ $filterSize(printer_info.free_cache_space) }}（共{{
$filterSize(printer_info.total_cache_space) }}）</div>
</div>
</div>
</div>
<div class="device_info_right">
<div v-if="infoStatus === 1" @click="infoStatus = 0" class="device_info_right_item">
<img src="@/assets/images/Arrow_right1_icon.png" />
<i class="el-icon-arrow-right"></i>
</div>
<div v-if="infoStatus === 0" @click="infoStatus = 1" class="device_info_right_item">
<img src="@/assets/images/Arrow_left1_icon.png" />
<i class="el-icon-arrow-left"></i>
</div>
</div>
</div>
@@ -293,13 +304,15 @@
<div class="guide_desc">{{ guideStep[1].step }}</div>
<div class="guide_btns">
<el-button @click="exitGuide" class="guide_btn1" size="mini" type="text">跳过引导</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1" size="mini">上一步</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1"
size="mini">上一步</el-button>
<el-button @click="nextStep" class="guide_btn2" size="mini" type="primary">{{ currentStep ==
guideStep.length
- 1 ? '完成引导' : '下一步' }}</el-button>
</div>
</div>
<div slot="reference" class="flex_box device_right_top" :class="{ 'guide_body': beginStep && currentStep == 1 }">
<div slot="reference" class="flex_box device_right_top"
:class="{ 'guide_body': beginStep && currentStep == 1 }">
<div class="flex_box flex_row_between device_right_top_item">
<div class="device_right_top_img">
<img v-if="cd_list[0].cd_status == 4 && cd_list[0].cd_type" src="@/assets/images/device3.png" />
@@ -369,7 +382,8 @@
<div class="guide_desc">{{ guideStep[2].step }}</div>
<div class="guide_btns">
<el-button @click="exitGuide" class="guide_btn1" size="mini" type="text">跳过引导</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1" size="mini">上一步</el-button>
<el-button v-if="parseInt(currentStep) > 0" @click="prevStep" class="guide_btn1"
size="mini">上一步</el-button>
<el-button @click="nextStep" class="guide_btn2" size="mini" type="primary">{{ currentStep ==
guideStep.length
- 1 ? '完成引导' : '下一步' }}</el-button>
@@ -479,13 +493,7 @@
<div class="footer_text" @click="dialogVisible = true">关于我们</div>
</div>
<!-- 开始用户引导 -->
<el-dialog
class="guide_dialog"
top="30vh"
:show-close="false"
title="温馨提示"
:visible.sync="showStep"
width="350px"
<el-dialog class="guide_dialog" top="30vh" :show-close="false" title="温馨提示" :visible.sync="showStep" width="350px"
:close-on-click-modal="false">
<div class="start_box">
<div class="start_content">欢迎使用卡树自动拷贝打印系统，我们将引导您使用本系统，请按照提示学习操作！</div>
@@ -493,22 +501,13 @@
<el-checkbox v-model="hideStep">本次引导结束，不再进入</el-checkbox>
</div>
<div class="flex_box flex_row_center start_btn">
<el-button
@click="startStep"
type="primary"
>开始引导</el-button
>
<el-button @click="startStep" type="primary">开始引导</el-button>
</div>
</div>
</el-dialog>
<!-- 新建作业 -->
<work-add v-if="workShow" @close="addClose" :isNew="isNew" :saveWorkList="saveWorkList"
ref="workAdd"></work-add>
<el-dialog
title="关于Disc Worker"
:visible.sync="dialogVisible"
width="400px"
>
<work-add v-if="workShow" @close="addClose" :isNew="isNew" :saveWorkList="saveWorkList" ref="workAdd"></work-add>
<el-dialog title="关于Disc Worker" :visible.sync="dialogVisible" width="400px">
<div class="about_box">
<div class="company-name">国产光盘打印刻录系统 DiscWorker</div>
<div class="version">版本1.0</div>
@@ -884,7 +883,7 @@ export default {
this.setStep()
this.guideStep = JSON.parse(localStorage.getItem('guideStep'))
this.currentStep = localStorage.getItem('currentStep')
if ((!localStorage.getItem('hideStep') || localStorage.getItem('hideStep') == 0)&&this.currentStep>-1) this.showStep = true
if ((!localStorage.getItem('hideStep') || localStorage.getItem('hideStep') == 0) && this.currentStep > -1) this.showStep = true
},
methods: {
// 服务打开/关闭
@@ -1204,25 +1203,25 @@ export default {
},
// 新建作业
showWork() {
if (!that.workStatus) {
that.$message({
message: '请先连接服务',
type: 'warning'
})
return
}
if (that.printer_info.is_set_cddev == 1) {
that.$confirm('上下光驱未设置，请前往设置', '温馨提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
that.goSet('/manage?type=cddev')
}).catch(() => {
// if (!that.workStatus) {
// that.$message({
// message: '请先连接服务',
// type: 'warning'
// })
// return
// }
// if (that.printer_info.is_set_cddev == 1) {
// that.$confirm('上下光驱未设置，请前往设置', '温馨提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
// that.goSet('/manage?type=cddev')
// }).catch(() => {
});
return
}
// });
// return
// }
that.isNew = true
that.workShow = true
that.$nextTick(() => {
@@ -1494,7 +1493,7 @@ export default {
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
$green: #00c325;
$green: #009688;
$yellow: #f5a623;
$red: #ff0000;
@@ -1511,7 +1510,7 @@ $red: #ff0000;
cursor: pointer;
padding: 0 16px;
height: 40px;
background: #00c325;
background: #009688;
border-radius: 6px;
margin-right: 16px;
font-weight: 500;
@@ -1539,7 +1538,7 @@ $red: #ff0000;
&:hover {
background: rgba(0, 195, 37, 0.12);
border: 2px solid rgba(0, 195, 37, 0.32);
color: #00c325;
color: #009688;
}
img {
@@ -1578,7 +1577,7 @@ $red: #ff0000;
.top_left_num {
padding: 0 10px;
height: 28px;
background: #00c325;
background: #009688;
border-radius: 6px;
font-weight: 500;
font-size: 18px;
@@ -1840,13 +1839,15 @@ $red: #ff0000;
.device_info_right {
.device_info_right_item {
width: 28px;
padding: 8px 0;
height: 44px;
background-color: #009688;
color: #fff;
display: flex;
align-items: center;
justify-content: center;
border-radius: 4px;
font-size: 18px;
cursor: pointer;
img {
width: 28px;
height: 28px;
}
}
}
}
@@ -1964,7 +1965,7 @@ $red: #ff0000;
&:hover {
background: rgba(0, 195, 37, 0.12);
border: 2px solid rgba(0, 195, 37, 0.32);
color: #00c325;
color: #009688;
}
}
}
@@ -2048,7 +2049,7 @@ $red: #ff0000;
.device_right_top_progress_box {
width: 0;
height: 15px;
background: #00c325;
background: #009688;
transition: all 0.5s;
}
}
@@ -2211,7 +2212,7 @@ $red: #ff0000;
background: linear-gradient(180deg, #c1ffcd 0%, #ffffff 100%);
font-weight: bold;
font-size: 19px;
color: #00c325;
color: #009688;
line-height: 50px;
text-align: center;
}
@@ -2327,34 +2328,41 @@ $red: #ff0000;
cursor: pointer;
&:hover {
color: #00c325;
color: #009688;
}
}
}
}
/* 开始引导 */
.guide_dialog {
::v-deep .el-dialog {
margin-top: 25vh !important;
}
}
.start_box {
.start_content {
font-size: 15px;
line-height: 24px;
}
.start_hide {
padding: 40px 0 10px;
}
}
.about_box {
text-align: center;
.company-name {
font-size: 15px;
}
.version {
font-size: 15px;
}
.copyright {
font-size: 15px;
}
src/renderer/views/login/index.vue
+4 -4
View File
@@ -204,7 +204,7 @@ $light_gray: #eee;
.login_title {
font-weight: 500;
font-size: 30px;
color: #00C325;
color: #009688;
line-height: 44px;
text-align: center;
margin-bottom: 48px;
@@ -230,8 +230,8 @@ $light_gray: #eee;
}
.el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #00C325;
border-color: #00C325;
background-color: #009688;
border-color: #009688;
}
.el-checkbox__inner::after {
@@ -246,7 +246,7 @@ $light_gray: #eee;
}
.el-checkbox__input.is-checked+.el-checkbox__label {
color: #00C325;
color: #009688;
}
}
}
src/renderer/views/manage/index.vue
+53 -10
View File
@@ -16,7 +16,8 @@
<div class="form_label">设置光驱</div>
<div class="form_val">
<div class="flex_box flex_wrap form_tabs">
<div @click="handleAction(item)" v-for="(item, index) in actionList" :key="index" class="form_tab">{{ item.name }}</div>
<div @click="handleAction(item)" v-for="(item, index) in actionList" :key="index" class="form_tab">{{
item.name }}</div>
</div>
</div>
</div>
@@ -24,7 +25,8 @@
<div class="form_label">校准设备</div>
<div class="form_val">
<div class="flex_box flex_wrap form_tabs">
<div @click="handleMove(item)" v-for="(item, index) in moveList" :key="index" class="form_tab">{{ item.name }}</div>
<div @click="handleMove(item)" v-for="(item, index) in moveList" :key="index" class="form_tab">{{
item.name }}</div>
</div>
</div>
</div>
@@ -32,7 +34,8 @@
<div class="form_label">维护设备</div>
<div class="form_val">
<div class="flex_box flex_wrap form_tabs">
<div @click="handleService(item)" v-for="(item, index) in serviceList" :key="index" class="form_tab">{{ item.name }}</div>
<div @click="handleService(item)" v-for="(item, index) in serviceList" :key="index" class="form_tab">{{
item.name }}</div>
</div>
</div>
</div>
@@ -117,7 +120,8 @@
<div class="cd_name">{{ item.dev_name }}({{ item.dev_path }})</div>
<div class="flex_box cd_r">
<el-select v-model="item.cdType" @change="cdChange(index, item.cdType)">
<el-option v-for="type in cdOptions" :key="type.value" :label="type.label" :value="type.value"> </el-option>
<el-option v-for="type in cdOptions" :key="type.value" :label="type.label" :value="type.value">
</el-option>
</el-select>
<el-button @click="cdOpen(index)" type="success">打开</el-button>
<el-button @click="cdClose(index)" type="danger">关闭</el-button>
@@ -977,16 +981,20 @@ export default {
.container_box {
.form_box {
padding: 0 32px;
.form_item {
padding: 10px 0;
.form_title {
border-bottom: 2px solid #e1f5e5;
.form_title_text {
font-weight: 500;
font-size: 25px;
color: #000000;
line-height: 37px;
}
.form_title_line {
width: 100%;
height: 6px;
@@ -994,19 +1002,24 @@ export default {
border-radius: 4px;
}
}
.form_content {
padding: 10px 0;
.form_option {
padding: 16px 0;
}
.form_label {
width: 140px;
font-weight: 500;
font-size: 19px;
color: #000000;
}
.form_val {
max-width: 1100px;
.form_tabs {
.form_tab {
width: 250px;
@@ -1020,13 +1033,15 @@ export default {
font-weight: 500;
font-size: 19px;
margin: 6px;
&:hover {
background: rgba(0, 195, 37, 0.12);
border: 1px solid rgba(0, 195, 37, 0.32);
color: #00c325;
color: #009688;
}
}
}
.form_input {
width: 500px;
height: 42px;
@@ -1034,6 +1049,7 @@ export default {
border-radius: 4px;
border: 1px solid #999;
overflow: hidden;
::v-deep {
.el-input-group__append {
font-size: 16px;
@@ -1041,6 +1057,7 @@ export default {
font-weight: 500;
border-radius: 0;
}
.el-input__inner {
width: 360px;
height: 40px;
@@ -1050,6 +1067,7 @@ export default {
font-size: 19px;
color: #000000;
}
.el-input__icon {
font-size: 19px;
height: 40px;
@@ -1057,6 +1075,7 @@ export default {
font-weight: bold;
color: #000;
}
.el-button {
width: 140px;
height: 40px;
@@ -1067,8 +1086,9 @@ export default {
color: #333;
font-weight: bold;
font-size: 16px;
&:hover {
background: #00c325;
background: #009688;
color: #fff;
border: none;
}
@@ -1081,36 +1101,44 @@ export default {
display: flex;
align-items: center;
}
.el-checkbox__inner {
width: 24px;
height: 24px;
}
.el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #00c325;
border-color: #00c325;
background-color: #009688;
border-color: #009688;
}
.el-checkbox__inner::after {
width: 6px;
height: 14px;
left: 8px;
}
.el-checkbox__label {
font-size: 19px;
line-height: 24px;
}
.el-checkbox__input.is-checked + .el-checkbox__label {
.el-checkbox__input.is-checked+.el-checkbox__label {
color: #333;
}
}
.form_select {
width: 500px;
height: 42px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #98e8a6;
.el-select {
width: 100%;
padding-left: 10px;
::v-deep {
.el-input__inner {
border: none;
@@ -1121,6 +1149,7 @@ export default {
line-height: 42px;
color: #000000;
}
.el-input__icon {
font-size: 20px;
height: 42px;
@@ -1136,11 +1165,13 @@ export default {
}
}
}
.cd_box {
.el-input {
height: 40px;
line-height: 40px;
}
::v-deep {
.el-input__inner {
width: 240px;
@@ -1150,6 +1181,7 @@ export default {
color: #000;
font-weight: 500;
}
.el-input__icon {
font-size: 16px;
height: 40px;
@@ -1158,23 +1190,28 @@ export default {
color: #000;
}
}
.cd_title {
font-size: 16px;
font-weight: 500;
color: #000;
line-height: 28px;
}
.cd_desc {
font-size: 13px;
font-weight: 500;
color: #666;
line-height: 24px;
}
.cd_list {
padding: 32px 0;
.cd_item {
padding: 12px 0;
}
.el-button {
margin: 0;
padding: 0;
@@ -1182,17 +1219,21 @@ export default {
height: 40px;
font-size: 15px;
}
.cd_name {
font-size: 14px;
color: #000;
line-height: 24px;
}
.cd_r {
gap: 24px;
}
}
.cd_footer {
gap: 24px;
.cd_footer_btn1 {
width: 120px;
height: 40px;
@@ -1205,10 +1246,11 @@ export default {
padding: 0;
margin: 0 12px;
}
.cd_footer_btn2 {
width: 120px;
height: 40px;
background: #00c325;
background: #009688;
border-radius: 4px;
font-weight: 500;
font-size: 16px;
@@ -1217,6 +1259,7 @@ export default {
}
}
}
::v-deep .el-dialog__title {
font-size: 24px;
}
src/renderer/views/set/index.vue
+31 -28
View File
@@ -17,11 +17,7 @@
<div class="flex_box form_val">
<div class="form_select">
<el-select v-model="form.log_level" placeholder="请选择">
<el-option
v-for="item in levelList"
:key="item.value"
:label="item.label"
:value="item.value">
<el-option v-for="item in levelList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -33,11 +29,7 @@
<div class="flex_box form_val">
<div class="form_select">
<el-select v-model="form.retry_freq" placeholder="请选择">
<el-option
v-for="item in timesList"
:key="item.value"
:label="item.label"
:value="item.value">
<el-option v-for="item in timesList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -49,11 +41,7 @@
<div class="flex_box form_val">
<div class="form_select">
<el-select v-model="form.print_quality" placeholder="请选择">
<el-option
v-for="item in qualityList"
:key="item.value"
:label="item.label"
:value="item.value">
<el-option v-for="item in qualityList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -83,11 +71,7 @@
<div class="flex_box form_val">
<div class="form_select">
<el-select v-model="form.has_sr0" placeholder="请选择">
<el-option
v-for="item in sr0CheckList"
:key="item.value"
:label="item.label"
:value="item.value">
<el-option v-for="item in sr0CheckList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -98,7 +82,7 @@
<div class="form_label">RejectConfig</div>
<div class="flex_box form_val">
<div class="form_switch">
<el-switch active-color="#07C160" inactive-color="#aaa" v-model="form.RejectConfig"></el-switch>
<el-switch active-color="#009688" inactive-color="#aaa" v-model="form.RejectConfig"></el-switch>
</div>
<div class="form_text">出卡盒配置。默认勾选为正常出卡，取消勾选则从Reject出卡盒出卡</div>
</div>
@@ -107,7 +91,7 @@
<div class="form_label">StopOnFailure</div>
<div class="flex_box form_val">
<div class="form_switch">
<el-switch active-color="#07C160" inactive-color="#aaa" v-model="form.StopOnFailure"></el-switch>
<el-switch active-color="#009688" inactive-color="#aaa" v-model="form.StopOnFailure"></el-switch>
</div>
<div class="form_text">作业失败后停止接受任务，默认不勾选</div>
</div>
@@ -116,7 +100,7 @@
<div class="form_label">KeepCombinedImage</div>
<div class="flex_box form_val">
<div class="form_switch">
<el-switch active-color="#07C160" inactive-color="#aaa" v-model="form.KeepCombinedImage"></el-switch>
<el-switch active-color="#009688" inactive-color="#aaa" v-model="form.KeepCombinedImage"></el-switch>
</div>
<div class="form_text">是否保留作业临时图片和字段数据</div>
</div>
@@ -125,7 +109,7 @@
<div class="form_label">CleanTaskFile</div>
<div class="flex_box form_val">
<div class="form_switch">
<el-switch active-color="#07C160" inactive-color="#aaa" v-model="form.CleanTaskFile"></el-switch>
<el-switch active-color="#009688" inactive-color="#aaa" v-model="form.CleanTaskFile"></el-switch>
</div>
<div class="form_text">是否清除作业临时文件</div>
</div>
@@ -134,7 +118,7 @@
<div class="form_label">UploadSharedDir</div>
<div class="flex_box form_val">
<div class="form_switch">
<el-switch active-color="#07C160" inactive-color="#aaa" v-model="form.UploadSharedDir"></el-switch>
<el-switch active-color="#009688" inactive-color="#aaa" v-model="form.UploadSharedDir"></el-switch>
</div>
<div class="form_text">启用作业缓存路径，勾选后作业内容会先刻录到缓存路径后再刻录到存储卡</div>
</div>
@@ -241,7 +225,7 @@ export default {
watch: {
'$store.state.chat.settings': {
handler(val) {
this.form = {...val}
this.form = { ...val }
},
immediate: true,
deep: true
@@ -281,16 +265,20 @@ export default {
.container_box {
.form_box {
padding: 0 32px;
.form_item {
padding: 10px 0;
.form_title {
border-bottom: 2px solid #E1F5E5;
.form_title_text {
font-weight: 500;
font-size: 25px;
color: #000000;
line-height: 37px;
}
.form_title_line {
width: 100%;
height: 6px;
@@ -298,17 +286,21 @@ export default {
border-radius: 4px;
}
}
.form_content {
padding: 10px 0;
.form_option {
padding: 16px 0;
}
.form_label {
width: 300px;
font-weight: 500;
font-size: 19px;
color: #000000;
}
.form_val {
.form_input {
width: 300px;
@@ -317,6 +309,7 @@ export default {
border-radius: 4px;
border: 1px solid #98E8A6;
overflow: hidden;
::v-deep {
.el-input__inner {
width: 360px;
@@ -327,6 +320,7 @@ export default {
font-size: 19px;
color: #000000;
}
.el-input__icon {
font-size: 20px;
height: 40px;
@@ -334,12 +328,13 @@ export default {
font-weight: bold;
color: #000;
}
.el-button {
width: 140px;
height: 40px;
border: none;
padding: 0;
background: #00C325;
background: #009688;
border-radius: 0px 4px 4px 0px;
}
}
@@ -347,6 +342,7 @@ export default {
.form_switch {
width: 300px;
.el-switch {
zoom: 1.4;
}
@@ -358,9 +354,11 @@ export default {
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #98E8A6;
.el-select {
width: 100%;
padding-left: 10px;
::v-deep {
.el-input__inner {
border: none;
@@ -371,6 +369,7 @@ export default {
line-height: 42px;
color: #000000;
}
.el-input__icon {
font-size: 20px;
height: 42px;
@@ -381,6 +380,7 @@ export default {
}
}
}
.form_text {
font-weight: 500;
font-size: 19px;
@@ -390,8 +390,10 @@ export default {
}
}
}
.footer_btns {
height: 80px;
.footer_submit {
width: 166px;
height: 45px;
@@ -402,8 +404,9 @@ export default {
font-size: 19px;
color: #333;
padding: 0;
&:hover {
background: #00C325;
background: #009688;
color: #FFFFFF;
}
}
src/renderer/views/user/index.vue
+9 -2
View File
@@ -10,7 +10,8 @@
<el-table-column prop="logintime" label="最后登录时间"></el-table-column>
<el-table-column prop="status" label="状态">
<template slot-scope="scope">
<div class="table_status" :class="{'table_status1': scope.row.status === 1}">{{ scope.row.status === 1 ? '在线' : '离线' }}</div>
<div class="table_status" :class="{ 'table_status1': scope.row.status === 1 }">{{ scope.row.status === 1 ?
'在线' : '离线' }}</div>
</template>
</el-table-column>
</el-table>
@@ -57,16 +58,20 @@ export default {
<style rel="stylesheet/scss" lang="scss" scoped>
.container_box {
height: 100vh;
.table_box {
padding: 32px;
.el-table {
::v-deep {
th.el-table__cell {
background-color: #F2F9F4;
}
.el-table__cell {
padding: 6px 0;
}
.cell {
line-height: 28px;
font-size: 12px;
@@ -74,12 +79,14 @@ export default {
}
}
}
.table_status {
font-weight: 500;
color: #000000;
}
.table_status1 {
color: #00C325;
color: #009688;
}
}
}