skcj 2 rokov pred
rodič
commit
51d93c3352

BIN
ruoyi-ui/src/assets/images/a6.png


BIN
ruoyi-ui/src/assets/images/a7.png


+ 36 - 5
ruoyi-ui/src/views/sjhome/index.vue

@@ -897,10 +897,12 @@ export default {
           }
           }
         ];
         ];
         this.mapData2.forEach((item) => {
         this.mapData2.forEach((item) => {
+          item.oldlb=item.lb;
           if (item.lb=="01")
           if (item.lb=="01")
-            item.lb="3"
+            item.lb="3";
           if (item.lb=="02")
           if (item.lb=="02")
             item.lb="4"
             item.lb="4"
+
           if (item.lb=="03")
           if (item.lb=="03")
             item.lb="5"
             item.lb="5"
           if (item.lb=="04")
           if (item.lb=="04")
@@ -909,6 +911,12 @@ export default {
           if (item.lb=="05")
           if (item.lb=="05")
             item.lb="7"
             item.lb="7"
 
 
+          if (item.lb=="06")
+            item.lb="8"
+
+          if (item.lb.length>2)
+            item.lb="9"
+
         })
         })
         this.mapData2.forEach((item) => {
         this.mapData2.forEach((item) => {
           if (item.lat && item.lng) {
           if (item.lat && item.lng) {
@@ -1521,9 +1529,13 @@ export default {
               response.data.mapData[0].lb = "5"
               response.data.mapData[0].lb = "5"
             if (response.data.mapData[0].fxlb == "04")
             if (response.data.mapData[0].fxlb == "04")
               response.data.mapData[0].lb = "6"
               response.data.mapData[0].lb = "6"
-
             if (response.data.mapData[0].fxlb == "05")
             if (response.data.mapData[0].fxlb == "05")
               response.data.mapData[0].lb = "7"
               response.data.mapData[0].lb = "7"
+            if (response.data.mapData[0].fxlb == "06")
+              response.data.mapData[0].lb = "8"
+
+            if (response.data.mapData[0].fxlb.length>2)
+              response.data.mapData[0].lb = "9"
           }
           }
           response.data.mapData[0].jgfl="其他";
           response.data.mapData[0].jgfl="其他";
           if (response.data.mapData[0].lb=="0")
           if (response.data.mapData[0].lb=="0")
@@ -1542,6 +1554,12 @@ export default {
             response.data.mapData[0].jgfl="农村养老大院";
             response.data.mapData[0].jgfl="农村养老大院";
           if (response.data.mapData[0].lb=="7")
           if (response.data.mapData[0].lb=="7")
             response.data.mapData[0].jgfl="农村养老互助院";
             response.data.mapData[0].jgfl="农村养老互助院";
+          if (response.data.mapData[0].lb=="8")
+            response.data.mapData[0].jgfl="社区老年食堂";
+          if (response.data.mapData[0].lb=="9") {
+            //alert(response.data.mapData[0].fxlb);
+            response.data.mapData[0].jgfl = "复合型社区机构";
+          }
           let xjhtml = '';
           let xjhtml = '';
           //let pddj=Math.floor(Math.random()*5+1);
           //let pddj=Math.floor(Math.random()*5+1);
           let pddj = parseInt(response.data.mapData[0].pddj);
           let pddj = parseInt(response.data.mapData[0].pddj);
@@ -1553,7 +1571,8 @@ export default {
               xjhtml += '<span style="color: #e1e1e1;font-size: 25px">✰</span>'
               xjhtml += '<span style="color: #e1e1e1;font-size: 25px">✰</span>'
             }
             }
           }
           }
-
+          if (response.data.mapData[0].is_kzylfw=='1') response.data.mapData[0].is_kzylfw='是';
+          else response.data.mapData[0].is_kzylfw='否';
           infoWindow.setContent(
           infoWindow.setContent(
 	          '<div onclick=\'window.openjg("' + response.data.mapData[0].id + '","'+response.data.mapData[0].lb+'")\' style="cursor: pointer; color: #1a70ff;display: flex;  justify-content: left;  align-items: center;">' +
 	          '<div onclick=\'window.openjg("' + response.data.mapData[0].id + '","'+response.data.mapData[0].lb+'")\' style="cursor: pointer; color: #1a70ff;display: flex;  justify-content: left;  align-items: center;">' +
             '<image width="40px" src="'+ this.jgico[response.data.mapData[0].lb].src+'"></image>'+response.data.mapData[0].jgmc +
             '<image width="40px" src="'+ this.jgico[response.data.mapData[0].lb].src+'"></image>'+response.data.mapData[0].jgmc +
@@ -1563,6 +1582,9 @@ export default {
             '<div>机构类别:' +
             '<div>机构类别:' +
             (response.data.mapData[0].jgfl ? response.data.mapData[0].jgfl : '无')  +
             (response.data.mapData[0].jgfl ? response.data.mapData[0].jgfl : '无')  +
             '</div>' +
             '</div>' +
+            '<div>医养结合:' +
+            (response.data.mapData[0].is_kzylfw ? response.data.mapData[0].is_kzylfw : '否')  +
+            '</div>' +
             '<div>机构地址:' +
             '<div>机构地址:' +
             (response.data.mapData[0].txdz ? response.data.mapData[0].txdz : '无') +
             (response.data.mapData[0].txdz ? response.data.mapData[0].txdz : '无') +
             '</div>' +
             '</div>' +
@@ -1654,7 +1676,16 @@ export default {
       {
       {
         src: require("../../assets/images/a5.png"),
         src: require("../../assets/images/a5.png"),
         label: "社区机构-农村养老互助院"
         label: "社区机构-农村养老互助院"
-      }]
+      },
+      {
+        src: require("../../assets/images/a6.png"),
+        label: "社区机构-社区老年食堂"
+      },
+      {
+        src: require("../../assets/images/a7.png"),
+        label: "社区机构-复合型社区机构"
+      }
+    ]
     this.getYljgFbtTjList(this.user.userData.dept.locationCode);
     this.getYljgFbtTjList(this.user.userData.dept.locationCode);
     this.getDBList();
     this.getDBList();
     this.getSqylfwjghssList();
     this.getSqylfwjghssList();
@@ -2097,7 +2128,7 @@ export default {
 
 
   /*border: red solid 1px;*/
   /*border: red solid 1px;*/
   z-index: 1999;
   z-index: 1999;
-  width: 620px;
+  width: 780px;
   display: flex;
   display: flex;
   background-color: rgba(0, 255, 255, 0.5);
   background-color: rgba(0, 255, 255, 0.5);
   height: 60px;
   height: 60px;