diff --git a/component/public/donghua.vue b/component/public/donghua.vue index aa5648f..5c76030 100644 --- a/component/public/donghua.vue +++ b/component/public/donghua.vue @@ -21,130 +21,205 @@ )) --> - \ No newline at end of file diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue index bb55164..6cfc409 100644 --- a/pages/NursingNew/component/leftcontent/serveswipe.vue +++ b/pages/NursingNew/component/leftcontent/serveswipe.vue @@ -1577,7 +1577,7 @@ .message-view { display: flex; - + font-size: 25rpx; .message-shu { width: 3rpx; height: 1.5vw; diff --git a/pages/NursingNew/component/nurse/index.css b/pages/NursingNew/component/nurse/index.css index 17fbe88..80b100f 100644 --- a/pages/NursingNew/component/nurse/index.css +++ b/pages/NursingNew/component/nurse/index.css @@ -1453,20 +1453,6 @@ margin-left: -5rpx; display: flex; align-items: center; - - .target-gray { - background-color: #F8F8FA; - border: 1rpx solid #D5D5D5; - display: flex; - height: 100%; - align-items: center; - padding: 0 18rpx; - border-radius: 10rpx; - font-size: 28rpx; - color: #222222; - } - - } .target-contain { @@ -1550,7 +1536,7 @@ top: 310rpx; left: 0; width: 100%; - height: 472rpx; + height: 490rpx; background-color: #fff; border: 2rpx solid rgba(0, 137, 254, 0.29); border-radius: 35rpx; @@ -1800,7 +1786,7 @@ right: 20rpx; top: 50%; transform: translateY(-50%); - width: 200rpx; + width: 220rpx; height: 70%; background-color: #0089FE; border-radius: 20rpx; @@ -1809,6 +1795,13 @@ align-items: center; color: #fff; font-size: 35rpx; + + .white-imge { + width: 40rpx; + height: 40rpx; + margin-right: 5rpx; + } + } } @@ -2128,16 +2121,17 @@ .packtarget-end { width: 100%; - height: 200rpx; + height: 240rpx; display: flex; padding-top: 15rpx; position: relative; + /* background-color: red; */ .target-edit { position: absolute; right: 5rpx; - bottom: -20rpx; + bottom: 0rpx; width: 130rpx; height: 60rpx; display: flex; @@ -2151,8 +2145,8 @@ } .end-icon { - width: 100rpx; - height: 100rpx; + width: 80rpx; + height: 80rpx; margin-left: 20rpx; margin-top: 5rpx; margin-right: 20rpx; @@ -2165,15 +2159,12 @@ border: 1rpx solid #D5D5D5; display: flex; height: 35rpx; - width: 100%; - /* align-items: center; */ - /* padding: 0 10rpx; */ + padding: 0 10rpx; border-radius: 10rpx; - font-size: 23rpx; - color: #222222; + font-size: 25rpx; + color: #7a7a7a; justify-content: center; align-items: center; - margin-top: 10rpx; } .packtarget-title { @@ -2186,7 +2177,7 @@ position: absolute; top: 2.5rpx; left: 0; - font-size: 31rpx; + font-size: 32rpx; /* margin-top: 3rpx; */ } @@ -2199,7 +2190,10 @@ } .packtarget-serviceContent { - width: 350rpx; + position: absolute; + left: 0; + top: 100rpx; + width: 530rpx; height: 70rpx; margin-top: 10rpx; font-size: 25rpx; @@ -2406,11 +2400,13 @@ width: 100%; height: 100%; } -.includestwo-father{ + +.includestwo-father { display: flex; align-items: center; - margin-top: 5rpx; + margin-top: 5rpx; } + .includestwo { width: 110rpx; @@ -2423,26 +2419,32 @@ align-items: center; color: #fff; } -.includestwo-detail{ + +.includestwo-detail { font-size: 25rpx; margin-left: 10rpx; } -.includestwo-image{ + +.includestwo-image { width: 12rpx; height: 11rpx; margin-left: 6rpx; } -.target-gray-spec{ + +.target-gray-spec { background-color: #F8F8FA; border: 1rpx solid #D5D5D5; display: flex; height: 35rpx; - /* align-items: center; */ padding: 0 10rpx; border-radius: 10rpx; font-size: 25rpx; color: #222222; justify-content: center; align-items: center; - /* margin-top: 10rpx; */ +} +.gray-view{ + display: flex; + align-items: center; + margin-top: 7rpx; } \ No newline at end of file diff --git a/pages/NursingNew/component/nurse/newindex.vue b/pages/NursingNew/component/nurse/newindex.vue index 6642d89..3b89148 100644 --- a/pages/NursingNew/component/nurse/newindex.vue +++ b/pages/NursingNew/component/nurse/newindex.vue @@ -64,7 +64,7 @@ - ({{ item1.directiveName?splitString(item1.directiveName)[1]:""}}) - + 指令集合 详情 - + - + @@ -307,7 +309,7 @@ {{ bottomItems[moreindex]?.directiveName }} - {{ bottomItems[moreindex]?.serviceContent }} + {{ bottomItems[moreindex]?.serviceContent || `暂无指令详细信息` }} @@ -349,16 +351,18 @@ - - + - {{ ruleritem.includesarray?.length >1?`长按可进行删除操作。`:`双击服务指令可添加矩阵, 长按服务指令可拖动到即时指令区进行添加。` }} - + {{ ruleritem.includesarray?.length >1?`长按可进行删除操作。`:`双击服务指令可添加矩阵, 长按服务指令可拖动到即时指令区进行添加。` }} + @@ -473,7 +477,7 @@ {{ savePackagelist[packnumber]?.directives[packdetail]?.directiveName }} - {{ savePackagelist[packnumber]?.directives[packdetail]?.serviceContent }} + {{ savePackagelist[packnumber]?.directives[packdetail]?.serviceContent || `暂无指令详细信息` }} @@ -529,7 +533,7 @@ - {{ ruleritem.serviceContent }} + {{ ruleritem.serviceContent || `暂无指令详细信息` }} @@ -561,10 +565,10 @@ {{ ruleritem?.includesarray[packtargetindex]?.newtypename }} - + {{ ruleritem?.includesarray[packtargetindex]?.newtypename }} - + | @@ -579,7 +583,8 @@ + @click.stop="cleanallopen();packtargetindex=index;killbaddata = true" + :key="index"> - - {{ ruleritem?.includesarray[packtargetindex]?.categoryName }} - - - {{ ruleritem?.includesarray[packtargetindex]?.typeName }} - - - - {{ splitString(ruleritem?.includesarray[packtargetindex]?.directiveName)[0] + (splitString(ruleritem?.includesarray[packtargetindex]?.directiveName)[1]?`(${splitString(ruleritem?.includesarray[packtargetindex]?.directiveName)[1]})`:"") }} - + + - - - - {{ ruleritem?.includesarray[packtargetindex]?.serviceContent }} - + + {{ ruleritem?.includesarray[packtargetindex]?.serviceContent || `暂无指令详细信息` }} + 添加 @@ -656,9 +658,9 @@ - + - + - {{ editingmode?"确定":"+编辑" }} + + {{ editingmode?"只读模式":"编辑模式" }} @@ -1017,7 +1020,13 @@ nosave.value.cycleValue = Number(inputnum.value).toString() } isclickright.value = true - let allobject = ruleritem.value + let allobject = {} + if(whitetou.value){ + allobject = smallcard.value + }else{ + allobject = ruleritem.value + } + const now = new Date(); const ts = `${now.getFullYear()}-${(now.getMonth() + 1).toString().padStart(2, '0')}-${now.getDate().toString().padStart(2, '0')} ${now.getHours().toString().padStart(2, '0')}:${now.getMinutes().toString().padStart(2, '0')}:${now.getSeconds().toString().padStart(2, '0')}`; let data = { @@ -1034,10 +1043,10 @@ optCount: nosave.value.optCount, optTime: ts, } - console.log("啥情况", data) - // return + // console.log("啥情况", data) + editDirective(data).then((res) => { - console.log("啥情况", res) + // console.log("啥情况1111", res) if (res.success) { geteverything() setTimeout(() => { @@ -1084,8 +1093,13 @@ optCount: "", }) const whitetou = ref(false); + const smallcard = ref({}); const edititems = (item : any, whitetoushow : boolean) => { + if(whitetoushow){ + smallcard.value = item; + } whitetou.value = whitetoushow + nosave.value.cycleTypeId = item.cycleTypeId; nosave.value.cycleValue = item.cycleValue nosave.value.optCount = item.optCount diff --git a/pages/NursingNew/component/pleasetake/common/htditem.vue b/pages/NursingNew/component/pleasetake/common/htditem.vue index 197af1b..865aaeb 100644 --- a/pages/NursingNew/component/pleasetake/common/htditem.vue +++ b/pages/NursingNew/component/pleasetake/common/htditem.vue @@ -484,7 +484,7 @@ margin-top: 2vw; margin-bottom: 0.8vw; margin-left: 1.2vw; - background: red; + // background: red; // padding: 0.2vw; // padding: 0.5vw; // margin: 0.7vw auto 0.3vw; diff --git a/pages/NursingNew/index.vue b/pages/NursingNew/index.vue index 4737956..7450a6c 100644 --- a/pages/NursingNew/index.vue +++ b/pages/NursingNew/index.vue @@ -249,7 +249,7 @@ // console.log("???????????????",res.result.records[0].permissionList) arrlist.value = [{ name: '首页', url: '/static/shouye/sy/h0.png', urls: '/static/shouye/sy/h1.png', type: 'hldy' }]; let tbr = []; - console.log("xxxx",res) + // console.log("xxxx",res) if (arr) { arr.forEach((v, i) => { let obj = arrs.find(item => diff --git a/pages/login/newanimationpage.vue b/pages/login/newanimationpage.vue index 932ee38..7e78df0 100644 --- a/pages/login/newanimationpage.vue +++ b/pages/login/newanimationpage.vue @@ -158,7 +158,7 @@ onShow(() => { setTimeout(() => { playall.value = true; - }, 2000) + }, 300) zyupgrade.value?.check_update(); queryPadPageList().then((res => { @@ -370,11 +370,11 @@ } const ceshijump = () => { - ceshiopen.value = true + // ceshiopen.value = true // uni.navigateTo({ // url:"/pages/login/ceshi" // }) - console.log("wtf") + // console.log("wtf") // try { // const Intent = plus.android.importClass('android.content.Intent') // const Uri = plus.android.importClass('android.net.Uri') diff --git a/static/index/changemode.png b/static/index/changemode.png new file mode 100644 index 0000000..a7bdaf9 Binary files /dev/null and b/static/index/changemode.png differ