Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini
This commit is contained in:
commit
cf5884000a
|
|
@ -438,7 +438,7 @@
|
|||
required: true,
|
||||
},
|
||||
});
|
||||
const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
|
||||
const serverUrl = ref(uni.getStorageSync('imagebase'))
|
||||
const opendata = ref(false);
|
||||
const bodystatus = ref(false);
|
||||
const bodystatustarget = ref(-1);
|
||||
|
|
|
|||
|
|
@ -591,12 +591,25 @@
|
|||
}
|
||||
|
||||
.title-time-font-rel {
|
||||
font-size: 23rpx;
|
||||
margin-bottom: 5rpx;
|
||||
|
||||
margin-top: 9rpx;
|
||||
font-size: 33rpx;
|
||||
font-weight: 800;
|
||||
/* margin-bottom: 5rpx; */
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
color: #888888;
|
||||
color: black;
|
||||
}
|
||||
|
||||
.title-time-font-tags {
|
||||
font-size: 24rpx;
|
||||
font-weight: 600;
|
||||
/* margin-bottom: 5rpx; */
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.title-time-items {
|
||||
|
|
@ -811,11 +824,13 @@
|
|||
width: 100%;
|
||||
position: relative;
|
||||
|
||||
|
||||
|
||||
.title-time-time {
|
||||
font-size: 32rpx;
|
||||
margin: 0 auto;
|
||||
font-weight: 600;
|
||||
/* margin-left: 10rpx; */
|
||||
/* margin-left: 20rpx; */
|
||||
/* margin-top: 12rpx; */
|
||||
}
|
||||
|
||||
|
|
@ -1648,12 +1663,19 @@
|
|||
}
|
||||
}
|
||||
|
||||
.tags-img {
|
||||
width: 50rpx;
|
||||
height: 50rpx;
|
||||
margin-bottom: 10rpx;
|
||||
.tags-img-view {
|
||||
width: 50%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
|
||||
.tags-img {
|
||||
width: 50rpx;
|
||||
height: 50rpx;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.specia-onshow {
|
||||
background-color: rgb(241, 245, 252);
|
||||
width: 100%;
|
||||
|
|
@ -1994,17 +2016,174 @@
|
|||
height: 1278rpx;
|
||||
width: 600rpx;
|
||||
border-radius: 30rpx;
|
||||
.right-tags{
|
||||
|
||||
.right-tags {
|
||||
background-color: #fff;
|
||||
width: 100%;
|
||||
height: 220rpx;
|
||||
border-radius: 35rpx;
|
||||
|
||||
.right-tags-title{
|
||||
position: relative;
|
||||
|
||||
.setting-open {
|
||||
position: absolute;
|
||||
top: 80rpx;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 830rpx;
|
||||
background-color: #fff;
|
||||
border: 1rpx solid rgba(0, 137, 254, 0.29);
|
||||
border-radius: 30rpx;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
.right-tags-title {
|
||||
width: 100%;
|
||||
height: 80rpx;
|
||||
display: flex;
|
||||
background-color: red;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
|
||||
.right-setting {
|
||||
position: absolute;
|
||||
right: 23rpx;
|
||||
top: 20rpx;
|
||||
width: 90rpx;
|
||||
height: 46rpx;
|
||||
background-color: #F2F3F8;
|
||||
color: #555555;
|
||||
font-size: 27rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 10rpx;
|
||||
border: 1rpx solid #E5E5E5;
|
||||
}
|
||||
}
|
||||
|
||||
.right-contont {
|
||||
width: 100%;
|
||||
height: 140rpx;
|
||||
display: flex;
|
||||
|
||||
|
||||
|
||||
|
||||
.tags-leftmenu {
|
||||
width: 48%;
|
||||
height: 100%;
|
||||
position: relative;
|
||||
|
||||
.leftmenu-shu {
|
||||
position: absolute;
|
||||
top: 30%;
|
||||
right: 0;
|
||||
transform: translateY(-30%);
|
||||
width: 1rpx;
|
||||
height: 70%;
|
||||
background-color: #EEEEEE;
|
||||
}
|
||||
|
||||
/* background-color: red; */
|
||||
}
|
||||
|
||||
.tags-rightmenu {
|
||||
width: 52%;
|
||||
height: 100%;
|
||||
position: relative;
|
||||
/* background-color: red; */
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.blue-shu {
|
||||
background-color: #0089FE;
|
||||
width: 9rpx;
|
||||
height: 26rpx;
|
||||
border-radius: 5rpx;
|
||||
margin-right: 13rpx;
|
||||
}
|
||||
|
||||
.blue-font {
|
||||
font-size: 33rpx;
|
||||
}
|
||||
|
||||
.title-time-border-hisOk {
|
||||
border: 2rpx solid #D4E4FE;
|
||||
width: calc(100% - 15rpx);
|
||||
height: calc(100% - 15rpx);
|
||||
border-radius: 20rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
background-color: #F6F9FF;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.title-time {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
height: 100%;
|
||||
padding: 25rpx;
|
||||
padding-top: 18rpx;
|
||||
|
||||
.card-time {
|
||||
position: absolute;
|
||||
bottom: 30rpx;
|
||||
left: 30rpx;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
||||
.card-time-red {
|
||||
position: absolute;
|
||||
bottom: 15rpx;
|
||||
left: 20rpx;
|
||||
font-size: 28rpx;
|
||||
color: #E33B3B;
|
||||
}
|
||||
|
||||
.card-time-blue {
|
||||
position: absolute;
|
||||
bottom: 15rpx;
|
||||
left: 20rpx;
|
||||
font-size: 28rpx;
|
||||
color: #4690FF;
|
||||
}
|
||||
|
||||
.title-time-time {
|
||||
font-size: 32rpx;
|
||||
margin: 0 auto;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.title-time-button {
|
||||
position: absolute;
|
||||
top: -6rpx;
|
||||
right: -4rpx;
|
||||
width: 55rpx;
|
||||
height: 40rpx;
|
||||
}
|
||||
|
||||
.title-time-font {
|
||||
position: absolute;
|
||||
top: 0rpx;
|
||||
right: 4rpx;
|
||||
font-size: 20rpx;
|
||||
color: #1083f8;
|
||||
}
|
||||
}
|
||||
|
||||
.weight-time {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.haven-img {
|
||||
width: 130rpx;
|
||||
height: 130rpx;
|
||||
position: absolute;
|
||||
top: 45%;
|
||||
left: 50%;
|
||||
transform: translate(-45%, -50%);
|
||||
}
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
:id="`a${index0}_${index1}`" style="position: relative;"
|
||||
@click="rulerTouchClick(item1,index0,index1)"
|
||||
:data-index0="index0" :data-index1="index1">
|
||||
<view class="time-button-orange-spe"
|
||||
<!-- <view class="time-button-orange-spe"
|
||||
:style="{left:flyNumber.index0?`-130rpx`:`0`}"
|
||||
v-if="flyNumber.index0 === index0 && flyNumber.index1 === index1 && index1==0">
|
||||
请选择服务指令迁移的目标单元格
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
v-if="flyNumber.index0 === index0 && flyNumber.index1 === index1 && index1">
|
||||
请选择服务指令迁移的目标单元格
|
||||
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="title-time-blue"
|
||||
v-show="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule">
|
||||
<image class="blue-img" lazy-load
|
||||
|
|
@ -67,34 +67,38 @@
|
|||
|
||||
<view :class="getClass(item1,index0,index1)"
|
||||
style="font-size: 30rpx;overflow: hidden;"
|
||||
:style="{ animationDelay:`-${computeDelay(index0, index1).toFixed(2)}s`,border:saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1? `2rpx solid #46B2F6`:'' }">
|
||||
:style="{ animationDelay:`-${computeDelay(index0, index1).toFixed(2)}s`,border:saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1? `2rpx solid #46B2F6`:'' }">
|
||||
|
||||
<view class="title-time" v-if="item1.startTime"
|
||||
style="flex-direction: column;">
|
||||
<image v-show="item1.startTime"
|
||||
style="width: 50rpx;height: 50rpx;margin: 0 auto;margin-top: 20rpx"
|
||||
:src="item1.netImmediateFile?item1.netImmediateFile:`/static/logo.png`" />
|
||||
<view class="title-time-time" style="font-size: 30rpx;">
|
||||
{{item1.startTime + `-` + item1.endTime}}
|
||||
<view v-if="item1.startTime"
|
||||
class="title-time-font-rel">
|
||||
{{ item1.directiveName?splitString(item1.directiveName)[0]:""}}
|
||||
</view>
|
||||
<image class="title-time-button"
|
||||
style="width: 80rpx;height: 50rpx;"
|
||||
v-if="item1.cycleTypeId!=1"
|
||||
src="/static/index/newruler/jiao.png" />
|
||||
<view class="title-time-font"
|
||||
style="right: 10rpx;top: 5rpx;"
|
||||
v-if="item1.cycleTypeId!=1">
|
||||
{{item1.cycleType}}
|
||||
<view
|
||||
v-if="item1.startTime&&splitString(item1.directiveName)[1]"
|
||||
class="title-time-font-tags">
|
||||
({{ item1.directiveName?splitString(item1.directiveName)[1]:""}})
|
||||
</view>
|
||||
<view v-if="item1.startTime" class="card-time">
|
||||
|
||||
<view class="weight-time">
|
||||
{{ item1.startTime }}
|
||||
<text style="margin: 0 3rpx;">
|
||||
-
|
||||
</text>
|
||||
{{ item1.endTime }}
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view v-if="item1.startTime" class="title-time-font-rel">
|
||||
{{splitString(item1.directiveName)[0]}}
|
||||
</view>
|
||||
<view
|
||||
v-if="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && isRule && !item1.startTime"
|
||||
<!-- <view
|
||||
v-if="saveEditIndex.index0 == index0 && saveEditIndex.index1 == index1 && !item1.startTime"
|
||||
class="pulic-time">
|
||||
|
||||
{{(item0.positioning.length == 1 ? ('0' + item0.positioning) : item0.positioning) + ":" + timeArray[index1]}}
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -108,9 +112,57 @@
|
|||
<view class="right-order">
|
||||
<view class="right-tags">
|
||||
<view class="right-tags-title">
|
||||
|
||||
<view class="blue-shu" style="margin-left: 35rpx;"></view>
|
||||
<view class="blue-font">
|
||||
体型标签
|
||||
</view>
|
||||
<view class="blue-shu" style="margin-left: 92rpx;"></view>
|
||||
<view class="blue-font">
|
||||
情绪标签
|
||||
</view>
|
||||
<view class="right-setting">
|
||||
设置
|
||||
</view>
|
||||
</view>
|
||||
<view class="right-contont">
|
||||
<view class="tags-leftmenu">
|
||||
<view class="leftmenu-shu"></view>
|
||||
<!-- <view v-for="(item,index) in bodyTagListLook" :key="index" class="tags-img-view">
|
||||
<image class="tags-img" :src="item" />
|
||||
</view> -->
|
||||
|
||||
<image class="haven-img" src="/static/index/procurement/haven.png"
|
||||
mode="aspectFill"></image>
|
||||
|
||||
</view>
|
||||
<view class="tags-rightmenu">
|
||||
<image class="haven-img" style="left: 40%;"
|
||||
src="/static/index/procurement/haven.png" mode="aspectFill"></image>
|
||||
|
||||
</view>
|
||||
<!-- <view v-for="(item,index) in emotionTagListLook" :key="index">
|
||||
<image class="tags-img" style="width: 40rpx;height: 40rpx;margin: 0 10rpx;"
|
||||
:src="item" />
|
||||
</view> -->
|
||||
<!-- <view style="display: flex;flex-wrap: wrap;">
|
||||
<view v-for="(item,index) in bodyTagList" :key="index" @click="addbody(index)">
|
||||
<view class="tags-father" :class="bodystatustarget===index?'secondtarget':''">
|
||||
<image class="tags-img"
|
||||
:src="item.izSelected==`Y`?item.netPicFocus: item.netPic" />
|
||||
<view class="tags-font"
|
||||
:style="item.izSelected==`Y`?{color:`rgb(54, 159, 239)`}:{}">
|
||||
{{item.tagName}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
</view>
|
||||
<view class="setting-open">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -281,7 +333,7 @@
|
|||
required: true,
|
||||
},
|
||||
});
|
||||
|
||||
const serverUrl = ref(uni.getStorageSync('imagebase'))
|
||||
const bodystatus = ref(false);
|
||||
const bodystatustarget = ref(-1);
|
||||
const facestatus = ref(false);
|
||||
|
|
@ -677,16 +729,49 @@
|
|||
// 方法：根据条件返回不同的类名
|
||||
const getClass = (item, index0, index1) => {
|
||||
if (item.startTime) {
|
||||
if (flyNumber.value.index0 === (index0) && flyNumber.value.index1 === index1) {
|
||||
return 'title-time-border-yellow-active-transparent';
|
||||
} else if (shakyTable.value) {
|
||||
return 'title-time-border-yellow-active';
|
||||
} else {
|
||||
return 'title-time-border-yellow';
|
||||
}
|
||||
return 'title-time-border-hisOk';
|
||||
// switch (item.executeStatus) {
|
||||
// case 'hisOk':
|
||||
// return 'title-time-border-hisOk';
|
||||
// case 'hisUnExe':
|
||||
// return 'title-time-border-hisFaild';
|
||||
// case 'hisTimeOut':
|
||||
// return 'title-time-border-hisFaild';
|
||||
|
||||
// case 'current':
|
||||
// return 'title-time-border-current';
|
||||
|
||||
// case 'future':
|
||||
// return 'title-time-border-future';
|
||||
|
||||
// }
|
||||
}
|
||||
return 'title-time-border';
|
||||
}
|
||||
// const getFontClass = (item : any, index0, index1) => {
|
||||
|
||||
// switch (item.executeStatus) {
|
||||
// case 'hisUnExe':
|
||||
// return 'card-time-red';
|
||||
// case 'hisTimeOut':
|
||||
// return 'card-time-red';
|
||||
|
||||
// case 'current':
|
||||
// return 'card-time-blue';
|
||||
|
||||
// default:
|
||||
// return 'card-time';
|
||||
// }
|
||||
// }
|
||||
// 处理分钟和小时的函数
|
||||
function parseHourMinutestring(startTime) {
|
||||
// 假设格式固定为 "YYYY-MM-DD HH:MM:SS"
|
||||
const parts = startTime.split(' ');
|
||||
if (parts.length < 2) return { hour: NaN, minute: NaN };
|
||||
|
||||
const [hh, mm] = parts[1].split(':');
|
||||
return { hour: hh, minute: mm };
|
||||
}
|
||||
// 通用的生成函数
|
||||
function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
|
||||
return Array.from({ length: count }, (_, i) => {
|
||||
|
|
@ -1318,6 +1403,7 @@
|
|||
const geteverything = () => {
|
||||
if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
|
||||
getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
|
||||
console.log("zzzz", res)
|
||||
timearr.value = Array.from({ length: 24 }, (_, hour) => ({
|
||||
positioning: hour.toString(),
|
||||
children: minuteArr.map(time => ({
|
||||
|
|
@ -1341,9 +1427,12 @@
|
|||
bodyTagList.value = res.result.bodyTagList
|
||||
res.result.bodyTagList.forEach((res : any) => {
|
||||
if (res.izSelected == 'Y') {
|
||||
bodyTagListLook.value.push(res.netPic)
|
||||
bodyTagListLook.value.push(res.pic)
|
||||
console.log("我看看",serverUrl.value + res.pic)
|
||||
console.log("我看看总的",res)
|
||||
}
|
||||
})
|
||||
console.log("看看图标", bodyTagListLook.value)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,13 @@ export const getLoginCode = (time) => {
|
|||
method: 'get',
|
||||
})
|
||||
}
|
||||
//获得图片base
|
||||
export const getPublicMediaUrl = (time) => {
|
||||
return request({
|
||||
url: `/api/baseInfo/getPublicMediaUrl`,
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
||||
//登录
|
||||
export const loginApp = (params) => {
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@
|
|||
import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue'
|
||||
import oneseven from '@/pages/login/oneseven.vue'
|
||||
import twoseven from '@/pages/login/twoseven.vue'
|
||||
import { isRel, getLoginCode, loginApp } from './api.js'
|
||||
import { isRel, getLoginCode, loginApp,getPublicMediaUrl } from './api.js'
|
||||
import huakuai from '@/component/public/huakuai.vue'
|
||||
import { initWs, connectWs } from '@/common/websocketManager.js';
|
||||
|
||||
|
|
@ -184,6 +184,7 @@
|
|||
showPopup.value = false;
|
||||
}
|
||||
onMounted(()=>{
|
||||
|
||||
uni.setStorageSync("appWgtVersion", uni.getSystemInfoSync().appWgtVersion)
|
||||
if (uni.getStorageSync('appWgtVersion') != uni.getSystemInfoSync().appWgtVersion) {
|
||||
showPopup.value = true;
|
||||
|
|
@ -404,6 +405,10 @@
|
|||
});
|
||||
connectWs(); // 主动连接 WebSocket
|
||||
}
|
||||
// 获得图片前缀
|
||||
getPublicMediaUrl().then((res:any)=>{
|
||||
uni.setStorageSync("imagebase", res.result)
|
||||
})
|
||||
jumpTo(`/pages/login/newanimationpage`)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<template>
|
||||
<view>
|
||||
<view class="ceshi" v-if="ceshiopen" @click="ceshiopen=false">
|
||||
<image class="all-home" src="/static/ceshi.png" mode="aspectFit"></image>
|
||||
<image class="all-home" src="/static/ceshi1.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
<view class="home">
|
||||
<image class="all-home" src="/static/index/warehouse/newindexhome/backdro.jpg" mode="scaleToFill"></image>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 161 KiB |
Loading…
Reference in New Issue