Merge branch '王立生' of sckj/mz-cloud into master

ruoyi-web/index.html

@@ -12,6 +12,8 @@
       securityJsCode: 'e49f166f9eeb4c9c8e7e5e9e623e28a2 '
     };
   </script>
+    <link rel="stylesheet" type="text/css" href="/viewer.css">
+    <script  src="/viewer.js"></script>
   <style type="text/css">
     /*html {*/
       /*font-size: 37.5px;*/

ruoyi-web/src/views/yldt/index.vue

@@ -64,7 +64,7 @@
       <div class="jg_button">
 
         <div  v-for="(ico,index) in jgico" :key="ico.label" :label="ico.label">
-          <img :src="ico.src" :title="ico.label" sel="0" @dblclick="onflclick($event,index)" style="width: 46px;height: 46px;margin-right: 5px">&nbsp;&nbsp;&nbsp;
+          <img :src="ico.src"   :title="ico.label" sel="0" @dblclick="onflclick($event,index)" style="width: 46px;height: 46px;margin-right: 5px;cursor:pointer">&nbsp;&nbsp;&nbsp;
         </div>
 
         <!--				<el-button-group type="vertical" v-model="buttonGroup1">
@@ -132,7 +132,7 @@
           <el-carousel height="202px" style="width: 98%; margin: 11px auto" indicator-position="none">
             <el-carousel-item v-for="(item, index) in formXq.jg_url" :key="index">
               <!-- <img :src="item" class="topImg" /> -->
-              <el-image class="topImg" :src="item" fit="scale-down">
+              <el-image class="topImg" :src="item" @dblclick="piclclick($event,item,formXq.jg_url)" fit="scale-down">
                 <template #error>
                   <div class="image-slot">
                     <el-icon><icon-picture /></el-icon>
@@ -141,11 +141,15 @@
               </el-image>
             </el-carousel-item>
           </el-carousel>
+          <div class="xq_boxN"  style="height:202px; width: 100%;"  v-show="fullScreen===true">
+            <el-input v-model="formXq.js"  type="textarea" cols="20" rows="8" readonly="true" maxlength="400" v-show="fullScreen===true" > </el-input>
+          </div>
+
           <div class="xq_box">
             <div class="fontStyle2 title_overflow">成立时间：{{ changDate(formXq.jlrq) }}</div>
           </div>
           <div class="xq_box">
-            <div class="fontStyle2 title_overflow">机构类别：{{ formXq.jgfl }}</div>
+            <div class="fontStyle2 title_overflow" :title="formXq.jgfl" >机构类别：{{ formXq.jgfl }}</div>
           </div>
           <div class="xq_box">
             <div class="fontStyle2 title_overflow">床位总数：{{ formXq.cwzs }}</div>
@@ -211,7 +215,10 @@ const props = {
     resolve(res)
   }
 }
+const jgListold = ref([])
 const jgList = ref([])
+const selList = ref([0,0,0,0,0,0,0,0,0,0])
+
 const loading = ref(false)
 const marker = ref("")
 const latdata = ref([])
@@ -361,14 +368,60 @@ const formXq = ref({lb:"0"})
 const isShow = ref(true)
 const fullScreen = ref(false)
 const isDestroy = ref(false)
+function piclclick($event,item,items)
+{
+  //alert(item);
+ //let pictures=[];
+  var list = document.createElement('ul');
+  for(let i=0;i<items.length;i++)
+  {
+    var li = document.createElement('li');
+    var img = document.createElement('img');
+    img.setAttribute("data-original", items[i]);
+    img.src=items[i];
+    img.alt = "第【"+(i+1) +"】张";
+    li.appendChild(img);
+    list.appendChild(li);
+  }
+
+
+  var viewer = new Viewer(list, {
+    hidden: function () {
+      viewer.destroy();
+    },
+  });
+  viewer.show();
+}
 function onflclick(e,idx)
 {
-  console.log(e);
+ // console.log(e);
  // alert(e.target.src)
-  if (e.target.src.includes("sel"))
-    e.target.src = jgico.value[idx].src;
-  else
-   e.target.src = jgicosel.value[idx].src;
+  loading.value = true;
+  if (e.target.src.includes("sel")) {
+     e.target.src = jgico.value[idx].src;
+    selList.value[idx]=0;
+  }
+  else {
+    e.target.src = jgicosel.value[idx].src;
+    selList.value[idx]=1;
+  }
+
+ // const markers = map.value.getAllOverlays('marker');
+ // alert(markers.length);
+ // for (let i = 0; i < markers.length; i++) {
+
+ // }
+
+
+  //地图被销毁就不用添加点坐标了
+  if (!isDestroy.value) {
+
+      addMarker(jgListold.value)
+
+  }
+
+  loading.value = false;
+
 }
 function handleFullScreen() {
   fullScreen.value = !fullScreen.value
@@ -410,7 +463,41 @@ function exitFullscreen(element) {
     document.msExitFullscreen()
   }
 }
+function getfxlbms(fxlb) {
+  let flxbms="";
+  if (fxlb.includes("01"))
+  {
+    if (flxbms.length==0)flxbms="综合嵌入式居家养老服务中心";
+    else flxbms=flxbms+",综合嵌入式居家养老服务中心"
+  }
+  if (fxlb.includes("02"))
+  {
+    if (flxbms.length==0)flxbms="日间照料中心";
+    else flxbms=flxbms+",日间照料中心"
+  }
+  if (fxlb.includes("03"))
+  {
+    if (flxbms.length==0)flxbms="社区养老服务中心";
+    else flxbms=flxbms+",社区养老服务中心"
+  }
+  if (fxlb.includes("04"))
+  {
+    if (flxbms.length==0)flxbms="农村养老大院";
+    else flxbms=flxbms+",农村养老大院"
+  }
+  if (fxlb.includes("05"))
+  {
+    if (flxbms.length==0)flxbms="农村养老互助院";
+    else flxbms=flxbms+",农村养老互助院"
+  }
+  if (fxlb.includes("06"))
+  {
+    if (flxbms.length==0)flxbms="社区老年食堂";
+    else flxbms=flxbms+",社区老年食堂"
+  }
+  return flxbms;
 
+}
 function handXq(item) {
   jcxxMapOne(item.id).then(response => {
     response.data.frlxfs=decrypt_ECBA(response.data.frlxfs);
@@ -458,9 +545,11 @@ function handXq(item) {
       formXq.value.jgfl="社区老年食堂";
 
     if (formXq.value.lb=="9")
-      formXq.value.jgfl="复合型社区机构";
-
+      formXq.value.jgfl=getfxlbms(formXq.value.fxlb);
 
+    formXq.value.js="在吉林省民政厅养老服务处的精心业务指导下、上级民政部的协助配合下；经过项目组近一年的不懈努力，吉林省养老服务信息系统开发建设取得了决定性成果。\n" +
+        "     系统完成了全部目标功能模块的开发建设；完成了2个子系统12个功能模块307个功能点，其中扩展完善功能点53个，新增功能点25个；接收导入民政部金民养老服务系统中的历史存量数据合计614,634条；其中养老机构1,569家、从业人员15,466人、老人56,308人；社区养老机构4,735家、从业人员 1,821人、老人4,128人。 \n" +
+        "     系统已经部署到祥云云服务器上，且经过祥云公司的各项严格的安全检测；具备了开通试运行的条件。\n";
 
 
 
@@ -634,7 +723,7 @@ function getList(querd) {
       else
         response.data[i].lb = "3"
     }
-    jgList.value =response.data;
+    jgListold.value =response.data;
 
 
     //地图被销毁就不用添加点坐标了
@@ -680,17 +769,39 @@ function setMarker(item) {
     extData: item
   })
 }
+function testlb(filter,lb)
+{
+  if (filter=="a")
+    return true;
+  else
+    return  filter.includes(lb);
+
+}
 function addMarker(data) {
+
+
+  let filter='a';
+  for (let i = 0; i <selList.value.length ; i++) {
+    if (selList.value[i]==1)
+    {
+
+      filter=filter+','+i;
+    }
+  };
+
   latdata.value = []
+  jgList.value=[];
+
   data.forEach(item => {
-    if (item.lat && item.lng) {
+    if (item.lat && item.lng && testlb(filter,item.lb)==true) {
       latdata.value.push({
         lnglat: [item.lng, item.lat],
         name: item.jgmc,
         id: item.id,
         extData: item,
         style: parseInt(item.id)
-      })
+      });
+      jgList.value.push(item);
     }
   })
   var style = [
@@ -721,6 +832,7 @@ function addMarker(data) {
   })
   count.value = latdata.value.length
   addCluster(3)
+
   /*
       var marker = new AMap.Marker({
         content: "",
@@ -1043,6 +1155,12 @@ onUnmounted(() => {
   border-bottom: 1px solid #dedede;
   padding: 5px 10px;
 }
+.xq_boxN {
+  height: 28px;
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid #dedede;
+}
 .pointer {
   cursor: pointer;
 }