Merge branch 'master' of http://face3d.4dage.com:7005/chenzhiguang/guangdongVR_museum

backstage/src/pages/content/museum/componets/detail.vue

@@ -38,7 +38,7 @@
         </el-form-item>
       </div>
       <div class="right">
-        <el-form-item label="经度：" prop="lat">
+        <el-form-item label="纬度：" prop="lat">
           <el-input
             :onkeyup="(form.lat = form.lat.replace(/^(0+)|[^\d\.]+/g, ''))"
             v-model="form.lat"
@@ -47,7 +47,7 @@
           ></el-input>
         </el-form-item>
 
-        <el-form-item label="纬度：" prop="lng">
+        <el-form-item label="经度：" prop="lng">
           <el-input
             :onkeyup="(form.lng = form.lng.replace(/^(0+)|[^\d\.]+/g, ''))"
             v-model="form.lng"

backstage/src/pages/content/scene/data.js

@@ -21,6 +21,10 @@ let raw = {
       label: "状态",
     },
     {
+      prop: "fileName",
+      label: "场景文件",
+    },
+    {
       prop: "myTime",
       label: "展览时间",
     },

backstage/src/pages/content/scene/index.vue

@@ -18,11 +18,24 @@
               @keydown.enter.native="getList"
               placeholder="请输入场景名称"
             ></el-input>
+
+            <span>博物馆：</span>
+            <el-select v-model="search.museumId" placeholder="请选择所属博物馆">
+              <el-option
+                v-for="item in bwgList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+
             <el-button @click="getList" type="primary">查询</el-button>
             <el-button
               @click="
                 (search = {
                   inputKey: '',
+                  museumId: '',
                 }),
                   getList()
               "
@@ -83,7 +96,7 @@ import MainTop from "@/components/main-top";
 import search from "@/components/search";
 import vtable from "@/components/table";
 import { raw } from "./data";
-
+import { getMuseumAllList } from "@/configue/api";
 import { mapGetters } from "vuex";
 
 export default {
@@ -95,12 +108,14 @@ export default {
       search: {
         inputKey: "",
         date: "",
+        museumId: "",
       },
       list: {},
       page: {
         size: 25,
         pageNum: 1,
       },
+      bwgList: [],
     };
   },
   components: {
@@ -141,19 +156,21 @@ export default {
     },
     uploadZip() {},
     getList() {
-      let { inputKey } = this.search;
+      let { inputKey, museumId } = this.search;
       this.$http({
         method: "post",
         data: {
           pageNum: this.page.pageNum,
           pageSize: this.page.size,
           searchKey: inputKey,
+          museumId,
         },
         url: `cms/exhibition/list`,
       }).then((res) => {
         this.list = res.data;
         this.list.records.forEach((v) => {
-          if (v.timeStart && v.timeEnd) v.myTime = v.timeStart + ' 至 ' +v.timeEnd;
+          if (v.timeStart && v.timeEnd)
+            v.myTime = v.timeStart + " 至 " + v.timeEnd;
           else v.myTime = "-";
         });
       });
@@ -191,6 +208,12 @@ export default {
       },
     },
   },
-  mounted() {},
+  mounted() {
+    getMuseumAllList((data) => {
+      this.bwgList = data.data;
+      this.bwgList.unshift({ id: "", name: "全部" });
+      console.log("------------", this.bwgList);
+    });
+  },
 };
 </script>