上传合并
This commit is contained in:
parent
1bcd5ca284
commit
cb8f781c90
|
|
@ -54,7 +54,7 @@
|
|||
"left": "20px",
|
||||
"top": "40px",
|
||||
"width": "800px",
|
||||
"height": "600px",
|
||||
"height": "500px",
|
||||
"background": "transparent"
|
||||
}
|
||||
}]
|
||||
|
|
|
|||
|
|
@ -420,7 +420,7 @@
|
|||
<!-- 点击的弹出层 -->
|
||||
<view v-show="isopen" class="popup-overlay" @click="isopen=false;flyNumber.index0=999;touchindex1=-1">
|
||||
<view class="popup-overlay-content" style="height: 390rpx;" :class="getjiao"
|
||||
v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.izPackage=='N'"
|
||||
v-if="timearr[showDetail[0]]?.children[showDetail[1]]?.izPackage==='N'"
|
||||
:style="{ top: (2*openY - 350) + 'rpx',left: (2*openX - 780) + 'rpx',opacity: isopacity ? 1 : 0 }"
|
||||
@click.stop>
|
||||
<view class="popup-overlay-content-left">
|
||||
|
|
@ -1558,8 +1558,10 @@
|
|||
}
|
||||
await nextTick()
|
||||
isopen.value = true;
|
||||
|
||||
showDetail.value[0] = index0;
|
||||
showDetail.value[1] = index1;
|
||||
console.log("shaa",timearr.value[showDetail.value[0]]?.children[showDetail.value[1]]?.izPackage)
|
||||
isopacity.value = false;
|
||||
//加动画
|
||||
setTimeout(() => {
|
||||
|
|
@ -1800,8 +1802,11 @@
|
|||
izPackage: 'Y',
|
||||
previewFile: "",
|
||||
previewFileSmall: "",
|
||||
netPreviewFile:"",
|
||||
netPreviewFileSmall:"",
|
||||
immediateFile: "",
|
||||
immediateFileFocus: "",
|
||||
netImmediateFileFocus:"",
|
||||
netImmediateFile: "",
|
||||
tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
|
||||
mp3File: allobject.mp3File,
|
||||
|
|
@ -1955,6 +1960,7 @@
|
|||
serviceDuration: allobject.serviceDuration,
|
||||
immediateFile: allobject.immediateFile,
|
||||
immediateFileFocus: allobject.immediateFileFocus,
|
||||
netImmediateFileFocus:allobject.netImmediateFileFocus,
|
||||
netImmediateFile: allobject.netImmediateFile,
|
||||
tagName: timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1].tagName,
|
||||
mp3File: allobject.mp3File,
|
||||
|
|
@ -1962,6 +1968,8 @@
|
|||
mp4File: allobject.mp4File,
|
||||
netMp4File: allobject.netMp4File,
|
||||
serviceContent: allobject.serviceContent,
|
||||
netPreviewFile:allobject.netPreviewFile,
|
||||
netPreviewFileSmall:allobject.netPreviewFileSmall,
|
||||
}
|
||||
//给表格赋值
|
||||
timearr.value[saveEditIndex.value.index0].children[saveEditIndex.value.index1] = param;
|
||||
|
|
@ -2124,8 +2132,9 @@
|
|||
|
||||
savePackagelist.value = uni.getStorageSync('Packagelist') || []
|
||||
let res = uni.getStorageSync('saveTree')
|
||||
|
||||
// console.log("jiance", savePackagelist.value, res)
|
||||
|
||||
|
||||
console.log("saveTree", res)
|
||||
|
||||
let goodArray = []
|
||||
myArray.forEach((element : any) => {
|
||||
|
|
@ -2218,8 +2227,16 @@
|
|||
serviceDuration: "",
|
||||
immediateFile: "",
|
||||
immediateFileFocus: "",
|
||||
netImmediateFileFocus:"",
|
||||
netImmediateFile: "",
|
||||
tagName: "",
|
||||
netPreviewFile:"",
|
||||
netPreviewFileSmall:"",
|
||||
mp3File:"",
|
||||
netMp3File:"",
|
||||
mp4File:"",
|
||||
netMp4File:"",
|
||||
serviceContent:"",
|
||||
})
|
||||
// 切割bigArray
|
||||
function splitString(str) {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<div class="center-column" :style="{ height: isshow ? '600px' : '0px' }">
|
||||
<div class="center-column" :style="{ height: isshow ? '500px' : '0px' }">
|
||||
<!-- 视频播放组件 -->
|
||||
<MonitorView ref="monitor" init="5" style="width: 800px;height: 600px;" @onTel="handleTelEvent"
|
||||
<MonitorView ref="monitor" init="5" style="width: 800px;height: 500px;" @onTel="handleTelEvent"
|
||||
@onSnapShot="handleSnapShotEvent" @onRecord="handleRecordEvent" @onTalkStatus="handleTalkEvent" />
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -615,7 +615,7 @@
|
|||
<style>
|
||||
.center-column {
|
||||
width: 800px;
|
||||
height: 600px;
|
||||
height: 500px;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -202,7 +202,7 @@
|
|||
const getImg = () => {
|
||||
if (/^\d{11}$/.test(form.username)) {
|
||||
isRel(form.username).then((res : any) => {
|
||||
|
||||
console.log("啥啊",res)
|
||||
if (res.result.code == `0`) {
|
||||
uni.setStorageSync('serverUrl', res.result.orgList[0].serverUrl);
|
||||
uni.setStorageSync('orgList', res.result.orgList);
|
||||
|
|
@ -210,6 +210,7 @@
|
|||
time.value = Date.now();
|
||||
|
||||
getLoginCode(time.value).then((res : any) => {
|
||||
console.log("啥啊",res)
|
||||
form.captcha = res.message
|
||||
canclick.value = true
|
||||
})
|
||||
|
|
|
|||
|
|
@ -603,7 +603,7 @@
|
|||
margin-left: -15rpx;
|
||||
margin-top: 20rpx;
|
||||
width: 1600rpx;
|
||||
height: 1200rpx;
|
||||
height: 1000rpx;
|
||||
border-radius: 55rpx;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
|
|
|
|||
|
|
@ -1567,7 +1567,7 @@
|
|||
|
||||
.pao {
|
||||
position: absolute;
|
||||
right: 30rpx;
|
||||
right: 20rpx;
|
||||
top: 10rpx;
|
||||
width: 85rpx;
|
||||
height: 40rpx;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import { _ as _export_sfc, f as formatAppLog, r as requireNativePlugin } from "../_plugin-vue_export-helper.js";
|
||||
import { resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeStyle, createCommentVNode, createVNode } from "vue";
|
||||
const _style_0 = { "center-column": { "": { "width": 800, "height": 600, "overflow": "hidden" } } };
|
||||
const _style_0 = { "center-column": { "": { "width": 800, "height": 500, "overflow": "hidden" } } };
|
||||
const _sfc_main = {
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -558,14 +558,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|||
"div",
|
||||
{
|
||||
class: "center-column",
|
||||
style: normalizeStyle({ height: $data.isshow ? "600px" : "0px" })
|
||||
style: normalizeStyle({ height: $data.isshow ? "500px" : "0px" })
|
||||
},
|
||||
[
|
||||
createCommentVNode(" 视频播放组件 "),
|
||||
createVNode(_component_MonitorView, {
|
||||
ref: "monitor",
|
||||
init: "5",
|
||||
style: { "width": "800px", "height": "600px" },
|
||||
style: { "width": "800px", "height": "500px" },
|
||||
onOnTel: $options.handleTelEvent,
|
||||
onOnSnapShot: $options.handleSnapShotEvent,
|
||||
onOnRecord: $options.handleRecordEvent,
|
||||
|
|
|
|||
Loading…
Reference in New Issue