Merge branch 'master' of https://172.16.32.165/lighter/vue-intergration-platform

src/api/emr-control/emr-time-limit-prompt.ts

@@ -17,7 +17,7 @@ export function timeLimitPromptByPatientNo(patNo: string) {
     })
 }
 
-export function myPatientQualityControl(doctor) {
+export function myPatientQualityControl(doctor: string) {
     return request({
         url: '/timeLimitPrompt/myPatientQualityControl',
         method: 'get',

src/components/cy/iframe/Iframes.vue

@@ -1,31 +0,0 @@
-<script setup lang="ts">
-import {iframeList, IframeOption} from "@/components/cy/iframe/useIframe";
-
-function setEl(el, item: IframeOption) {
-  item.ref = el
-}
-
-</script>
-
-<template>
-  <div class="iframes">
-    <iframe
-        class="iframes-class"
-        :ref="(el) => setEl(el, item)"
-        :src="item.src"
-        :style="item.style"
-        v-show="item.show"
-        v-for="item in iframeList"/>
-  </div>
-</template>
-
-<style lang="scss">
-.iframes-class {
-  border: 0;
-  position: fixed;
-
-  iframe {
-    transition: all 1s;
-  }
-}
-</style>

src/components/cy/iframe/useIframe.ts

@@ -1,57 +0,0 @@
-import {Ref, ref, nextTick, onDeactivated, onActivated} from "vue";
-import {useResizeObserver} from "@vueuse/core";
-import sleep from "@/utils/sleep";
-
-export const iframeList: Ref<IframeOption[]> = ref([])
-
-export declare type IframeOption = {
-    src: string;
-    show?: boolean,
-    ref?: Ref<HTMLIFrameElement>,
-    style?: any
-}
-
-export function useIframe(div: Ref<HTMLDivElement>, opt: IframeOption) {
-    opt.show = true
-    opt.style = {}
-    const index = iframeList.value.push(opt) - 1
-
-    useResizeObserver(div, (entries) => {
-        const entry = entries[0]
-        const {width, height} = entry.contentRect
-        if (width === 0 && height === 0) {
-            iframeList.value[index].show = false
-            return
-        }
-        iframeList.value[index].style.width = width + 'px';
-        iframeList.value[index].style.height = height + 'px';
-
-        nextTick(async () => {
-            await sleep(300)
-            const rect = div.value.getBoundingClientRect();
-            if (rect.top === 0 && rect.left === 0) {
-                iframeList.value[index].show = false
-                return
-            }
-            iframeList.value[index].style.top = rect.top + 'px';
-            iframeList.value[index].style.left = rect.left + 'px';
-            iframeList.value[index].show = true
-        })
-    })
-
-    onActivated(() => {
-        iframeList.value[index].show = true
-    })
-
-    onDeactivated(() => {
-        iframeList.value[index].show = false
-    })
-
-    function stop() {
-        iframeList.value.splice(index, 1)
-    }
-
-    return {
-        stop
-    }
-}

src/components/xiao-chan/xc-table-v3/XcTableV3.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script setup lang="tsx">
-import {computed, defineProps, nextTick, onMounted, ref, useSlots, watch} from 'vue'
+import {computed, nextTick, onMounted, ref, useSlots, watch} from 'vue'
 import XcTableV3Column from "@/components/xiao-chan/xc-table-v3/XcTableV3Column.vue";
 import {useIntersectionObserver, useResizeObserver} from "@vueuse/core";
 import {xcMessage} from "@/utils/xiaochan-element-plus";

src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrAuxiliaryTools.vue

@@ -18,15 +18,16 @@
       </template>
     </template>
   </el-popover>
-  <el-drawer v-model="drawer"
-             direction="btt"
-             append-to-body
-             @opened="handleDrawerOpened"
-             modal-class="change_padding"
-             @closed="currentComp = null"
-             destroy-on-close
-             size="100%"
-             :with-header="false">
+  <el-drawer
+      v-model="drawer"
+      direction="btt"
+      append-to-body
+      @opened="handleDrawerOpened"
+      modal-class="change_padding"
+      @closed="currentComp = ''"
+      destroy-on-close
+      size="100%"
+      :with-header="false">
     <el-button class="close_but"
                type="danger"
                :style="{zIndex: zIndex}"
@@ -41,7 +42,7 @@
 
 <script setup lang="ts">
 import EmrOrderList from "@/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrOrderList.vue";
-import {defineProps, onMounted, ref, h, computed} from 'vue'
+import {onMounted, ref, h, computed} from 'vue'
 import EmrYzTemperature from "@/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrYzTemperature.vue";
 import {patInfo} from './emr-tools-store'
 import EmrInspect from "@/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrInspect.vue";
@@ -184,6 +185,14 @@ const drawerRange: {
       comp: () => {
         return h(BloodSugar, {...propsPatientInfo.value})
       }
+    }, {
+      name: '手麻',
+      comp: () => {
+        return h('iframe', {
+          class: 'layout_full_size',
+          src: `http://172.16.32.181/interface/patient/doc.html?admissionNum=${propsPatientInfo.value.patNo}&admissionTimes=${propsPatientInfo.value.times}`
+        })
+      }
     }
   ],
   "引用": [
@@ -239,7 +248,7 @@ function handelClick(item) {
   }
 }
 
-const currentComp = ref(null)
+const currentComp = ref('')
 
 const setComp = (comp) => {
   currentComp.value = comp

src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrIframe.vue

@@ -0,0 +1,13 @@
+<script setup lang="ts">
+const props = defineProps<{
+  url: ''
+}>()
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="scss">
+
+</style>

src/utils/request-v2.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import request from './request'
 import {AxiosRequestConfig} from "axios";
 

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/query-die/comp/AnalysisChart.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {defineProps, nextTick} from "vue";
+import { nextTick} from "vue";
 import {QueryDieReturn} from "@/api/emr-control/query-die";
 import * as echarts from 'echarts';
 

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/query-die/comp/DieEmr.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import XcTable from "@/components/xiao-chan/xc-table/XcTable.vue";
-import {defineProps} from 'vue'
 import {QueryDieReturn} from "@/api/emr-control/query-die";
 
 const {resData} = defineProps<{

src/views/utilities/page-editor-help/components/JsEditDialog.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {defineProps, nextTick, onMounted, ref} from "vue";
+import { nextTick, onMounted, ref} from "vue";
 import {useVModel} from "@vueuse/core";
 import * as monaco from 'monaco-editor';
 import sleep from "@/utils/sleep";

src/views/utilities/page-editor-help/components/PageForm.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {defineProps, ref} from 'vue'
+import { ref} from 'vue'
 import {componentType} from "@/components/query-components/page-help-type";
 import JsEditDialog from "./JsEditDialog.vue";
 import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'