upright
/
duoji-frontend
mirror of https://gitlab.hzleaper.com:81/duoji/duoji-frontend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

前端修改

Browse Source
bozhou-古井贡酒
LAPTOP-S9HJSOEB\昊天 2 years ago
parent fda6082968
commit 870611f2ec
6 changed files with 90 additions and 48 deletions
Show Stats Download Patch File Download Diff File

4
public/antd_color.less
Unescape Escape View File

@ -42,7 +42,7 @@ html {--antd-wave-shadow-color: @primary-color;}
.ant-alert-info .ant-alert-icon {color: #1890ff;}
.ant-alert-warning {background-color: #fffbe6;border: 1px solid #ffe58f;}
.ant-alert-warning .ant-alert-icon {color: #faad14;}
.ant-alert-error {background-color: #fff1f0;border: 1px solid #ffa39e;}
.ant-alert-error {background-color: color(~`colorPalette("@{heading-color}", 1)`);border: 1px solid #ffa39e;}
.ant-alert-error .ant-alert-icon {color: #f5222d;}
.ant-alert-close-icon {background-color: transparent;border: none;}
.ant-alert-close-icon .anticon-close {color: @text-color-secondary;}
@ -1377,7 +1377,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
.ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
.ant-tag-magenta {color: #eb2f96;background: #fff0f6;border-color: #ffadd2;}
.ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
.ant-tag-red {color: #f5222d;background: #fff1f0;border-color: #ffa39e;}
.ant-tag-red {color: #f5222d;background: color(~`colorPalette("@{heading-color}", 1)`);border-color: #ffa39e;}
.ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;}
.ant-tag-volcano {color: #fa541c;background: #fff2e8;border-color: #ffbb96;}
.ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;}

36
src/router/index.js
Unescape Escape View File

@ -76,15 +76,15 @@ const routes = [{
},
component: () => import('@/views/historyMonitoring/index')
},
{
path: 'alarmLog',
name: 'alarmLog',
meta: {
icon: 'eye',
name: '告警日志'
},
component: () => import('@/views/alarmVideos/alarmLog')
},
// {
// path: 'alarmLog',
// name: 'alarmLog',
// meta: {
// icon: 'eye',
// name: '告警日志'
// },
// component: () => import('@/views/alarmVideos/alarmLog')
// },
{
path: 'checkManage',
name: 'checkManage',
@ -112,15 +112,15 @@ const routes = [{
component: () => import('@/views/historyCheck/index'),
},
{
path: 'checkHistory1',
name: 'checkHistory1',
meta: {
icon: 'tag',
name: '库位历史',
},
component: () => import('@/views/historyCheck/index'),
},
// {
// path: 'checkHistory1',
// name: 'checkHistory1',
// meta: {
// icon: 'tag',
// name: '库位历史',
// },
// component: () => import('@/views/historyCheck/index'),
// },
// {
// path: 'stockHistory',
// name: 'stockHistory',

77
src/views/checkManage/checkOperation.vue
Unescape Escape View File

@ -3,7 +3,8 @@
<div>
<div class="carousel-page">
<div class="carousel-page-content">
<div class="carousel-page-content" style="float:left">
<div class="img-box">
<ul>
<li>
@ -72,22 +73,66 @@
</li>
</ul>
</div>
<div class="img-box">
<viewer
v-if="checkObj.checkPic"
style="height: 300px"
>
<img :src="imgUrl+checkObj.checkPic" />
</viewer>
<div
v-else
style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;"
>
暂无图片
</div>
<p>盘点图1</p>
<!-- <div class="img-box" style="margin-left: 200px;">
<a-row type="flex" justify="space-around" style="height:300,margin-left:400">
<a-col :span="11">
<p>顶部图片1</p>
<viewer :images = "checkObj.topPic1">
<img class="historyImg" :src="checkObj.topPic1"/>
</viewer>
</a-col>
<a-col :span="11">
<p>顶部图片2</p>
<viewer :images = "checkObj.topPic2">
<img class="historyImg" :src="checkObj.topPic2"/>
</viewer>
</a-col>
</a-row>
<a-row type="flex" gutter="16px" justify="space-around" align="middle" style="height:300">
<a-col :span="11">
<p>侧面图片1</p>
<viewer :images = "checkObj.sidePic1">
<img class="historyImg" :src="checkObj.sidePic1"/>
</viewer>
</a-col>
<a-col :span="11">
<p>侧面图片2</p>
<viewer :images = "checkObj.sidePic2">
<img class="historyImg" :src="checkObj.sidePic2"/>
</viewer>
</a-col>
</a-row>
<a-row type="flex" justify="space-around" align="middle" style="height:300">
<a-col :span="11">
<p>侧面图片3</p>
<viewer :images = "checkObj.sidePic3">
<img class="historyImg" :src="checkObj.sidePic3"/>
</viewer>
</a-col>
<a-col :span="11">
<p>侧面图片4</p>
<viewer :images = "checkObj.sidePic4">
<img class="historyImg" :src="checkObj.sidePic4"/>
</viewer>
</a-col>
</a-row>
</div> -->
<div class="img-box" style="margin-left: 200px;">
<a-row type="flex" justify="space-around" style="height:300,margin-left:400">
<a-col :span="11">
<p>顶部图片</p>
<viewer :images = "checkObj.topPic1">
<img class="historyImg" :src="checkObj.topPic1"/>
</viewer>
</a-col>
<a-col :span="11">
<p>侧面图片</p>
<viewer :images = "checkObj.sidePic1">
<img class="historyImg" :src="checkObj.sidePic1"/>
</viewer>
</a-col>
</a-row>
</div>
</div>
</div>
<div class="bottom-btn">

4
src/views/checkManage/index.vue
Unescape Escape View File

@ -12,7 +12,7 @@
盘点清空
</a-button>
</a-popconfirm>
<a-popconfirm
<!-- <a-popconfirm
title="是否确定要全部盘点"
ok-text="是"
cancel-text="否"
@ -21,7 +21,7 @@
<a-button type="primary" class="export-all">
全部盘点
</a-button>
</a-popconfirm>
</a-popconfirm> -->
<a-button type="primary" @click="exportStock" class="export-all">
导出巷道盘点数据

8
src/views/historyCheck/index.vue
Unescape Escape View File

@ -101,13 +101,15 @@
<span slot="status" slot-scope="text">
{{ statusMap[text.status] }}
</span>
<span slot="pic" slot-scope="text" style="width:auto">
<span slot="pics" slot-scope="text" style="width:auto">
<template>
<span style="height:100%;">
<happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="width:320px;height:90px;">
<viewer>
<img class="historyImg" :src="imgUrl+text.pic"/>
<img class="historyImg" :src="text.pic1"/>
<img class="historyImg" :src="text.pic2"/>
</viewer>
</happy-scroll>
</span>
@ -169,7 +171,7 @@ export default {
},
{
title: "照片",
scopedSlots: {customRender: 'pic'},
scopedSlots: {customRender: 'pics'},
width:320,
},
{

9
src/views/historyMonitoring/index.vue
Unescape Escape View File

@ -156,12 +156,6 @@ export default {
scopedSlots: {customRender: 'pics'},
width:320,
},
{
title: "视频状态",
// dataIndex: "status",
scopedSlots: {customRender: 'status'},
width: 90
},
{
title: "工单时长",
dataIndex: "timeLength",
@ -290,7 +284,8 @@ export default {
},
closeModel(visible, data) {
this.visible = visible
this.vid1 = data
this.vid1 = null
this.vid2 = null
},
reset() {
this.queryParam.startTimestamp = ""

Write Preview
Loading…
Cancel
Save