1178232204@qq.com 3 年 前
コミット
5ec29ce622

+ 10 - 1
src/css/appealUserPage.less

@@ -126,6 +126,15 @@
         background-color: @activeBg;
       }
     }
+    &.menu-55 {
+      background: url("../images/other.png") 20px 11px no-repeat;
+      &.active {
+        background: url("../images/other_a.png") 20px 11px no-repeat;
+      }
+      &.slide-up {
+        background-color: @activeBg;
+      }
+    }
   }
   .slide-up {
     background-color: @activeBg !important;
@@ -1021,7 +1030,7 @@
 #pacsIframeIn,
 #assistIframeIn,
 #pacsDetailIframeIn,
-#contentNursing {
+#contentNursing,#contentOther {
   //医嘱信息
   width: 100%;
   height: 100%;

+ 4 - 0
src/css/other.less

@@ -368,3 +368,7 @@
         cursor: pointer;
     }
 }
+.goDetailther:hover{
+    color: #00A1FF;
+    cursor: pointer;
+}

+ 9 - 0
src/css/qcScore.less

@@ -126,6 +126,15 @@
         background-color: @activeBg;
       }
     }
+    &.menu-55 {
+      background: url("../images/other.png") 20px 11px no-repeat;
+      &.active {
+        background: url("../images/other_a.png") 20px 11px no-repeat;
+      }
+      &.slide-up {
+        background-color: @activeBg;
+      }
+    }
   }
   .slide-up {
     background-color: @activeBg !important;

+ 2 - 0
src/html/appealUserPage.html

@@ -364,6 +364,8 @@
                     style="display: none;"></iframe>
                 <iframe src="./pacsDetail.html" frameborder="0" id="pacsDetailIframeIn" name="pacsDetailIframeIn"
                     style="display: none;"></iframe>
+                <iframe src="./other.html" frameborder="0" id="contentOther" name="contentOther"
+                    style="display: none;"></iframe>
             </div>
             <div class="content-box fl" id="contentInfo"></div>
             <div class="operation fr" id="flaws">

BIN
src/images/other.png


BIN
src/images/other_a.png


+ 12 - 6
src/js/appealUserPage.js

@@ -86,7 +86,7 @@ $(function () {
     $(".page").on("click", function () {
       $(".info-item .cont,.flaw-item,td").removeClass("active");   //清空缺陷定位背景
       const title = $(this).attr("code");
-      if (title === "缺陷总览" || title === "谈话告知书" || title === "知情同意书" || title === '医嘱信息' || title === '检验信息' || title === '检查信息' || title === '护理信息') {
+      if (title === "缺陷总览" || title === "谈话告知书" || title === "知情同意书" || title === '医嘱信息' || title === '检验信息' || title === '检查信息' || title === '护理信息' || title === '其他信息') {
         if (title === "缺陷总览") {
           getRecordDetailUpdate()
         }
@@ -122,25 +122,31 @@ $(function () {
         $("#contentIframeIn").contents().find(".adviceWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       });
     } else if (title === '检验信息') {
-      $("#contentIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentNursing").css("display", "none")
+      $("#contentIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentNursing,#contentOther").css("display", "none")
       $("#pacsIframeIn").css({ display: 'block' }).attr("src", 'pacs.html').contents().find(".pacsWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       $(window).resize(function () {
         $("#pacsIframeIn").contents().find(".pacsWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       });
     } else if (title === '检查信息') {
-      $("#contentIframeIn,#pacsIframeIn,#pacsDetailIframeIn,#contentNursing").css("display", "none")
+      $("#contentIframeIn,#pacsIframeIn,#pacsDetailIframeIn,#contentNursing,#contentOther").css("display", "none")
       $("#assistIframeIn").css({ display: 'block' }).attr("src", 'assist.html').contents().find(".assistWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       $(window).resize(function () {
         $("#assistIframeIn").contents().find(".assistWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       });
     } else if (title === '护理信息') {
-      $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentIframeIn").css("display", "none")
+      $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentIframeIn,#contentOther").css("display", "none")
       $("#contentNursing").css({ display: 'block' }).attr("src", 'nursing.html').contents().find(".nursingWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       $(window).resize(function () {
         $("#contentNursing").contents().find(".nursingWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
       });
+    } else if (title === '其他信息') {
+      $("#pacsIframeIn,#assistIframeIn,#pacsDetailIframeIn,#contentIframeIn,#contentNursing").css("display", "none")
+      $("#contentOther").css({ display: 'block' }).attr("src", 'other.html').contents().find(".otherWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
+      $(window).resize(function () {
+        $("#contentOther").contents().find(".otherWrp").height(window.innerHeight - $("#patientInfo").height() - 20 + 'px')
+      });
     } else {
-      $("#contentIframeIn,#pacsIframeIn,#pacsDetailIframeIn,#assistIframeIn,#contentNursing").css({ display: 'none' })
+      $("#contentIframeIn,#pacsIframeIn,#pacsDetailIframeIn,#assistIframeIn,#contentNursing,#contentOther").css({ display: 'none' })
     }
   }
 
@@ -577,7 +583,7 @@ $(function () {
           appealExplain: $("#delModal #qcInfo").val(),
           appealOperationType: info.appealOperationType ? info.appealOperationType : 0,
           appealType: 1,
-          checkId: $(".checker-drop-input").attr("code") == "输血/血制品病程记录"?'输血血制品病程记录':$(".checker-drop-input").attr("code"),
+          checkId: $(".checker-drop-input").attr("code") == "输血/血制品病程记录" ? '输血血制品病程记录' : $(".checker-drop-input").attr("code"),
           modeId: info.modelId,
           modeName: info.modelName,
           qcresultDetailId: info.id,

+ 2 - 3
src/js/other.js

@@ -355,7 +355,7 @@ function renderTab(data, activePage) {
         str += `
             <tr  data-index=${i}>
                 <td  class="textCenter">${(activePage - 1) * 15 + i + 1}</td>
-                <td class="textCenter"><span class="goDetail" data-id=${item.recId}>${item.recTitle || '-'}</span></td>
+                <td class="textCenter"><span class="goDetailther" data-id=${item.recId}>${item.recTitle || '-'}</span></td>
                 <td class="textCenter">${item.recDate || '-'}</td>
             </tr>
         `
@@ -381,7 +381,7 @@ $("th[code]").on("click", function (e) {
     getTabData(1);
 });
 function goDetail(data) {
-    $(".goDetail").click(function () {
+    $(".goDetailther").click(function () {
         const id = $(this).attr("data-id")
         getMedRecordContentOther(id)
         // let defectName = $(this).attr("data-name")
@@ -397,7 +397,6 @@ function getMedRecordContentOther(id) {
             let data = res.data.data.htmlText
             window["filter"] = data;
             window.open("mentCenter.html"); 
-            
         } else { }
     }).catch((e) => {
 

+ 0 - 7
src/js/qcScore.js

@@ -52,13 +52,6 @@ $(function () {
     });
   }
   function initMenu(data) {
-    console.log(data);
-    data.push({
-      id: 6,
-      name: "其他信息",
-      parentId: -1,
-      sonMode: [],
-    })
     const menu = [{ id: 0, name: "缺陷总览", parentId: -1, sonMode: [] }, ...(data || [])];
     //菜单数据填充
     $("#subMenuTmpl").tmpl(menu).appendTo("#subMenu");