From 1269b0b42e8e52e15d6d965a6845932c121e3af8 Mon Sep 17 00:00:00 2001
From: 落日与鲸 <10806022+gong-jinbao@user.noreply.gitee.com>
Date: 星期一, 24 二月 2025 11:15:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide
---
H5/static/position@2x.png | 0
management/src/pages/work-order-setting/index.jsx | 116 ++++++++++++----------
H5/pages.json | 7 +
H5/pages/work-detail/maxVideo.vue | 50 ++++++++++
H5/pages/work-detail/work-detail.vue | 112 ++++++++++++++++++---
H5/pages/components/certificate/certificate.vue | 5
H5/static/detailImg/dwei.png | 0
7 files changed, 216 insertions(+), 74 deletions(-)
diff --git a/H5/pages.json b/H5/pages.json
index 1ecd337..34e0083 100644
--- a/H5/pages.json
+++ b/H5/pages.json
@@ -21,6 +21,13 @@
}
},
{
+ "path": "pages/work-detail/maxVideo",
+ "style": {
+ "navigationBarBackgroundColor": "#000000",
+ "navigationStyle": "custom"
+ }
+ },
+ {
"path": "pages/problemReporting/problemReporting",
"style": {
"navigationBarTitleText": "问题上报",
diff --git a/H5/pages/components/certificate/certificate.vue b/H5/pages/components/certificate/certificate.vue
index f307fd1..10b36ad 100644
--- a/H5/pages/components/certificate/certificate.vue
+++ b/H5/pages/components/certificate/certificate.vue
@@ -50,13 +50,12 @@
open() {
},
-
+
onclose() {
this.$emit('onCancel',false)
},
},
- created() {
- },
+ created() {},
}
</script>
diff --git a/H5/pages/work-detail/maxVideo.vue b/H5/pages/work-detail/maxVideo.vue
new file mode 100644
index 0000000..2e2a655
--- /dev/null
+++ b/H5/pages/work-detail/maxVideo.vue
@@ -0,0 +1,50 @@
+<template>
+ <view>
+ <u-navbar title=" " bgColor="#000000" autoBack leftIconColor="#ffffff">
+ </u-navbar>
+ <view class="preview-full">
+ <video class="videoMax" :autoplay="true" :src="videoUrl" :show-fullscreen-btn="false">
+
+ </video>
+ </view>
+ </view>
+
+</template>
+
+
+<script>
+ export default {
+ // props: {
+ // show: Boolean
+ // },
+ data() {
+ return {
+ videoUrl: ''
+ };
+ },
+ onLoad(params) {
+ this.videoUrl = params.url
+
+ },
+ methods: {
+
+ },
+ created() {},
+ }
+</script>
+
+<style scoped lang="less">
+ .preview-full {
+ width: 100vw;
+ height: 100vh;
+ background-color: #000000;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+
+ .videoMax {
+ width: 100%;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/H5/pages/work-detail/work-detail.vue b/H5/pages/work-detail/work-detail.vue
index e88d077..0ebdd44 100644
--- a/H5/pages/work-detail/work-detail.vue
+++ b/H5/pages/work-detail/work-detail.vue
@@ -125,10 +125,25 @@
</view>
<view class="title">描述视频</view>
<view class="descPic">
- <view class="picItem" v-for="(item,index) in 3">
- <image src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"
+ <view class="picItem relative" v-for="(item,index) in 3">
+ <!-- <image src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"
class="img shrink0" mode="aspectFill">
- </image>
+ </image> -->
+ <!-- <video :autoplay="true" src="https://www.w3schools.com/tags/movie.mp4"
+ class="img shrink0"></video> -->
+
+
+ <video id="myVideo" class="videoImg shrink0" disabled :controls="false"
+ :show-center-play-btn="false" :src="src">
+
+ </video>
+ <view class="videoOpen" @click.stop="openVideo(src)">
+ <image src="../../static/detailImg/open.png" class="video shrink0" mode="aspectFill">
+ </image>
+ </view>
+
+
+
</view>
</view>
</view>
@@ -287,8 +302,6 @@
</view>
</view>
</u-popup>
-
-
</view>
</template>
@@ -303,15 +316,30 @@
scoreTopHeight: 0, //距离顶部多高
+ src: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/2minute-demo.mp4'
+
};
},
onPageScroll(e) {
this.scoreTopHeight = e.scrollTop
},
+ onShow() {
+
+ },
methods: {
open() {},
close() {},
+ // 去大屏播放视频
+ openVideo(url) {
+ uni.navigateTo({
+ url: `/pages/work-detail/maxVideo?url=${'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/2minute-demo.mp4'}`
+ })
+ },
+ // 获取订单详情信息
+ getDetailInfo() {
+
+ },
// 确认驳回
submitReject() {
this.showPop = false
@@ -512,8 +540,8 @@
}
.addressIcon {
- width: 30.77rpx;
- height: 30.77rpx;
+ width: 23.08rpx;
+ height: 25.64rpx;
}
}
@@ -810,19 +838,48 @@
line-height: 38rpx;
}
- .descPic {
- display: flex;
- flex-wrap: wrap;
- .picItem {
- margin-right: 15rpx;
+ }
+ }
- .img {
- width: 140.38rpx;
- height: 140.38rpx;
- border-radius: 7.69rpx;
- }
- }
+ .descPic {
+ display: flex;
+ flex-wrap: wrap;
+
+ .picItem {
+ margin-right: 15rpx;
+
+
+ .img {
+ width: 140.38rpx;
+ height: 140.38rpx;
+ border-radius: 7.69rpx;
+ }
+ }
+
+ .videoImg {
+ width: 140.38rpx;
+ height: 140.38rpx;
+ border-radius: 7.69rpx;
+ position: relative;
+ }
+
+ .videoOpen {
+ position: absolute;
+ top: 10rpx;
+ left: 0;
+ z-index: 99;
+ width: 140rpx;
+ height: 140rpx;
+ border-radius: 8rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ .video {
+ z-index: 999;
+ width: 140rpx;
+ height: 140rpx;
}
}
}
@@ -833,7 +890,12 @@
line-height: 38rpx;
}
+ #myVideo {
+ z-index: 1;
+ }
+
.btnButtom {
+ z-index: 99;
position: fixed;
bottom: 0;
width: 100vw;
@@ -984,4 +1046,18 @@
cursor: pointer;
}
}
+
+ .preview-full {
+ width: 100vw;
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ background-color: #000000;
+
+ .maxVideo {
+ width: 100%;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/H5/static/detailImg/dwei.png b/H5/static/detailImg/dwei.png
index e10f75f..d120b02 100644
--- a/H5/static/detailImg/dwei.png
+++ b/H5/static/detailImg/dwei.png
Binary files differ
diff --git a/H5/static/position@2x.png b/H5/static/position@2x.png
index f1b7dc0..53e6aa9 100644
--- a/H5/static/position@2x.png
+++ b/H5/static/position@2x.png
Binary files differ
diff --git a/management/src/pages/work-order-setting/index.jsx b/management/src/pages/work-order-setting/index.jsx
index e07daad..8ed83f2 100644
--- a/management/src/pages/work-order-setting/index.jsx
+++ b/management/src/pages/work-order-setting/index.jsx
@@ -8,7 +8,7 @@
// import AddAndEdit from './components/addAndEdit';
// import { getConfig, saveConfig } from './service';
-const TabPane = Tabs.TabPane;
+// const TabPane = Tabs.TabPane;
const Account = () => {
const actionRef = useRef();
const addViewRef = useRef();
@@ -19,7 +19,6 @@
const [selectedRowKeys, setSelectedRowKeys] = useState([]);
const changeStatusRef = useRef();
const [addWarnVisible, handleAddWarnVisible] = useState(false);
- const { RangePicker } = DatePicker;
const [dataSource, setDataSource] = useState([]);
const [data, setData] = useState([]);
const access = useAccess();
@@ -49,76 +48,87 @@
<div><span style={{ fontSize: '14px', fontWeight: 600 }}>*诉求处理时间配置：
</span><span style={{ marginLeft: 8, color: '#a5a5a5' }}>超过时间未处理诉求，系统自动对该事件承办者发送短信提醒，并知会至上一级管理层进行督办。
</span></div>
- <Form.Item label="市级账号" name="isAuctioneer" rules={
- [{ required: true, message: '请输入市级账号' }]
- }>
- <InputNumber precision={0} min={0} addonAfter="天内" ></InputNumber>
- </Form.Item>
+ <Space style={{ marginTop: 20,display:'flex',flexWrap:'wrap'}}>
+ <Form.Item label="市级账号" name="isAuctioneer" rules={
+ [{ required: true, message: '请输入市级账号' }]
+ }>
+ <InputNumber controls={false} precision={0} min={0} addonAfter="天内" ></InputNumber>
+ </Form.Item>
- <Form.Item label="区县账号" name="isAuctioneer" rules={
- [{ required: true, message: '请输入区县账号' }]
- }>
- <InputNumber precision={0} min={0} addonAfter="天内" ></InputNumber>
- </Form.Item>
+ <Form.Item label="区县账号" name="isAuctioneer" rules={
+ [{ required: true, message: '请输入区县账号' }]
+ }>
+ <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
+ </Form.Item>
- <Form.Item label="街道账号" name="isAuctioneer" rules={
- [{ required: true, message: '请输入街道账号' }]
- }>
- <InputNumber precision={0} min={0} addonAfter="天内" ></InputNumber>
- </Form.Item>
- <Form.Item label="社区账号" name="isAuctioneer" rules={
- [{ required: true, message: '请输入社区账号' }]
- }>
- <InputNumber precision={0} min={0} addonAfter="天内" ></InputNumber>
- </Form.Item>
- <Form.Item label="党员账号" name="isAuctioneer" rules={
- [{ required: true, message: '请输入党员账号' }]
- }>
- <InputNumber precision={0} min={0} addonAfter="天内" ></InputNumber>
- </Form.Item>
+ <Form.Item label="街道账号" name="isAuctioneer" rules={
+ [{ required: true, message: '请输入街道账号' }]
+ }>
+ <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
+ </Form.Item>
+ <Form.Item label="社区账号" name="isAuctioneer" rules={
+ [{ required: true, message: '请输入社区账号' }]
+ }>
+ <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
+ </Form.Item>
+ <Form.Item label="党员账号" name="isAuctioneer" rules={
+ [{ required: true, message: '请输入党员账号' }]
+ }>
+ <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
+ </Form.Item>
+ </Space>
</Card>
<Card>
<div><span style={{ fontSize: '14px', fontWeight: 600 }}>*时限临期提醒配置：
</span><span style={{ marginLeft: 8, color: '#a5a5a5' }}>超过时间未处理诉求，系统自动对该事件承办者发送短信提醒，并知会至上一级管理层进行督办。
</span></div>
+ <Space style={{ marginTop: 20,display:'flex',flexWrap:'wrap'}}>
+
<Form.Item label="市级账号" name="isAuctioneer" rules={
- [{ required: true, message: '请输入市级账号' }]
- }>
- <InputNumber precision={0} min={0} addonAfter="天内" ></InputNumber>
- </Form.Item>
+ [{ required: true, message: '请输入市级账号' }]
+ }>
+ <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
+ </Form.Item>
- <Form.Item label="区县账号" name="isAuctioneer" rules={
- [{ required: true, message: '请输入区县账号' }]
- }>
- <InputNumber precision={0} min={0} addonAfter="天内" ></InputNumber>
- </Form.Item>
+ <Form.Item label="区县账号" name="isAuctioneer" rules={
+ [{ required: true, message: '请输入区县账号' }]
+ }>
+ <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
+ </Form.Item>
- <Form.Item label="街道账号" name="isAuctioneer" rules={
- [{ required: true, message: '请输入街道账号' }]
- }>
- <InputNumber precision={0} min={0} addonAfter="天内" ></InputNumber>
- </Form.Item>
- <Form.Item label="社区账号" name="isAuctioneer" rules={
- [{ required: true, message: '请输入社区账号' }]
- }>
- <InputNumber precision={0} min={0} addonAfter="天内" ></InputNumber>
- </Form.Item>
- <Form.Item label="党员账号" name="isAuctioneer" rules={
- [{ required: true, message: '请输入党员账号' }]
- }>
- <InputNumber precision={0} min={0} addonAfter="天内" ></InputNumber>
- </Form.Item>
+ <Form.Item label="街道账号" name="isAuctioneer" rules={
+ [{ required: true, message: '请输入街道账号' }]
+ }>
+ <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
+ </Form.Item>
+ <Form.Item label="社区账号" name="isAuctioneer" rules={
+ [{ required: true, message: '请输入社区账号' }]
+ }>
+ <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
+ </Form.Item>
+ <Form.Item label="党员账号" name="isAuctioneer" rules={
+ [{ required: true, message: '请输入党员账号' }]
+ }>
+ <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
+ </Form.Item>
+ </Space>
</Card>
<Card>
- <div><span style={{ fontSize: '14px', fontWeight: 600 }}>*诉求处理时间：
+ <div style={{marginBottom:20}}><span style={{ fontSize: '14px', fontWeight: 600 }}>*诉求处理时间：
</span><span style={{ marginLeft: 8, color: '#a5a5a5' }}>超过时间未处理诉求，系统自动对该事件承办者发送短信提醒，并知会至上一级管理层进行督办。
</span></div>
<Form.Item label="添加后处理时间" name="isAuctioneer" rules={
[{ required: true, message: '请输入添加后处理时间' }]
}>
- <InputNumber precision={0} min={0} addonAfter="天内" ></InputNumber>
+ <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
</Form.Item>
</Card>
+
+ <div style={{ marginTop: 20,display:'flex',justifyContent:'center'}}>
+ <Button type="primary" htmlType="submit" style={{ marginRight: 20 }}>
+ 保存
+ </Button>
+ </div>
</Form>
</Card>
</PageContainer>
--
Gitblit v1.7.1