Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/api/map.js

@@ -16,6 +16,13 @@ export function GetResourceTree() {
         method: 'get'
     })
 }
+//获取共享资源目录
+export function GetShareTree() {
+    return request({
+        url: '/apply/yzt/zyml/GetTree/share',
+        method: 'get'
+    })
+}
 
 // 获取我的收藏
 export function GetMyCollect() {

src/components/Combinations/LayerManage/LayerManageSplit.vue

@@ -11,59 +11,17 @@
     <Tabs value="">
       <TabPane :label="Resource.Resource" name="zyml">
         <div class="zyml" :class="$props.splitId >= 0 ? `zymlsplit` : ''">
-          <div class="headerSearch">
-            <el-form ref="form" :model="form">
-              <el-form-item label="数据年份:" v-if="$props.type == 'share'">
-                <el-col :span="8">
-                  <el-date-picker
-                    placeholder="开始年份"
-                    v-model="form.startYear"
-                    type="year"
-                    format="yyyy"
-                    value-format="yyyy"
-                    popper-class='myDatePicker'
-                  ></el-date-picker>
-                </el-col>
-                <el-col class="line" :span="2">-</el-col>
-                <el-col :span="8">
-                  <el-date-picker
-                    placeholder="结束年份"
-                    v-model="form.endYears"
-                    type="year"
-                    format="yyyy"
-                    value-format="yyyy"
-                    popper-class='myDatePicker'
-                  ></el-date-picker>
-                </el-col>
-              </el-form-item>
-              <el-form-item>
-                <el-input
-                  :placeholder="Resource.InputPlaceholder"
-                  prefix-icon="el-icon-search"
-                  v-model="form.treeSearchText"
-                  size="small"
-                >
-                </el-input>
-                <div
-                  class="eicon"
-                  :class="isshowNum ? 'eyes' : 'close_eyes'"
-                  @click="isshowNum = !isshowNum"
-                ></div>
-              </el-form-item>
-            </el-form>
-            <!-- <span>数据年份:</span>
+          <div :class="$props.type == 'share' ? 'headerSearch' : 'searchDiv'">
             <el-date-picker
-              v-model="value"
+              placeholder="数据年份"
+              v-model="treeYearText"
               type="year"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
               format="yyyy"
               value-format="yyyy"
-            >
-            </el-date-picker> -->
-          </div>
-          <!-- <div class="searchDiv">
+              popper-class="myDatePicker"
+              v-if="$props.type == 'share'"
+              size="small"
+            ></el-date-picker>
             <el-input
               :placeholder="Resource.InputPlaceholder"
               prefix-icon="el-icon-search"
@@ -76,7 +34,7 @@
               :class="isshowNum ? 'eyes' : 'close_eyes'"
               @click="isshowNum = !isshowNum"
             ></div>
-          </div> -->
+          </div>
           <div class="treeDiv">
             <el-tree
               @check="handleCheckChange"
@@ -96,7 +54,11 @@
                     : node.label
                 }}</span>
                 <span>
-                  <i class="el-icon-notebook-2" v-if="data.url != '' && $props.type == 'share'" @click="showDetail(data)"></i>
+                  <i
+                    class="el-icon-share"
+                    v-if="data.url != '' && $props.type == 'share'"
+                    @click="showDetail(data)"
+                  ></i>
                   <Icon
                     :type="!data.favorite ? 'ios-star-outline' : 'ios-star'"
                     color="green"
@@ -178,7 +140,7 @@
           </List>
         </div>
       </TabPane>
-      <TabPane :label="Resource.Favorite" name="collect">
+      <TabPane :label="Resource.Favorite" name="collect" v-if="$props.type != 'share'">
         <div class="collect" :class="$props.splitId >= 0 ? `collectsplit` : ''">
           <List split>
             <ListItem
@@ -210,7 +172,13 @@
 </template>
 
 <script>
-import { Collect, GetResourceTree, GetMyCollect } from "@/api/map";
+import {
+  Collect,
+  GetResourceTree,
+  GetShareTree,
+  GetMyCollect,
+} from "@/api/map";
+import { Getservicetype } from "@/views/ResourceShare/myApplication/config.js";
 export default {
   name: "LayerManageSplit",
   props: {
@@ -234,17 +202,13 @@ export default {
   },
   data() {
     return {
-      form: {
-        startYear: "",
-        endYears: "",
-        treeSearchText: "",
-      },
-      addlayerdata:[],//用于双向绑定
+      addlayerdata: [], //用于双向绑定
       defaultProps: {
         children: "children",
         label: "label",
       },
       treeSearchText: "",
+      treeYearText:"",
       favoriteLayerList: [],
       sharedState: store.state,
       TreeDatas: [
@@ -269,8 +233,15 @@ export default {
   },
 
   methods: {
-    showDetail(data){
-      console.log(data,'woshidata');
+    async showDetail(data) {
+      console.log(data, "woshidata");
+      let serverTypeList = await Getservicetype();
+      serverTypeList.forEach((ty) => {
+        if (data.type == ty.dictValue) {
+          data.type = ty.dictLabel;
+        }
+      });
+      console.log(data.serverType, "data.serverType");
       this.$emit("updateParent", "isShowService", true);
       this.$emit("updateParent", "detailObj", data);
     },
@@ -376,14 +347,31 @@ export default {
     },
     //获取后台资源目录树结构
     getResourceTree() {
-      GetResourceTree().then((res) => {
+      if (this.$props.type == "share") {
+        this.getShareTree();
+      } else {
+        GetResourceTree().then((res) => {
+          if (res.statuscode == 200) {
+            // 从根节点开始递归
+            res.data.forEach((rootNode) => {
+              this.setDisabledIfChildrenExist(rootNode);
+            });
+            this.TreeDatas = res.data;
+            store.state.tempResourceTree = res.data;
+          } else {
+            console.log(res);
+          }
+        });
+      }
+    },
+    getShareTree() {
+      GetShareTree().then((res) => {
         if (res.statuscode == 200) {
           // 从根节点开始递归
           res.data.forEach((rootNode) => {
             this.setDisabledIfChildrenExist(rootNode);
           });
           this.TreeDatas = res.data;
-
           store.state.tempResourceTree = res.data;
         } else {
           console.log(res);
@@ -416,6 +404,7 @@ export default {
 
   mounted() {
     this.getResourceTree();
+    // this.getShareTree();
     this.getFavoriteLayers();
   },
 
@@ -423,6 +412,9 @@ export default {
     treeSearchText(val) {
       this.$refs.tree.filter(val);
     },
+    treeYearText(val) {
+      this.$refs.tree.filter(val);
+    },
     LayerManageShow: {
       handler() {
         if (this.LayerManageShow && this.$props.type) {
@@ -436,9 +428,9 @@ export default {
       },
       immediate: true,
     },
-    addlayerdata(val){
-      this.addlayerdata = val
-    }
+    addlayerdata(val) {
+      this.addlayerdata = val;
+    },
   },
 };
 </script>
@@ -455,6 +447,21 @@ export default {
     width: calc(100% - 30px);
   }
 }
+.headerSearch {
+  display: flex;
+  justify-content: space-between;
+  margin-right: 10px;
+
+  .el-input {
+    width: 48%;
+  }
+  /deep/ .el-input--small .el-input__inner {
+    color: white !important;
+    background: rgba(100, 218, 255, 0.1);
+    border-radius: 2px 10px 2px 10px;
+    border-color: #5ecef09a;
+  }
+}
 // .headerSearch {
 //   /deep/ .el-form-item{
 //   //   display: flex;

src/views/shareResources/components/ServiceDetails.vue

@@ -18,12 +18,12 @@
               label="数据说明"
               content-class-name="my-content"
               :span="3"
-              >测试数据</el-descriptions-item
+              >{{ detailObj.dataexplain }}</el-descriptions-item
             >
             <el-descriptions-item label="数据所有者"
-              >管理员</el-descriptions-item
+              >{{ detailObj.createBy}}</el-descriptions-item
             >
-            <el-descriptions-item label="数据年份">2024</el-descriptions-item>
+            <el-descriptions-item label="数据年份">{{ detailObj.year }}</el-descriptions-item>
             <el-descriptions-item label="服务类型">{{
               detailObj.type
             }}</el-descriptions-item>
@@ -31,9 +31,8 @@
               detailObj.serverType
             }}</el-descriptions-item>
             <el-descriptions-item label="服务发布时间"
-              >2024</el-descriptions-item
+              >{{ detailObj.createTime }}</el-descriptions-item
             >
-            <el-descriptions-item label="联系人">张百仪</el-descriptions-item>
           </el-descriptions>
         </div>
         <div class="btnCon">
@@ -242,7 +241,6 @@ import { GetXzqhTree } from "@/api/map";
 import { ApplyResources, GetResources } from "../../../api/kfgx/gxzy";
 import moment from "moment";
 import { getInfo } from "@/api/login";
-import user from "../../../store/modules/user";
 export default {
   props: {
     detailObj: {
@@ -325,7 +323,7 @@ export default {
   created() {
     this.getXzqTreeData();
   },
-  mounted() {
+   mounted() {
     getInfo().then((res) => {
       this.userMsg = res.user;
       this.ruleForm.sqDepartmentBy = res.user.dept.deptName;
@@ -552,10 +550,10 @@ export default {
   /deep/ .el-form-item {
     margin-bottom: 4px;
   }
-  /deep/ .el-upload-list__item-name{
+  /deep/ .el-upload-list__item-name {
     color: #fff;
   }
-  /deep/  .el-upload-list__item:hover{
+  /deep/ .el-upload-list__item:hover {
     background: transparent !important;
   }
 }