shaogen1995 2 lat temu
rodzic
commit
7fb741befa

+ 3 - 0
backstage/src/assets/styles/reset.css

@@ -197,3 +197,6 @@ textarea {
   color: #ccc !important;
   pointer-events: none !important;
 }
+.goodNameInput input {
+  padding-right: 70px !important;
+}

+ 3 - 0
backstage/src/assets/styles/reset.less

@@ -110,4 +110,7 @@ textarea{
 .disabledAc{
 	color: #ccc !important;
 	pointer-events: none !important;
+}
+.goodNameInput input {
+	padding-right: 70px !important;
 }

+ 1 - 1
backstage/src/pages/content/collection/componets/audio.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width:50%;">
     <el-form-item label="藏品名称:" prop="name">
-      <el-input v-model="form.name" :maxlength="INPUTLENGTH*5" show-word-limit></el-input>
+      <el-input class="goodNameInput" v-model="form.name" :maxlength="INPUTLENGTH*5" show-word-limit></el-input>
     </el-form-item>
 
     <el-form-item label="藏品类型:">

+ 1 - 0
backstage/src/pages/content/collection/componets/img.vue

@@ -2,6 +2,7 @@
   <div style="width: 50%">
     <el-form-item label="藏品名称:" prop="name">
       <el-input
+       class="goodNameInput"
         v-model="form.name"
         :maxlength="INPUTLENGTH * 5"
         show-word-limit

+ 1 - 1
backstage/src/pages/content/collection/componets/model.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width:50%;">
     <el-form-item label="藏品名称:" prop="name">
-      <el-input v-model="form.name" :maxlength="INPUTLENGTH*5" show-word-limit></el-input>
+      <el-input class="goodNameInput" v-model="form.name" :maxlength="INPUTLENGTH*5" show-word-limit></el-input>
     </el-form-item>
 
     <el-form-item label="藏品类型:">

+ 1 - 1
backstage/src/pages/content/collection/componets/video.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width:50%;">
     <el-form-item label="藏品名称:" prop="name">
-      <el-input v-model="form.name" :maxlength="INPUTLENGTH*5" show-word-limit></el-input>
+      <el-input class="goodNameInput" v-model="form.name" :maxlength="INPUTLENGTH*5" show-word-limit></el-input>
     </el-form-item>
 
     <el-form-item label="藏品类型:">

+ 1 - 1
backstage/src/pages/system/dict/componets/detail.vue

@@ -19,7 +19,7 @@
         </el-form-item>
 
         <el-form-item label="是否显示:">
-          <el-switch v-model="form.display"> </el-switch>
+          <el-switch :active-value='1' :inactive-value='0' v-model="form.display"> </el-switch>
         </el-form-item>
 
       </div>

+ 142 - 51
code/src/assets/css/reset.css

@@ -8,9 +8,10 @@
    # Global selectors
    # ================================================================= */
 
-   html {
+html {
     box-sizing: border-box;
-    -webkit-text-size-adjust: 100%; /* Prevent adjustments of font size after orientation changes in iOS */
+    -webkit-text-size-adjust: 100%;
+    /* Prevent adjustments of font size after orientation changes in iOS */
     word-break: normal;
     -moz-tab-size: 4;
     tab-size: 4;
@@ -19,22 +20,25 @@
 *,
 ::before,
 ::after {
-    background-repeat: no-repeat; /* Set `background-repeat: no-repeat` to all elements and pseudo elements */
+    background-repeat: no-repeat;
+    /* Set `background-repeat: no-repeat` to all elements and pseudo elements */
     box-sizing: inherit;
     appearance: none;
-    -webkit-tap-highlight-color: rgba(255,255,255,0);
-    text-rendering: optimizeLegibility!important;
-    -webkit-font-smoothing: antialiased!important;
+    -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
+    text-rendering: optimizeLegibility !important;
+    -webkit-font-smoothing: antialiased !important;
 }
 
 ::before,
 ::after {
-    text-decoration: inherit; /* Inherit text-decoration and vertical align to ::before and ::after pseudo elements */
+    text-decoration: inherit;
+    /* Inherit text-decoration and vertical align to ::before and ::after pseudo elements */
     vertical-align: inherit;
 }
 
 * {
-    padding: 0; /* Reset `padding` and `margin` of all elements */
+    padding: 0;
+    /* Reset `padding` and `margin` of all elements */
     margin: 0;
     list-style: none;
 }
@@ -44,58 +48,71 @@
      # ================================================================= */
 
 hr {
-    overflow: visible; /* Show the overflow in Edge and IE */
-    height: 0; /* Add the correct box sizing in Firefox */
-    color: inherit; /* Correct border color in Firefox. */
+    overflow: visible;
+    /* Show the overflow in Edge and IE */
+    height: 0;
+    /* Add the correct box sizing in Firefox */
+    color: inherit;
+    /* Correct border color in Firefox. */
 }
 
 details,
 main {
-    display: block; /* Render the `main` element consistently in IE. */
+    display: block;
+    /* Render the `main` element consistently in IE. */
 }
 
 summary {
-    display: list-item; /* Add the correct display in all browsers */
+    display: list-item;
+    /* Add the correct display in all browsers */
 }
 
 small {
-    font-size: 80%; /* Set font-size to 80% in `small` elements */
+    font-size: 80%;
+    /* Set font-size to 80% in `small` elements */
 }
 
 [hidden] {
-    display: none; /* Add the correct display in IE */
+    display: none;
+    /* Add the correct display in IE */
 }
 
 abbr[title] {
-    border-bottom: none; /* Remove the bottom border in Chrome 57 */
+    border-bottom: none;
+    /* Remove the bottom border in Chrome 57 */
     /* Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari */
     text-decoration: underline;
     text-decoration: underline dotted;
 }
 
 a {
-    background-color: transparent; /* Remove the gray background on active links in IE 10 */
+    background-color: transparent;
+    /* Remove the gray background on active links in IE 10 */
 }
 
 a:active,
 a:hover {
-    outline-width: 0; /* Remove the outline when hovering in all browsers */
+    outline-width: 0;
+    /* Remove the outline when hovering in all browsers */
 }
 
 code,
 kbd,
 pre,
 samp {
-    font-family: monospace, monospace; /* Specify the font family of code elements */
+    font-family: monospace, monospace;
+    /* Specify the font family of code elements */
 }
 
 pre {
-    font-size: 1em; /* Correct the odd `em` font sizing in all browsers */
+    font-size: 1em;
+    /* Correct the odd `em` font sizing in all browsers */
 }
 
 b,
 strong {
-    font-weight: bolder; /* Add the correct font weight in Chrome, Edge, and Safari */
+    font-weight: bolder;
+    /* Add the correct font weight in Chrome, Edge, and Safari */
 }
 
 /* https://gist.github.com/unruthless/413930 */
@@ -116,8 +133,10 @@ sup {
 }
 
 table {
-    border-color: inherit; /* Correct border color in all Chrome, Edge, and Safari. */
-    text-indent: 0; /* Remove text indentation in Chrome, Edge, and Safari */
+    border-color: inherit;
+    /* Correct border color in all Chrome, Edge, and Safari. */
+    text-indent: 0;
+    /* Remove text indentation in Chrome, Edge, and Safari */
 }
 
 /* # =================================================================
@@ -130,7 +149,13 @@ input {
     outline: none;
 }
 
-input[type=button], input[type=submit], input[type=file], button { cursor: pointer; -webkit-appearance: none; }
+input[type=button],
+input[type=submit],
+input[type=file],
+button {
+    cursor: pointer;
+    -webkit-appearance: none;
+}
 
 /* Replace pointer cursor in disabled elements */
 [disabled] {
@@ -140,21 +165,27 @@ input[type=button], input[type=submit], input[type=file], button { cursor: point
 
 [type='number']::-webkit-inner-spin-button,
 [type='number']::-webkit-outer-spin-button {
-    height: auto; /* Correct the cursor style of increment and decrement buttons in Chrome */
+    height: auto;
+    /* Correct the cursor style of increment and decrement buttons in Chrome */
 }
 
 [type='search'] {
-    -webkit-appearance: textfield; /* Correct the odd appearance in Chrome and Safari */
-    outline-offset: -2px; /* Correct the outline style in Safari */
+    -webkit-appearance: textfield;
+    /* Correct the odd appearance in Chrome and Safari */
+    outline-offset: -2px;
+    /* Correct the outline style in Safari */
 }
 
 [type='search']::-webkit-search-decoration {
-    -webkit-appearance: none; /* Remove the inner padding in Chrome and Safari on macOS */
+    -webkit-appearance: none;
+    /* Remove the inner padding in Chrome and Safari on macOS */
 }
 
 textarea {
-    overflow: auto; /* Internet Explorer 11+ */
-    resize: vertical; /* Specify textarea resizability */
+    overflow: auto;
+    /* Internet Explorer 11+ */
+    resize: vertical;
+    /* Specify textarea resizability */
 }
 
 button,
@@ -162,20 +193,24 @@ input,
 optgroup,
 select,
 textarea {
-    font: inherit; /* Specify font inheritance of form elements */
+    font: inherit;
+    /* Specify font inheritance of form elements */
 }
 
 optgroup {
-    font-weight: bold; /* Restore the font weight unset by the previous rule */
+    font-weight: bold;
+    /* Restore the font weight unset by the previous rule */
 }
 
 button {
-    overflow: visible; /* Address `overflow` set to `hidden` in IE 8/9/10/11 */
+    overflow: visible;
+    /* Address `overflow` set to `hidden` in IE 8/9/10/11 */
 }
 
 button,
 select {
-    text-transform: none; /* Firefox 40+, Internet Explorer 11- */
+    text-transform: none;
+    /* Firefox 40+, Internet Explorer 11- */
 }
 
 /* Apply cursor pointer to button elements */
@@ -206,10 +241,12 @@ button:-moz-focusring,
 }
 
 button,
-  html [type='button'], /* Prevent a WebKit bug where (2) destroys native `audio` and `video`controls in Android 4 */
-  [type='reset'],
-  [type='submit'] {
-    -webkit-appearance: button; /* Correct the inability to style clickable types in iOS */
+html [type='button'],
+/* Prevent a WebKit bug where (2) destroys native `audio` and `video`controls in Android 4 */
+[type='reset'],
+[type='submit'] {
+    -webkit-appearance: button;
+    /* Correct the inability to style clickable types in iOS */
 }
 
 /* Remove the default button styling in all browsers */
@@ -231,32 +268,43 @@ textarea:focus {
 
 /* Style select like a standard input */
 select {
-    -moz-appearance: none; /* Firefox 36+ */
-    -webkit-appearance: none; /* Chrome 41+ */
+    -moz-appearance: none;
+    /* Firefox 36+ */
+    -webkit-appearance: none;
+    /* Chrome 41+ */
 }
 
 select::-ms-expand {
-    display: none; /* Internet Explorer 11+ */
+    display: none;
+    /* Internet Explorer 11+ */
 }
 
 select::-ms-value {
-    color: currentColor; /* Internet Explorer 11+ */
+    color: currentColor;
+    /* Internet Explorer 11+ */
 }
 
 legend {
-    border: 0; /* Correct `color` not being inherited in IE 8/9/10/11 */
-    color: inherit; /* Correct the color inheritance from `fieldset` elements in IE */
-    display: table; /* Correct the text wrapping in Edge and IE */
-    max-width: 100%; /* Correct the text wrapping in Edge and IE */
-    white-space: normal; /* Correct the text wrapping in Edge and IE */
-    max-width: 100%; /* Correct the text wrapping in Edge 18- and IE */
+    border: 0;
+    /* Correct `color` not being inherited in IE 8/9/10/11 */
+    color: inherit;
+    /* Correct the color inheritance from `fieldset` elements in IE */
+    display: table;
+    /* Correct the text wrapping in Edge and IE */
+    max-width: 100%;
+    /* Correct the text wrapping in Edge and IE */
+    white-space: normal;
+    /* Correct the text wrapping in Edge and IE */
+    max-width: 100%;
+    /* Correct the text wrapping in Edge 18- and IE */
 }
 
 ::-webkit-file-upload-button {
     /* Correct the inability to style clickable types in iOS and Safari */
     -webkit-appearance: button;
     color: inherit;
-    font: inherit; /* Change font properties to `inherit` in Chrome and Safari */
+    font: inherit;
+    /* Change font properties to `inherit` in Chrome and Safari */
 }
 
 /* # =================================================================
@@ -264,7 +312,8 @@ legend {
      # ================================================================= */
 
 img {
-    border-style: none; /* Remove border when inside `a` element in IE 8/9/10 */
+    border-style: none;
+    /* Remove border when inside `a` element in IE 8/9/10 */
 }
 
 /* Add the correct vertical alignment in Chrome, Firefox, and Opera */
@@ -292,7 +341,49 @@ progress {
 }
 
 .disabled,
-:disabled{
+:disabled {
     opacity: 0.3 !important;
     pointer-events: none !important;
 }
+
+::-webkit-scrollbar {
+    /*滚动条整体样式*/
+    width: 4px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 1px;
+}
+
+::-webkit-scrollbar-thumb {
+    /*滚动条里面小方块*/
+    border-radius: 10px;
+    box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+    background: #c03b3f;
+}
+
+::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    box-shadow: inset 0 0 5px transparent;
+    border-radius: 10px;
+    background: transparent;
+}
+.select-float{
+    background: rgba(182, 30, 34, 0.9) !important;
+    border-radius: 10px !important;
+    padding-bottom: 15px !important;
+}
+.select-replace{
+    width: calc(100% - 3px) !important;
+    background-color: transparent !important;
+}
+.select-replace::-webkit-scrollbar-thumb {
+    /*滚动条里面小方块*/
+    border-radius: 30px !important;
+    box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+    background: var(--font-active) !important;
+}
+.gdmuseum{
+    width: calc(100% - 3px) !important;
+}
+body{
+    background-color: #e8e3d1;
+}

+ 41 - 40
code/src/components/maps/index.vue

@@ -74,6 +74,7 @@ const mapNumChane = async (type) => {
       rowid: item.id,
     };
   });
+  
 
   map.forEach((item) => {
     if (item.sum == 0) {
@@ -137,7 +138,7 @@ const mapNumChane = async (type) => {
         });
     } else {
       $("#state").find(`g[id="${item.id}"] rect`).css({
-        fill: "#999",
+        fill: "#eecc63",
       });
 
       $("#state").find(`g[id="${item.id}"] .st0`).css({
@@ -152,48 +153,48 @@ const mapNumChane = async (type) => {
         fill: "#333333",
       });
 
-      // $("#state").find(`g[id="${item.id}"] text`).css({
-      //   fill: "#5A5A5A",
-      // });
+      $("#state").find(`g[id="${item.id}"] text`).css({
+        fill: "#b61e22",
+      });
 
-      // $("#state").find(`g[id="${item.id}"]`).attr("data-rowId", item.rowid);
+      $("#state").find(`g[id="${item.id}"]`).attr("data-rowId", item.rowid);
 
       // //map
-      // $("#map_1_")
-      //   .find(`g[id="${item.id.replace("id", "tag")}"] rect`)
-      //   .css({
-      //     fill: "#999",
-      //   });
-
-      // $("#map_1_")
-      //   .find(`g[id="${item.id.replace("id", "tag")}"] .st0`)
-      //   .css({
-      //     fill: "#fff",
-      //   });
-
-      // $("#map_1_")
-      //   .find(`g[id="${item.id.replace("id", "tag")}"] .st19`)
-      //   .css({
-      //     fill: "#D9D9D9",
-      //   });
-
-      // $("#map_1_")
-      //   .find(`g[id="${item.id.replace("id", "tag")}"] .st28`)
-      //   .css({
-      //     fill: "#fff",
-      //   });
-
-      // $("#map_1_")
-      //   .find(`g[id="${item.id.replace("id", "tag")}"] text`)
-      //   .css({
-      //     fill: "#5A5A5A",
-      //   });
-
-      // $("#map_1_")
-      //   .find(`g[id="${item.id.replace("id", "tag")}"] rect`)
-      //   .css({
-      //     fill: "#999",
-      //   });
+      $("#map_1_")
+        .find(`g[id="${item.id.replace("id", "tag")}"] rect`)
+        .css({
+          fill: "#b61e22",
+        });
+
+      $("#map_1_")
+        .find(`g[id="${item.id.replace("id", "tag")}"] .st0`)
+        .css({
+          fill: "#b61e22",
+        });
+
+      $("#map_1_")
+        .find(`g[id="${item.id.replace("id", "tag")}"] .st19`)
+        .css({
+          fill: "#eecc63",
+        });
+
+      $("#map_1_")
+        .find(`g[id="${item.id.replace("id", "tag")}"] .st28`)
+        .css({
+          fill: "#333333",
+        });
+
+      $("#map_1_")
+        .find(`g[id="${item.id.replace("id", "tag")}"] text`)
+        .css({
+          fill: "#b61e22",
+        });
+
+      $("#map_1_")
+        .find(`g[id="${item.id.replace("id", "tag")}"] rect`)
+        .css({
+          fill: "#b61e22",
+        });
     }
 
     $("#map_1_")

+ 2 - 2
code/src/components/showCollection/index.vue

@@ -38,9 +38,9 @@ export default {
 <style lang="scss" scoped>
 .wrapper {
   width: 100%;
-  height: 100%;
+  height: calc(100% - 80px);
   position: fixed;
-  top: 0;
+  bottom: 0;
   left: 0;
   z-index: 99999;
   .ui-broadcast {

+ 5 - 0
code/src/views/home/maside.vue

@@ -70,7 +70,12 @@ const charStrs = ref('')
 
 const list = ref([]);
 
+const emit = defineEmits(["changeMap"]);
+
 const onClickSelect = (data) => {
+
+emit('changeMap',data.id)
+
   isShow.value = true
   currentId.value = data.id
 }

+ 14 - 2
code/src/views/home/mobile.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="home">
     <div class="map">
-      <maps />
+      <maps ref="mapsRef"/>
     </div>
-    <vaside class="vaside" />
+    <vaside class="vaside" @changeMap='changeMap'/>
   </div>
 </template>
 
@@ -16,6 +16,18 @@ import { ref, defineEmits, onMounted, watch, nextTick } from "vue";
 import { Loading } from "@/components/UI";
 import { useRouter, useRoute } from "vue-router";
 
+
+// 得到子组件的切换列表信息
+
+const mapsRef =ref(null);
+const changeMap =(id)=>{
+  // 把id传给子组件地图
+  console.log(mapsRef.value);
+  mapsRef.value.changeMap(id)
+  // console.log('------------',id);
+}
+
+
 const router = useRouter();
 
 const currentCity = ref('')