Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/guide.vue

@@ -164,14 +164,15 @@ const tabData = reactive({
       name: "总体概况",
       img: tab1,
     },
-    {
+   
-      name: "评估模型",
-      img: tab8,
-    },
     {
       name: "要素一张图",
       img: tab7,
     },
+    {
+      name: "评估模型",
+      img: tab8,
+    },
     // {
     //   name: "养老体系",
     //   img: tab2,
@@ -198,14 +199,15 @@ const tabData = reactive({
       img: png3,
       url: "/home/index",
     },
-    {
+   
-      img: png1,
-      url: "/home/index/table",
-    },
     {
       img: png2,
       url: "/home/index/map",
     },
+    {
+      img: png1,
+      url: "/home/index/table",
+    },
 
     // {
     //   img: png4,

src/view/sy.vue

@@ -1831,8 +1831,8 @@ const autoScroll = () => {
   }
 };
 onBeforeMount(async () => {
-  document.cookie='lytoken=6b0e380b4a8f46baae4923f83faf670d'
+  // document.cookie='lytoken=6b0e380b4a8f46baae4923f83faf670d'
-  tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+  // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   getData();
   getfw();
   setTimeout(() => {

src/view/sy_details.vue

@@ -151,7 +151,10 @@
               <template #default="scope">
                 <!-- 姓名 -->
                 <div v-if="item.property == 'xm'">
-                  <div>
+                  <div
+                    style="cursor: pointer"
+                    @click="handleRowClick(scope.row)"
+                  >
                     {{ scope.row.xm }}
                   </div>
                 </div>
@@ -166,19 +169,19 @@
                     />
                   </div> -->
                   <img
-                    style="width: 30px; height: 30px;cursor: pointer;"
+                    style="width: 30px; height: 30px; cursor: pointer"
                     v-if="scope.row.deng == 0"
                     :src="lampImages[1]"
                     @click="statusDetails(scope.row)"
                   />
                   <img
-                    style="width: 30px; height: 30px;cursor: pointer;"
+                    style="width: 30px; height: 30px; cursor: pointer"
                     v-if="scope.row.deng == 1"
                     :src="lampImages[3]"
                     @click="statusDetails(scope.row)"
                   />
                   <img
-                    style="width: 30px; height: 30px;cursor: pointer;"
+                    style="width: 30px; height: 30px; cursor: pointer"
                     v-if="scope.row.deng == 2"
                     :src="lampImages[2]"
                     @click="statusDetails(scope.row)"
@@ -514,17 +517,19 @@ const getTable = (pagination) => {
     });
 };
 const getTable1 = (pagination) => {
-  http.get(`${pagination.url}?sfzhm=${data.identNo}&xh=${routers.query.xh}`).then((res) => {
+  http
-    if (res.code == 200) {
+    .get(`${pagination.url}?sfzhm=${data.identNo}&xh=${routers.query.xh}`)
-      tableType.data = res.data;
+    .then((res) => {
-      tableType.typeId = routers.query.id;
+      if (res.code == 200) {
-      dialogShow.value = true;
+        tableType.data = res.data;
-    }else{
+        tableType.typeId = routers.query.id;
-      ElMessage.warning({
+        dialogShow.value = true;
-      message: res.message,
+      } else {
+        ElMessage.warning({
+          message: res.message,
+        });
+      }
     });
-    }
-  });
 };
 
 /**

src/view/table_gk/gk_yl.vue

@@ -961,45 +961,46 @@ const getData = () => {
 
 .left_1 {
   cursor: pointer;
-  background-image: url(@/assets/images/yl/ylbx_ylbxffrc.png);
+  background-image: url(@/assets/images/yl/ylbt_1.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
 .left_1_1 {
   cursor: pointer;
-  background-image: url(@/assets/images/yl/ylbx_ylbxje.png);
+  background-image: url(@/assets/images/yl/ylbt_2.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
 
 .left_2 {
   cursor: pointer;
-  background-image: url(@/assets/images/yl/gllrbt_btrc.png);
+  background-image: url(@/assets/images/yl/ylbt_3.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
 .left_2_1 {
   cursor: pointer;
-  background-image: url(@/assets/images/yl/gllrbt_btje.png);
+  background-image: url(@/assets/images/yl/ylbt_4.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
 
 .left_3 {
   cursor: pointer;
-  background-image: url(@/assets/images/yl/tkdb_ffrc.png);
+  background-image: url(@/assets/images/yl/ylbt_5.png);
   //    background-image: url(@/assets/images/yl/new_tklrjz.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
 .left_3_1 {
   cursor: pointer;
-  background-image: url(@/assets/images/yl/tkdb_bzje.png);
+  background-image: url(@/assets/images/yl/ylbt_6.png);
   //    background-image: url(@/assets/images/yl/new_tklrjz.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
 
+
 .center_1 {
   background-image: url(@/assets/images/yl/new_lnrzb.png);
   background-repeat: no-repeat;

src/view/yl.vue

@@ -2,38 +2,15 @@
   <div class="module">
     <div class="displayFlex left_bg">
       <div class="flex1">
-        <div class="yd_title left_1">
+        <div
+          class="yd_title"
+          :class="leftchoose.first == '1' ? 'left_1' : 'left_1_1'"
+          @click="change2('first')"
+        >
           <div class="animate-border">
             <i></i>
             <i></i>
           </div>
-          <span class="text">
-            <img
-              v-if="leftchoose.first == '1'"
-              src="@/assets/images/ylbx_1.png"
-              class="c"
-              style="width: 160px"
-            />
-            <img
-              v-else
-              src="@/assets/images/ylbx_1_1.png"
-              class="c"
-              @click="change('first', '1')"
-            />
-            <img
-              v-if="leftchoose.first == '2'"
-              src="@/assets/images/ylbx_1.png"
-              class="c"
-              style="width: 160px"
-            />
-            <img
-              v-else
-              src="@/assets/images/ylbx_2_1.png"
-              class="c"
-              @click="change('first', '2')"
-              style="height: 35px; width: 120px; margin-right: 10px"
-            />
-          </span>
         </div>
         <ePie
           v-if="leftchoose.first == '1' && showEchart"
@@ -49,37 +26,12 @@
         ></ePie2>
       </div>
       <div class="flex1" style="margin-top: 10px">
-        <div class="yd_title left_2">
+        <div class="yd_title "       :class="leftchoose.second == '1' ? 'left_2' : 'left_2_1'"
+          @click="change2('second')">
           <div class="animate-border">
             <i></i>
             <i></i>
           </div>
-          <span class="text">
-            <img
-              v-if="leftchoose.second == '1'"
-              src="@/assets/images/gllrbt_1.png"
-              class="c"
-              style="width: 160px"
-            />
-            <img
-              v-else
-              src="@/assets/images/gllrbt_1_1.png"
-              class="c"
-              @click="change('second', '1')"
-            />
-            <img
-              v-if="leftchoose.second == '2'"
-              src="@/assets/images/gllrbt_2.png"
-              class="c"
-              style="width: 160px"
-            />
-            <img
-              v-else
-              src="@/assets/images/gllrbt_2_1.png"
-              class="c"
-              @click="change('second', '2')"
-            />
-          </span>
         </div>
         <eP2
           v-if="leftchoose.second == '1' && showEchart"
@@ -95,37 +47,15 @@
         />
       </div>
       <div class="flex1" style="margin-top: 10px">
-        <div class="yd_title left_3">
+        <div
+          class="yd_title"
+          :class="leftchoose.third == '1' ? 'left_3' : 'left_3_1'"
+          @click="change2('third')"
+        >
           <div class="animate-border">
             <i></i>
             <i></i>
           </div>
-          <span class="text">
-            <img
-              v-if="leftchoose.third == '1'"
-              src="@/assets/images/tkjz_1.png"
-              class="c"
-              style="width: 160px"
-            />
-            <img
-              v-else
-              src="@/assets/images/tkjz_1_1.png"
-              class="c"
-              @click="change('third', '1')"
-            />
-            <img
-              v-if="leftchoose.third == '2'"
-              src="@/assets/images/tkjz_2.png"
-              class="c"
-              style="width: 160px"
-            />
-            <img
-              v-else
-              src="@/assets/images/tkjz_2_1.png"
-              class="c"
-              @click="change('third', '2')"
-            />
-          </span>
         </div>
         <eP3
           v-if="leftchoose.third == '1' && showEchart"
@@ -424,6 +354,13 @@ const pagination = reactive({
 const change = (name, index) => {
   leftchoose.value[name] = index;
 };
+const change2 = (name) => {
+  if (leftchoose.value[name] == "0") {
+    leftchoose.value[name] = "1";
+  } else {
+    leftchoose.value[name] = "0";
+  }
+};
 const chooseVillage = (village) => {
   tableType.title = village;
   tableType.columns = xz_column.value;
@@ -789,18 +726,18 @@ const getData = () => {
     }
   }
 
-  .text {
+  // .text {
-    display: flex;
+  //   display: flex;
-    position: absolute;
+  //   position: absolute;
-    font-size: 16px;
+  //   font-size: 16px;
-    font-family: SourceHanSansCN;
+  //   font-family: SourceHanSansCN;
-    font-weight: bold;
+  //   font-weight: bold;
-    color: #ffffff;
+  //   color: #ffffff;
-    position: absolute;
+  //   position: absolute;
-    right: 5px;
+  //   right: 5px;
-    top: 1px;
+  //   top: 1px;
-    align-items: center;
+  //   align-items: center;
-  }
+  // }
 
   .c {
     width: 130px;
@@ -939,22 +876,64 @@ const getData = () => {
 }
 
 .left_1 {
-  background-image: url(@/assets/images/yl/new_ylbx.png);
+  cursor: pointer;
+  background-image: url(@/assets/images/yl/ylbt_1.png);
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+}
+.left_1_1 {
+  cursor: pointer;
+  background-image: url(@/assets/images/yl/ylbt_2.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
 
 .left_2 {
-  background-image: url(@/assets/images/yl/new_gllrbt.png);
+  cursor: pointer;
+  background-image: url(@/assets/images/yl/ylbt_3.png);
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+}
+.left_2_1 {
+  cursor: pointer;
+  background-image: url(@/assets/images/yl/ylbt_4.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
 
 .left_3 {
-  background-image: url(@/assets/images/yl/new_tklrjz.png);
+  cursor: pointer;
+  background-image: url(@/assets/images/yl/ylbt_5.png);
+  //    background-image: url(@/assets/images/yl/new_tklrjz.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
+.left_3_1 {
+  cursor: pointer;
+  background-image: url(@/assets/images/yl/ylbt_6.png);
+  //    background-image: url(@/assets/images/yl/new_tklrjz.png);
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+}
+
+
+// .left_1 {
+//   background-image: url(@/assets/images/yl/new_ylbx.png);
+//   background-repeat: no-repeat;
+//   background-size: 100% 100%;
+// }
+
+// .left_2 {
+//   background-image: url(@/assets/images/yl/new_gllrbt.png);
+//   background-repeat: no-repeat;
+//   background-size: 100% 100%;
+// }
+
+// .left_3 {
+//   background-image: url(@/assets/images/yl/new_tklrjz.png);
+//   background-repeat: no-repeat;
+//   background-size: 100% 100%;
+// }
 
 .center_1 {
   background-image: url(@/assets/images/yl/new_lnrzb.png);
@@ -1531,4 +1510,4 @@ const getData = () => {
   background: rgba(255, 255, 255, 0.14);
   border: 1px solid #6bade1;
 }
-</style>
+</style>