2023-9-22

src/views/assets/house.vue

@@ -687,17 +687,27 @@ export default {
                 align: "center",
                 customFn: (row) => {
                   return (
-                    <a
-                      on={{
-                        ["click"]: (e) => {
-                          this.$refs["addHistory"].setRow(row);
-                          this.$refs["addHistory"].setType("show");
-                          this.$refs["addHistory"].show();
-                        },
-                      }}
-                    >
-                      查看
-                    </a>
+                    <el-popover width="450" trigger="click">
+                      <el-table size="small" data={row.id_his_evolutions_land_id_relation}>
+                        <el-table-column width="40" type="index" align="center"></el-table-column>
+                        <el-table-column width="150" property="mianjitiaozheng" label="面积调整" show-overflow-tooltip={true}></el-table-column>
+                        <el-table-column width="150" property="qitashuoming" label="其他说明" show-overflow-tooltip={true}></el-table-column>
+                        <el-table-column width="150" property="zichanlaiyuan" label="资产来源" show-overflow-tooltip={true}></el-table-column>
+                      </el-table>
+
+                      <a slot="reference">查看</a>
+                    </el-popover>
+                    // <a
+                    //   on={{
+                    //     ["click"]: (e) => {
+                    //       this.$refs["addHistory"].setRow(row);
+                    //       this.$refs["addHistory"].setType("show");
+                    //       this.$refs["addHistory"].show();
+                    //     },
+                    //   }}
+                    // >
+                    //   查看
+                    // </a>
                   );
                 },
               });

src/views/component/detail.vue

@@ -41,9 +41,13 @@
             </el-carousel-item>
           </el-carousel>
         </el-card>
-        <el-card>
+        <el-card id="detail-info">
+          <div class="el-descriptions__header el-descriptions__title">
+            基本信息
+          </div>
           <el-descriptions
-            title="基本信息"
+            border
+            size="small"
             :column="2"
             :label-style="{ 'font-weight': '600' }"
           >
@@ -191,6 +195,11 @@
             style="width: 100%; height: 300px"
           ></div>
         </el-card>
+        <el-card id="detail-safe">
+          <div class="el-descriptions__header el-descriptions__title">
+            资产安全
+          </div>
+        </el-card>
       </el-col>
       <el-col :span="3">
         <Anchor show-ink :offset-top="64">
@@ -200,10 +209,12 @@
             (detail.id_assets_atlas_files_land_id_relation &&
               detail.id_assets_atlas_files_land_id_relation.length > 0)
           " />
+          <AnchorLink href="#detail-info" title="基本信息" />
           <AnchorLink href="#detail-files" title="相关附件" />
           <AnchorLink href="#detail-documents" title="证件图片" />
           <AnchorLink href="#detail-histories" title="历史沿革" />
           <AnchorLink href="#detail-assetsMap" title="资产地图" />
+          <AnchorLink href="#detail-safe" title="资产安全"></AnchorLink>
         </Anchor>
       </el-col>
     </el-row>
@@ -417,11 +428,20 @@ export default {
 
   computed: {
     picList() {
-      return (
-        this.detail?.id_assets_atlas_files_asset_id_relation?.map(
-          (i) => i.url
-        ) || []
-      );
+      if (/\/house/g.test(this.$route.path)) {
+        return (
+          this.detail?.id_assets_atlas_files_house_id_relation?.map(
+            (i) => i.url
+          ) || []
+        );
+      }
+      if (/\/land/g.test(this.$route.path)) {
+        return (
+          this.detail?.id_assets_atlas_files_land_id_relation?.map(
+            (i) => i.url
+          ) || []
+        );
+      }
     },
     contentFormat() {
       return function (i) {
@@ -465,7 +485,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.el-descriptions__title,::v-deep .el-descriptions__title {
+.el-card__body > .el-descriptions__title,.el-card__body > ::v-deep .el-descriptions__title {
 
   position: relative;
   padding-left: 14px;
@@ -473,7 +493,7 @@ export default {
   &::before {
     content: '';
     width: 4px;
-    background: linear-gradient(to bottom,rgb(57, 129, 199), rgba(71, 112, 162 , .7));
+    background: linear-gradient(to bottom,rgb(57, 129, 199), rgba(118, 148, 183, 0.7));
 
     position: absolute;
     left: 0;

src/views/component/map.vue

@@ -139,7 +139,7 @@
               <p>{{ item.name }}</p>
               <Tag color="blue" v-if="item.area">{{ wxAreas[item.area-1] }}</Tag>
               <Tag color="cyan" v-if="item.shijimianji">{{ item.shijimianji }} m²</Tag>
-              <Tag color="red" v-if="item.id_house_properties_land_id_relation.id">房</Tag>
+              <Tag color="red" v-if="item.id_house_properties_land_id_relation">房</Tag>
               <Tag color="gold" v-if="item.jianzhuleixing">{{ jianzhuleixing(item.jianzhuleixing) }}</Tag>
               <Tag color="magenta" v-if="item.zichanleixing">{{ zichanleixing(item.zichanleixing) }}</Tag>
             </div>
@@ -452,7 +452,7 @@ export default {
           };
           let markerImg = document.createElement("img");
           markerImg.src =
-            item.zichanshifouyoujianzhu === 1 ? "//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-red.png" : "//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png";
+            item.id_house_properties_land_id_relation ? "//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-red.png" : "//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png";
           let markerSpan = document.createElement("span");
           markerSpan.setAttribute("class", "map-marker__text");
           markerSpan.innerText =