Merge branch 'master' of http://face3d.4dage.com:7005/renyicun/YangZhouDaYunHeDaDu

src/assets/style/my-reset.css

@@ -57,12 +57,10 @@ input {
 td {
   vertical-align: inherit;
 }
-.el-popper {
-  /* padding: 10px !important; */
-}
+
 .el-popper.is-light {
   border: none !important;
-  margin-top: -20px;
+  margin-top: -10px;
   background: none !important;
   /* width: 200px; */
 }

src/views/RelicList.vue

@@ -7,6 +7,7 @@
     <el-cascader
       v-model="cascaderValue"
       :options="cameraTree"
+      :show-all-levels="false"
       :props="{
         expandTrigger: 'hover',
       }"