Skip to content

李宁 / Activity

Go to a project
Commit 03cb74f4 by 李宁
Options

1

1 parent 3d33fcb4
Inline Side-by-side
Showing 8 changed files with 94 additions and 15 deletions
huaiHua/app/css/demo.css
......@@ -363,6 +363,9 @@ html,body{
resize: none;
border-radius: .08rem;
}
.alertDiv .inner .bug{
margin-top: .2rem;
}
.alertDiv .inner .disabled{
background: #D9D9D9;
border: 1px solid #B2B2B2;
......
huaiHua/app/demo.html
......@@ -7,7 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>质检</title>
<link rel="stylesheet" href="https://xpo.oss-cn-beijing.aliyuncs.com/huaian/css/vant.css"/>
<link rel="stylesheet" href="css/demo.css?09131">
<link rel="stylesheet" href="css/demo.css?091231">
</head>
<body>
......@@ -119,6 +119,7 @@
<div class="inner">
<div class="til">输入用户账号</div>
<input id="accountValue" class="input" type="text" placeholder="请输入用户账号">
<input id="accountBugValue" class="input bug" type="text" placeholder="请输入故障维修手机号">
<div class="bot">
<button class="cancel" onclick="inputCancel()">取消</button>
<button class="submit" onclick="accountInputSubmit()">提交</button>
......@@ -344,7 +345,7 @@
<script src="js/util.js?1212"></script>
<script src="js/vue.min.js"></script>
<script src="js/vant.min.js"></script>
<script src="js/demo.js?875155"></script>
<script src="js/demo.js?87511515"></script>
</body>
</html>
\ No newline at end of file
huaiHua/app/index.html
......@@ -24,7 +24,7 @@
<div>手写账号数字请规整，避免识别出错</div>
</div>
<div class="topText">
<div class="topText" :style="{marginTop: detail.finish=='1'?'0.9rem':''}">
<div class="tleft">
<div class="tup">质检{{detail.finish=='1'?'已完成':'待完成'}}</div>
<div class="tdown">
......
huaiHua/app/js/demo.js
......@@ -505,6 +505,12 @@ function getNoShootInfo(code){
}else if(key.startsWith('poeSwitchboard')){
pageText = '方法1:近距离聚焦拍摄POE交换机的正面,露出移动的标识。'
id = 'poeSwitchboard'
}else if(key.startsWith('cgmFiberAcc')){
pageText = '方法1:拍摄时请将从光猫光纤接入处置于屏幕中央。'
id = 'cgmFiberAcc'
}else if(key.startsWith('zcgmMedia')){
pageText = '方法1:拍摄时请将主从之间组网介质置于屏幕中央。'
id = 'zcgmMedia'
}
return {
......@@ -624,7 +630,7 @@ function setStepButt(){
if(fn(stepId,nArr)){
$("#shootButt2").css('display','flex')
}
let sArr = ["gongFu_","gongPai_","account_","env_","Ogm_","Ozgm_","Ocgm","lineSta_",,"cloudPcTer","cloudPcScreen",'poePanel','poeSwitchboard']
let sArr = ["gongFu_","gongPai_","account_","env_","Ogm_","Ozgm_","Ocgm","lineSta_",,"cloudPcTer","cloudPcScreen",'poePanel','poeSwitchboard','cgmFiberAcc','zcgmMedia']
if(fn(stepId,sArr)){
$("#shootButt").css('display','flex')
}
......@@ -822,22 +828,33 @@ function submitPictureSucc(){
//账号和设备串号的弹窗逻辑
$("#accountAlertShow").click(()=>{
$("#accountValue").val('')
$("accountBugValue").val('')
$("#accountAlertDiv").show()
})
function inputCancel(){
$("#accountValue").val('')
$("accountBugValue").val('')
$("#accountAlertDiv").hide()
}
function accountInputSubmit(){
let acc = $("#accountValue").val()
let accBug = $("#accountBugValue").val()
if(!acc){
util.toast('请输入账号')
return
}
if(!/^1\d{10}$/.test(acc) && !acc.startsWith('74')){
util.toast('账号格式错误，输入用户账号（业务号码）')
return
}
if(!/^1\d{10}$/.test(acc) && !acc.startsWith('80')){
util.toast('格式错误，输入用户账号（业务号码）')
if(!accBug){
util.toast('请输入故障维修手机号')
return
}
if(!/^1\d{10}$/.test(accBug)){
util.toast('故障维修手机号格式错误')
return
}
......@@ -847,11 +864,13 @@ function accountInputSubmit(){
applyId: applyId,
callId: callId,
voiceCode: stepId,
account: acc
account: acc,
campaignPhone: accBug
}
}).then(res=>{
if(res.code == 200){
$("#accountValue").val('')
$("accountBugValue").val('')
$("#accountAlertDiv").hide()
}else {
util.toast(res.msg)
......
huaiHua/app/js/lang.js
window.noShootNum = 5
window.noShootNum = 3
window.snInputNum = 3
\ No newline at end of file
huaiHua/app/list.html
......@@ -11,8 +11,8 @@
<div class="list-container">
<div class="tabs">
<div class="left">
<div class="tab-item" :class="{ active: activeTab === 'tab1' }" @click="switchTab('tab1')">待完成2</div>
<div class="tab-item" :class="{ active: activeTab === 'tab2' }" @click="switchTab('tab2')">已完成3</div>
<div class="tab-item" :class="{ active: activeTab === 'tab1' }" @click="switchTab('tab1')">待完成</div>
<div class="tab-item" :class="{ active: activeTab === 'tab2' }" @click="switchTab('tab2')">已完成</div>
</div>
<div class="right" @click="logout">退出登录</div>
</div>
......
huaiHua/pc/dist/index.html
......@@ -5,8 +5,8 @@
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>视频质检系统</title>
<script type="module" crossorigin src="./assets/index-DqoDLtuq.js"></script>
<link rel="stylesheet" crossorigin href="./assets/index-Ck6T8htw.css">
<script type="module" crossorigin src="./assets/index-BKwOwjNb.js"></script>
<link rel="stylesheet" crossorigin href="./assets/index-B1_qruyx.css">
</head>
<body>
<div id="app"></div>
......
huaiHua/pc/src/pages/QualityResult.vue
......@@ -55,6 +55,16 @@
</el-select>
</el-col>
<el-col :span="4" style="margin-top: 10px;">
<el-select
v-model="filterForm.isQualify"
placeholder="合格状态"
clearable
style="width: 100%"
>
<el-option v-for="result in pagination.qualifyList" :key="result.value" :label="result.label" :value="result.value"></el-option>
</el-select>
</el-col>
<el-col :span="4" style="margin-top: 10px;">
<el-button type="primary" @click="handleFilter">查询</el-button>
<el-button @click="resetFilter">重置</el-button>
</el-col>
......@@ -72,6 +82,17 @@
<el-table-column prop="orderCode" label="工单ID" width="230" show-overflow-tooltip></el-table-column>
<el-table-column prop="deviceType" label="设备类型" width="230" show-overflow-tooltip></el-table-column>
<el-table-column prop="finishTime" label="质检完成时间" width="180"></el-table-column>
<el-table-column label="是否合格" width="100">
<template #default="scope">
<el-tag
v-if="scope.row.isQualify==1 || scope.row.isQualify==0"
:type="getQualiTagType(scope.row.isQualify)"
>
{{ getQualifyText(scope.row.isQualify) }}
</el-tag>
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column prop="finish" label="质检结果" width="100">
<template #default="scope">
<el-tag
......@@ -198,6 +219,11 @@
<el-button v-if="scope.row.result=='noShow'" size="small" type="text" @click="checkReason(scope.row.content)">查看原因</el-button>
</template>
</el-table-column>
<el-table-column prop="result" label="是否合格" width="100">
<template #default="scope">
<span>{{scope.row.isQualify || '--'}}</span>
</template>
</el-table-column>
<el-table-column prop="robot" label="识别方式" width="200">
<template #default="scope">
<span>{{scope.row.robot=='auto'?'自动识别':'手动填写'}}</span>
......@@ -255,7 +281,8 @@ const filterForm = reactive({
accNbr: '',
campaignId: '',
orderId: '',
finishStatusList: []
finishStatusList: [],
isQualify: ''
})
const detailForm = reactive({
......@@ -277,6 +304,13 @@ const pagination = reactive({
},{
label: '无法质检',
value: '2'
}],
qualifyList: [{
label: '合格',
value: '1'
},{
label: '不合格',
value: '0'
}]
})
const tableForm = reactive({
......@@ -300,7 +334,8 @@ const handleFilter = async () => {
accNbr: filterForm.accNbr,
campaignId: filterForm.campaignId,
orderId: filterForm.orderId,
finishStatusList: filterForm.finishStatusList
finishStatusList: filterForm.finishStatusList,
isQualify: filterForm.isQualify
};
let fn = (dateString)=>{
......@@ -341,6 +376,18 @@ const resetFilter = () => {
handleFilter();
}
const getQualifyText = (result) => {
let ret = '未知'
pagination.qualifyList.forEach(item => {
if(item.value == result) {
ret = item.label
}
})
return ret
}
const getResultText = (result,status) => {
let ret = '未知'
......@@ -362,8 +409,17 @@ const checkReason = (value) =>{
})
}
const getQualiTagType = (result,status) => {
let typeMap = {
0: 'warning',
1: 'success'
}
return typeMap[result] || 'info'
}
const getResultTagType = (result,status) => {
const typeMap = {
let typeMap = {
0: 'info',
2: 'warning',
1: 'success'
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!