合并代码
This commit is contained in:
parent
cf5884000a
commit
d7cf9daddc
|
|
@ -1663,19 +1663,32 @@
|
|||
}
|
||||
}
|
||||
|
||||
.tags-img-view {
|
||||
.tags-img-father {
|
||||
width: 80%;
|
||||
margin-left: 10%;
|
||||
display: flex;
|
||||
|
||||
.tags-img-view {
|
||||
width: 50%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
/* justify-content: center; */
|
||||
margin-top: 10rpx;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
font-size: 28rpx;
|
||||
color: #666666;
|
||||
/* justify-content: center; */
|
||||
|
||||
.tags-img {
|
||||
width: 50rpx;
|
||||
height: 50rpx;
|
||||
|
||||
margin-bottom: 12rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
.specia-onshow {
|
||||
background-color: rgb(241, 245, 252);
|
||||
width: 100%;
|
||||
|
|
@ -2029,11 +2042,159 @@
|
|||
top: 80rpx;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 830rpx;
|
||||
height: 900rpx;
|
||||
background-color: #fff;
|
||||
border: 1rpx solid rgba(0, 137, 254, 0.29);
|
||||
border-radius: 30rpx;
|
||||
border: 2rpx solid rgba(0, 137, 254, 0.29);
|
||||
border-radius: 35rpx;
|
||||
|
||||
.setting-right {
|
||||
position: absolute;
|
||||
right: 25rpx;
|
||||
bottom: 35rpx;
|
||||
width: 120rpx;
|
||||
height: 60rpx;
|
||||
font-size: 30rpx;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
color: #0080FC;
|
||||
border: 2rpx solid #0080FC;
|
||||
border-radius: 10rpx;
|
||||
background-color: #F5FAFF;
|
||||
}
|
||||
|
||||
.setting-list {
|
||||
width: 100%;
|
||||
height: 620rpx;
|
||||
margin-top: 10rpx;
|
||||
|
||||
.list-items {
|
||||
min-height: 124rpx;
|
||||
height: 124rpx;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.check-box {
|
||||
margin-left: 52rpx;
|
||||
width: 32rpx;
|
||||
height: 32rpx;
|
||||
border: 2rpx solid #d5d5d5;
|
||||
border-radius: 12rpx;
|
||||
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
font-size: 15rpx;
|
||||
font-weight: 800;
|
||||
color: #d5d5d5;
|
||||
}
|
||||
.check-box-target {
|
||||
margin-left: 52rpx;
|
||||
width: 32rpx;
|
||||
height: 32rpx;
|
||||
border: 2rpx solid #0080FC;
|
||||
border-radius: 12rpx;
|
||||
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
font-size: 15rpx;
|
||||
font-weight: 800;
|
||||
color: #0080FC;
|
||||
}
|
||||
.check-img{
|
||||
width: 50rpx;
|
||||
height: 50rpx;
|
||||
margin: 0 22rpx;
|
||||
}
|
||||
.check-text{
|
||||
width: 400rpx;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
/* justify-content: center; */
|
||||
.check-weight{
|
||||
font-weight: 800;
|
||||
font-size: 29rpx;
|
||||
}
|
||||
.check-text{
|
||||
font-size: 26rpx;
|
||||
color: #666666;
|
||||
}
|
||||
/* background-color: red; */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.setting-menu {
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-left: 25rpx;
|
||||
position: relative;
|
||||
|
||||
.menu-tags {
|
||||
width: 155rpx;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
||||
.menu-heng {
|
||||
position: absolute;
|
||||
bottom: 23rpx;
|
||||
left: 70rpx;
|
||||
width: 20rpx;
|
||||
height: 5rpx;
|
||||
border-radius: 5rpx;
|
||||
background-color: #0080FC;
|
||||
transition: left 0.3s ease;
|
||||
}
|
||||
}
|
||||
|
||||
.setting-warn {
|
||||
width: 89%;
|
||||
margin-left: 5.5%;
|
||||
height: 47rpx;
|
||||
border: 2rpx dashed #EE2C35;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
color: #EE2C35;
|
||||
padding-left: 20rpx;
|
||||
border-radius: 10rpx;
|
||||
background-color: #FFF6F6;
|
||||
font-size: 25rpx;
|
||||
/* margin-top: 0 10rpx; */
|
||||
margin-top: -10rpx;
|
||||
margin-bottom: 10rpx;
|
||||
}
|
||||
|
||||
.triangle {
|
||||
position: absolute;
|
||||
top: -8.34rpx;
|
||||
right: 52rpx;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-left: 14.44rpx solid transparent;
|
||||
border-right: 14.44rpx solid transparent;
|
||||
border-bottom: 8.34rpx solid rgba(0, 137, 254, 0.29);
|
||||
|
||||
.triangle-small {
|
||||
position: absolute;
|
||||
top: 1.2rpx;
|
||||
right: 50%;
|
||||
transform: translateX(50%);
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-left: 14.44rpx solid transparent;
|
||||
border-right: 14.44rpx solid transparent;
|
||||
border-bottom: 8.34rpx solid #fff;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -2060,6 +2221,22 @@
|
|||
border-radius: 10rpx;
|
||||
border: 1rpx solid #E5E5E5;
|
||||
}
|
||||
|
||||
.right-setting-target {
|
||||
position: absolute;
|
||||
right: 23rpx;
|
||||
top: 20rpx;
|
||||
width: 90rpx;
|
||||
height: 46rpx;
|
||||
background-color: #F2F3F8;
|
||||
color: #0089FE;
|
||||
font-size: 27rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 10rpx;
|
||||
border: 1rpx solid #0089FE;
|
||||
}
|
||||
}
|
||||
|
||||
.right-contont {
|
||||
|
|
@ -2067,13 +2244,11 @@
|
|||
height: 140rpx;
|
||||
display: flex;
|
||||
|
||||
|
||||
|
||||
|
||||
.tags-leftmenu {
|
||||
width: 48%;
|
||||
width: 47%;
|
||||
height: 100%;
|
||||
position: relative;
|
||||
display: flex;
|
||||
|
||||
.leftmenu-shu {
|
||||
position: absolute;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<template>
|
||||
<view class="right-container" :style="isshow?{opacity: `1`}:{opacity: `0`}"
|
||||
@click="bottomisShaking=false;shakyTable = false">
|
||||
<severcard ></severcard>
|
||||
<severcard></severcard>
|
||||
<view class="doctorsay-container-view">
|
||||
<view class="doctorsay-container-container">
|
||||
<view class="super-card">
|
||||
|
|
@ -120,47 +120,84 @@
|
|||
<view class="blue-font">
|
||||
情绪标签
|
||||
</view>
|
||||
<view class="right-setting">
|
||||
<view :class="settingopen?`right-setting-target` :`right-setting`" @click="clickopen">
|
||||
设置
|
||||
</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 class="tags-img-father">
|
||||
<view v-for="(item,index) in bodyTagListLook" :key="index"
|
||||
class="tags-img-view">
|
||||
<image class="tags-img" :src="serverUrl + item.pic" />
|
||||
<view class="">
|
||||
{{ item.tagName }}
|
||||
</view>
|
||||
<view class="tags-rightmenu">
|
||||
<image class="haven-img" style="left: 40%;"
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<image class="haven-img" v-if="!bodyTagListLook.length"
|
||||
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 class="tags-rightmenu">
|
||||
<view class="tags-img-father" style="margin-left: 10rpx;">
|
||||
<view v-for="(item,index) in emotionTagListLook" :key="index"
|
||||
class="tags-img-view">
|
||||
<image class="tags-img" :src="serverUrl + item.pic" />
|
||||
<view class="">
|
||||
{{ item.tagName }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<image class="haven-img" v-if="!emotionTagListLook.length"
|
||||
src="/static/index/procurement/haven.png" mode="aspectFill"></image>
|
||||
|
||||
</view>
|
||||
<view class="setting-open">
|
||||
|
||||
</view>
|
||||
<view class="setting-open" v-show="settingopen">
|
||||
<view class="triangle">
|
||||
<view class="triangle-small"></view>
|
||||
</view>
|
||||
<view class="setting-menu">
|
||||
<view class="menu-tags" :style="menutype===index?{fontWeight:`700`}:{}"
|
||||
v-for="(item,index) in [`体型标签`,`情绪标签`]" :key="index" @click="clickmenu(index) ">
|
||||
{{ item }}
|
||||
</view>
|
||||
<view class="menu-heng" :style="menutype?{left:`222rpx`}:{}"></view>
|
||||
</view>
|
||||
<view class="setting-warn">
|
||||
{{ menutype?`情绪`:`体型`}}标签可复选两项
|
||||
</view>
|
||||
<view class="setting-list">
|
||||
<scroll-view style="height: 100%;width:100%;" scroll-with-animation scroll-y>
|
||||
<view class="list-items" v-for="(item,index) in listsave" :key="index"
|
||||
@click="clickcard(index)">
|
||||
<view :class="item.izSelected==`Y`?`check-box-target`: `check-box`">
|
||||
✓
|
||||
</view>
|
||||
<image class="check-img"
|
||||
:src="serverUrl + (item.izSelected==`Y`?item.picFocus: item.pic)" />
|
||||
<view class="check-text">
|
||||
<view class="check-weight"
|
||||
:style="item.izSelected==`Y`?{color:`#0074E1`}: {}">
|
||||
{{ item.tagName }}
|
||||
</view>
|
||||
<view class="check-text"
|
||||
:style="item.izSelected==`Y`?{color:`#0074E1`}: {}">
|
||||
四肢承伸直且僵硬无法弯曲状（标识要区分为左右和手脚）
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</scroll-view>
|
||||
</view>
|
||||
<view class="setting-right" @click="saverightclick">
|
||||
确定
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
|
@ -338,6 +375,9 @@
|
|||
const bodystatustarget = ref(-1);
|
||||
const facestatus = ref(false);
|
||||
const facestatustarget = ref(-1);
|
||||
const menutype = ref(0)
|
||||
|
||||
const settingopen = ref(false);
|
||||
|
||||
/* ---- 用于 transform 的响应式字符串 ----
|
||||
注意：虽然这是响应式，但我们只在 rAF 里更新它（受控更新），避免频繁触发 Vue 渲染 */
|
||||
|
|
@ -730,39 +770,9 @@
|
|||
const getClass = (item, index0, index1) => {
|
||||
if (item.startTime) {
|
||||
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"
|
||||
|
|
@ -1403,7 +1413,7 @@
|
|||
const geteverything = () => {
|
||||
if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
|
||||
getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId')).then((res : any) => {
|
||||
console.log("zzzz", res)
|
||||
console.log("zzzz11111111111", uni.getStorageSync('nuId'), uni.getStorageSync('elderId'))
|
||||
timearr.value = Array.from({ length: 24 }, (_, hour) => ({
|
||||
positioning: hour.toString(),
|
||||
children: minuteArr.map(time => ({
|
||||
|
|
@ -1421,18 +1431,18 @@
|
|||
bodyTagListLook.value = []
|
||||
res.result.emotionTagList.forEach((res : any) => {
|
||||
if (res.izSelected == 'Y') {
|
||||
emotionTagListLook.value.push(res.netPic)
|
||||
emotionTagListLook.value.push(res)
|
||||
}
|
||||
})
|
||||
bodyTagList.value = res.result.bodyTagList
|
||||
res.result.bodyTagList.forEach((res : any) => {
|
||||
if (res.izSelected == 'Y') {
|
||||
bodyTagListLook.value.push(res.pic)
|
||||
console.log("我看看",serverUrl.value + res.pic)
|
||||
console.log("我看看总的",res)
|
||||
bodyTagListLook.value.push(res)
|
||||
// console.log("我看看",serverUrl.value + res.pic)
|
||||
// console.log("我看看总的", res)
|
||||
}
|
||||
})
|
||||
console.log("看看图标", bodyTagListLook.value)
|
||||
// console.log("看看图标", bodyTagListLook.value)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -1440,7 +1450,7 @@
|
|||
onMounted(() => {
|
||||
savePackagelist.value = uni.getStorageSync('Packagelist') || []
|
||||
let res = uni.getStorageSync('saveTree0')
|
||||
// console.log("00000",res)
|
||||
console.log("00000", res)
|
||||
let goodArray = []
|
||||
myArray.forEach((element : any) => {
|
||||
element.children.forEach((element1 : any) => {
|
||||
|
|
@ -1476,8 +1486,9 @@
|
|||
})
|
||||
})
|
||||
bigArray.value = res.result;
|
||||
}
|
||||
downList.value = bigArray.value[0].children
|
||||
}
|
||||
|
||||
upmenuIndex.value = -1;
|
||||
downdonghua.value = -1;
|
||||
setTimeout(() => {
|
||||
|
|
@ -1501,6 +1512,46 @@
|
|||
}
|
||||
const bodyTagListLook = ref([]);
|
||||
const emotionTagListLook = ref([]);
|
||||
|
||||
const bodyTagListLooksave = ref([]);
|
||||
const emotionTagListLooksave = ref([]);
|
||||
const listsave = ref([])
|
||||
|
||||
const clickopen = () => {
|
||||
settingopen.value = !settingopen.value;
|
||||
if (settingopen.value) {
|
||||
bodyTagListLooksave.value = JSON.parse(JSON.stringify(bodyTagList.value));
|
||||
emotionTagListLooksave.value = JSON.parse(JSON.stringify(emotionTagList.value));
|
||||
listsave.value = bodyTagListLooksave.value
|
||||
menutype.value = 0
|
||||
}
|
||||
}
|
||||
const saverightclick = () => {
|
||||
settingopen.value = false;
|
||||
bodyTagList.value = bodyTagListLooksave.value;
|
||||
emotionTagList.value = emotionTagListLooksave.value;
|
||||
saveAll()
|
||||
}
|
||||
const clickmenu = (index : number) => {
|
||||
menutype.value = index;
|
||||
if (index) {
|
||||
listsave.value = emotionTagListLooksave.value
|
||||
} else {
|
||||
listsave.value = bodyTagListLooksave.value
|
||||
}
|
||||
|
||||
}
|
||||
const clickcard = (index : number) => {
|
||||
let data = menutype.value ? emotionTagListLooksave.value : bodyTagListLooksave.value
|
||||
if (data[index].izSelected === 'Y') {
|
||||
data[index].izSelected = 'N'
|
||||
} else {
|
||||
if (data.filter(item => item.izSelected === 'Y').length !== 2) {
|
||||
data[index].izSelected = 'Y'
|
||||
}
|
||||
}
|
||||
listsave.value = data
|
||||
}
|
||||
const cansumit = ref(false);
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
|
|
|
|||
BIN
static/ceshi.png
BIN
static/ceshi.png
Binary file not shown.
|
Before Width: | Height: | Size: 151 KiB After Width: | Height: | Size: 213 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 143 KiB |
|
|
@ -570,7 +570,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|||
)
|
||||
]);
|
||||
}
|
||||
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
|
||||
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
|
||||
export {
|
||||
camera as default
|
||||
};
|
||||
|
|
|
|||
|
|
@ -578,7 +578,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|||
)
|
||||
]);
|
||||
}
|
||||
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
|
||||
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
|
||||
export {
|
||||
fullcamera as default
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue