2025.3.11

component/rightItemsindex/index.vue

@@ -396,16 +396,13 @@
 		<!-- 弹出层左上角 -->
 		<view v-if="isPopupVisible" class="popup-overlay" @click="closePopup"
 			:style="isPopupVisiblefiropen?{backgroundColor:`rgba(89, 109, 154, 0.5)`}:`{}`">
-			<!-- <view class="" @click.stop>
-
-			</view> -->
 			<view class="popup-overlay-content" @click.stop
 				:style="{ width: widthCom + 'rpx',height: heightCom + 'rpx',top: topCom + 'rpx',left: leftCom + 'rpx' }">
 				<view class="right-container-fir-left-nav-open">
 					<view :class="darkFans?`right-container-fir-left-card-dark`:`right-container-fir-left-card`">
 						<view
 							style="width:1350rpx ;display: flex;justify-content: center;align-items: center;transition: all 0.4s ease-in-out;transform-origin: left top; /* 缩放 */"
-							:style="isPopupVisiblefiropen?{transform: `scale(1.4)`,marginLeft:`0`,marginTop:`0`}:{transform: `scale(1)`,marginLeft:`0rpx`,marginTop:`-100rpx`}">
+							:style="isPopupVisiblefiropen?{transform: `scale(1.4)`,marginLeft:`0`,marginTop:`0`}:{transform: `scale(1)`,marginLeft:`0rpx`,marginTop:`-89rpx`}">
 							<image class="right-container-fir-left-card-hulilei" :src="`/static/index/hulilei.png`" />
 							<div class="right-container-fir-left-card-hulilei-font" @click="closePopup">护理类</div>
 							<image v-if="darkFans" class="card-upfaguang" :src="`/static/index/cardbgc/uplight.png`" />
@@ -522,8 +519,8 @@
 				:style="{ width: widthComsec + 'rpx',height: heightComsec + 'rpx',top: topComsec + 'rpx',left: leftComsec + 'rpx' }">
 				<view :class="darkFans?`right-container-left-dark`:`right-container-left`">
 					<view
-						style="display: flex;justify-content: center;align-items: center;transition: all 0.4s ease-in-out;"
+						style="display: flex;justify-content: center;align-items: center;transition: all 0.4s ease-in-out;transform-origin: left bottom;"
-						:style="isPopupVisiblefiropensec?{transform: `scale(1.5)`,marginLeft:``,marginTop:`200rpx`}:{transform: `scale(1)`,marginLeft:`100rpx`,marginTop:`200rpx`}">
+						:style="isPopupVisiblefiropensec?{transform: `scale(1.5)`,marginLeft:`-630rpx`,marginTop:`650rpx`}:{transform: `scale(1)`,marginLeft:`100rpx`,marginTop:`150rpx`}">
 						<image class="right-container-left-type" :src="`/static/index/yiliao/yiliaolei.png`" />
 						<div class="right-container-left-font" @click="closePopupsec">医疗类</div>
 						<image v-if="darkFans" class="card-upfaguang-down" :src="`/static/index/cardbgc/uplight.png`" />
@@ -589,7 +586,7 @@
 														</text>
 													</view>
 													<view class="time-button-view"
-														:style="isPopupVisiblefiropensec?{marginTop:`50rpx`}:`{}`">
+														>
 														<view class="time-button-start">
 															开始服务
 														</view>
@@ -618,10 +615,10 @@
 							<image v-if="darkFans" class="split-line-white-img"
 								:src="`/static/index/cardbgc/leftlight.png`" />
 						</view>
-						<view class="right-huli-fir" style="width: 250rpx;height: 700rpx;margin-top: -100rpx;">
+						<view class="right-huli-fir" style="width: 250rpx;height: 700rpx;margin-top: -150rpx;">
 							<image class="right-huli-shang" :src="`/static/index/hulilist/shang.png`" />
 							<scroll-view v-if="!darkFans" :show-scrollbar="false" scroll-y="true"
-								class="right-huli-view">
+								class="right-huli-view" :style="isPopupVisiblefiropensec?{height:`700rpx`}:{}">
 								<view v-for="(item,index) in mediumList" :key="index" class="right-huli-view-dis">
 									<image class="right-huli-img" :src="item.url" />
 									<text class="right-huli-text">{{item.name}}</text>

pages/index/index.vue

@@ -20,8 +20,10 @@
 				</view>
 			</view>
 		</view>
+		<!-- 主页 -->
 		<rightItemsfirst :isshow="menuIndexshow" :darkFans="darkFans" v-show="!menuIndex" @darkchange="darkchange" />
-		<rightItemssecond :isshow="menuIndexshowsecond" :canmove="canmove" :darkFans="darkFans" v-show="menuIndex==1" @darkchange="darkchange" @savename="openname"/>
+		<!-- 超凶表格 -->
+		<rightItemssecond ref="ruler" :liang="indexNumber" :isshow="menuIndexshowsecond" :canmove="canmove" :darkFans="darkFans" v-show="menuIndex==1" @darkchange="darkchange" @savename="openname"/>
 	</view>
 </template>
 
@@ -91,22 +93,65 @@
 	const clientY = ref(0);
 	const savename = ref("")
 	const canmove = ref(true)
+	const indexNumber = ref({
+		index0:999,
+		index1:999,
+	})
 	//全局获得x轴和y轴
-	const getxy = (event) => {
+	const getxyrel = (event) => {
 		const touch = event.touches[0];
-		clientX.value = 2*(Math.floor(touch.clientX) - 60);
+		clientX.value = 2*(Math.floor(touch.clientX) - 100);
 		clientY.value = 2*(Math.floor(touch.clientY) - 55);
+		// 遍历数组，找到点击区域所在的对象
+		const translateX =  Math.floor(touch.clientX) - 50;
+		const translateY =  Math.floor(touch.clientY) - 25;
+		const clickedItem = fangkuaiValue.value.find(item => {
+		  return translateX >= item.left && translateX <= item.right &&
+		         translateY >= item.top && translateY <= item.bottom;
+		});
+		// 如果找到，则输出该对象的 index0 和 index1
+		if (clickedItem) {
+		  const { index0, index1 } = clickedItem.dataset;
+		  indexNumber.value.index0 = index0
+		  indexNumber.value.index1 = index1
+		} else{
+			indexNumber.value.index0 = 999
+			indexNumber.value.index1 = 999
+		}
 	}
-	const openname = (res:string) =>{
+	//节流
+	const getxy = throttle(getxyrel, 10);
+	
+	const fangkuaiValue = ref([])
+	//所有适合的方块
+	const openname = (res:string,fangkuai:Object) =>{
 		savename.value = res;
 		canmove.value = false;
+		fangkuaiValue.value = fangkuai
 	}
-	//禁止滑动
+	const ruler = ref(null)
+	//结束、禁止滑动
 	const cleanall = () =>{
-		savename.value = "";
 		clientX.value = 9999;
 		clientY.value = 9999;
 		canmove.value = true;
+		indexNumber.value = {
+			index0:999,
+			index1:999,
+		};
+		ruler.value?.rulerEnd(savename.value);
+		savename.value = "";
+	}
+	//节流函数
+	function throttle(fn, delay) {
+	  let lastExecutionTime = 0;
+	  return function(...args) {
+	    const now = Date.now();
+	    if (now - lastExecutionTime >= delay) {
+	      lastExecutionTime = now;
+	      fn.apply(this, args);
+	    }
+	  };
 	}
 	// 生命周期钩子
 	onShow(() => {
@@ -148,6 +193,7 @@
 		font-size: 45rpx;
 		font-weight: 700;
 		z-index: 10;
+		pointer-events: none;
 	}
 	.left-container {
 		width: 235rpx;

pages/somethingmove/index.vue

@@ -17,7 +17,7 @@
 	
 	// 生命周期钩子
 	onLoad((options:darkFanstype) => {
-		// 为啥这么写，因为options给我返回的是字符转`false`,只能这么写
+		// 为啥这么写，因为options给我返回的是字符串这个`false`,只能这么写，前端中`false`是true
 		if(options.darkFans === `false`){
 			darkFans.value = false
 		}else{

unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,8 +1,8 @@
 {
-  "hash": "8b32d2fb",
+  "hash": "3a4e4f22",
-  "configHash": "e24a12a6",
+  "configHash": "4f93fa68",
   "lockfileHash": "e3b0c442",
-  "browserHash": "6cbe70c8",
+  "browserHash": "cbe9be9c",
   "optimized": {},
   "chunks": {}
 }

unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,7 +1,7 @@
 
   ;(function(){
   let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
-  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","bounce":"none","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app x","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"养老App","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.45","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"locales":{},"darkmode":false,"themeConfig":{}};
+  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","bounce":"none","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app x","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"养老App","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"4.55","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"locales":{},"darkmode":false,"themeConfig":{}};
   const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/login/login","meta":{"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/somethingmove/index","meta":{"navigationBar":{"style":"custom","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
   __uniConfig.styles=[];//styles
   __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

unpackage/dist/dev/app-plus/manifest.json

@@ -89,7 +89,7 @@
     "uni-app": {
       "control": "uni-v3",
       "vueVersion": "3",
-      "compilerVersion": "4.45",
+      "compilerVersion": "4.55",
       "nvueCompiler": "uni-app",
       "renderer": "auto",
       "nvue": {

unpackage/dist/dev/app-plus/pages/index/index.css

@@ -3318,6 +3318,71 @@
   height: 2.5rem;
 }
 
+.super-card[data-v-337bb5da] {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  height: calc(100% - 12.5rem);
+  margin-top: 0.9375rem;
+}
+.super-card .scroll-x[data-v-337bb5da] {
+  height: 100%;
+  width: 100%;
+}
+.super-card .super-card-container[data-v-337bb5da] {
+  background-color: #f1f7fd;
+  overflow: hidden;
+  width: 51.5625rem;
+  height: 24.375rem;
+  border-radius: 0.625rem;
+  border: 0.03125rem solid black;
+}
+.super-card .super-card-time[data-v-337bb5da] {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: #e9efff;
+  height: 2.5rem;
+  width: 3.125rem;
+  border-right: 0.03125rem solid #BFBFCB;
+}
+.super-card .super-card-time-und[data-v-337bb5da] {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 3.125rem;
+  flex-direction: column;
+  border-right: 0.03125rem solid #BFBFCB;
+}
+.super-card .super-card-time-card[data-v-337bb5da] {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 4.375rem;
+  width: calc(100%);
+  border-right: 0.03125rem solid #BFBFCB;
+  border-top: 0.03125rem solid #BFBFCB;
+}
+.super-card .super-card-time-card-blue[data-v-337bb5da] {
+  background-color: #3FA9F5;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 4.375rem;
+  width: calc(100%);
+  border-right: 0.03125rem solid #BFBFCB;
+  border-top: 0.03125rem solid #BFBFCB;
+}
+.super-card .super-card-time-card-yellow[data-v-337bb5da] {
+  background-color: #FFDBA1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 4.375rem;
+  width: calc(100%);
+  border-right: 0.03125rem solid #BFBFCB;
+  border-top: 0.03125rem solid #BFBFCB;
+}
 .right-container[data-v-337bb5da] {
   width: calc(100% - 7.34375rem);
   height: 100vh;
@@ -3397,7 +3462,6 @@
   padding: 0.3125rem 0.9375rem;
   border-radius: 1.25rem;
   border: 0.0625rem solid #fff;
-  font-size: 1.25rem;
 }
 .right-container .doctorsay-container-view .doctorsay-container-items .doctorsay-container-down .doctorsay-container-button .doctorsay-container-button-gun[data-v-337bb5da] {
   position: absolute;
@@ -3417,6 +3481,31 @@
   /* 右下角阴影 */
   overflow: hidden;
 }
+.right-container .doctorsay-container-view .doctorsay-container-container .super-card-end[data-v-337bb5da] {
+  width: 100%;
+  height: 6.25rem;
+  display: flex;
+}
+.right-container .doctorsay-container-view .doctorsay-container-container .super-card-end .super-end-father[data-v-337bb5da] {
+  height: 100%;
+  display: flex;
+  width: 100%;
+}
+.right-container .doctorsay-container-view .doctorsay-container-container .super-card-end .super-end-father .super-end-font-father[data-v-337bb5da] {
+  display: flex;
+}
+.right-container .doctorsay-container-view .doctorsay-container-container .super-card-end .super-end-father .super-end-font-father .super-end-font-gun[data-v-337bb5da] {
+  margin-left: 1.25rem;
+  margin-right: 0.625rem;
+  width: 0.40625rem;
+  height: 1.71875rem;
+  background: linear-gradient(to bottom, #04BCED, #0160CE);
+  border-radius: 0.3125rem;
+}
+.right-container .doctorsay-container-view .doctorsay-container-container .super-card-end .super-end-father .super-end-font-father .super-end-font-font[data-v-337bb5da] {
+  font-size: 1.3125rem;
+  font-weight: 700;
+}
 .right-container .doctorsay-container-view .doctorsay-container-container .doctorsay-container-title[data-v-337bb5da] {
   width: 100%;
   height: 4.0625rem;
@@ -3425,6 +3514,55 @@
   align-items: center;
   justify-content: space-between;
 }
+.right-container .doctorsay-container-view .doctorsay-container-container .doctorsay-container-title .doctorsay-container-right[data-v-337bb5da] {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  width: 18.4375rem;
+}
+.right-container .doctorsay-container-view .doctorsay-container-container .doctorsay-container-title .doctorsay-container-right .doctorsay-container-button-father[data-v-337bb5da] {
+  display: flex;
+}
+.right-container .doctorsay-container-view .doctorsay-container-container .doctorsay-container-title .doctorsay-container-right .doctorsay-container-button-father .doctorsay-container-button-target[data-v-337bb5da] {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: #3FA9F5;
+  color: #fff;
+  width: 4.375rem;
+  height: 1.875rem;
+  margin-right: 0.625rem;
+  font-size: 0.875rem;
+  border-radius: 0.3125rem;
+}
+.right-container .doctorsay-container-view .doctorsay-container-container .doctorsay-container-title .doctorsay-container-right .doctorsay-container-button-father .doctorsay-container-button[data-v-337bb5da] {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: #fff;
+  width: 4.375rem;
+  height: 1.875rem;
+  margin-right: 0.625rem;
+  font-size: 0.875rem;
+  border-radius: 0.3125rem;
+}
+.right-container .doctorsay-container-view .doctorsay-container-container .doctorsay-container-title .doctorsay-container-right .doctorsay-container-right-kuai-cheng[data-v-337bb5da] {
+  background-color: #FFDBA1;
+  height: 0.9375rem;
+  width: 0.9375rem;
+  border-radius: 0.15625rem;
+}
+.right-container .doctorsay-container-view .doctorsay-container-container .doctorsay-container-title .doctorsay-container-right .doctorsay-container-right-kuai-zi[data-v-337bb5da] {
+  background-color: #7B61FF;
+  height: 0.9375rem;
+  width: 0.9375rem;
+  border-radius: 0.15625rem;
+}
+.right-container .doctorsay-container-view .doctorsay-container-container .doctorsay-container-title .doctorsay-container-right .doctorsay-container-kuai-font[data-v-337bb5da] {
+  font-size: 0.875rem;
+  margin-left: 0.3125rem;
+  margin-right: 0.78125rem;
+}
 .right-container .doctorsay-container-view .doctorsay-container-container .doctorsay-container-title .doctorsay-container-left[data-v-337bb5da] {
   display: flex;
 }
@@ -3590,6 +3728,7 @@
   font-size: 1.40625rem;
   font-weight: 700;
   z-index: 10;
+  pointer-events: none;
 }
 .left-container[data-v-1cf27b2a] {
   width: 7.34375rem;