Merge branch 'master' of http://gits.hdlkeji.com:3000/mabaoyi/factoryDirector

src/App.vue

@@ -8,7 +8,10 @@ onMounted(() => {});
   <router-view></router-view>
 </template>
 
-<style  lang="scss">
+<style lang="scss">
+:deep(.el-popup-parent--hidden) {
+  width: 100% !important;
+}
 .flex {
   &-row {
     display: flex;
@@ -19,7 +22,7 @@ onMounted(() => {});
     display: flex;
     flex-direction: column;
   }
- 
+
   &-aic {
     align-items: center;
   }

src/assets/css/common.less

@@ -4,13 +4,16 @@
 }
 body,
 html {
-  // height: 100%;
+  min-height: 100vh;
   margin: 0;
   padding: 0;
   border-radius: 0;
-  overflow-x: hidden;
+  // overflow-x: hidden;
+  // overflow: hidden;
 }
 #app {
   width: 100%;
-  overflow-x: hidden;
+  min-height: 100vh;
+  // overflow-x: hidden;
+  // overflow: hidden;
 }

src/components/Application .vue

@@ -1,7 +1,8 @@
 <template>
   <!-- 应用模块组件 -->
   <div class="bg">
-    <div class="title">{{ title }}</div>
+    <div class="content">
+      <div class="title">{{ title }}</div>
     <div class="sm_font">{{ titleinfo }}</div>
     <!-- <div class="flex">
       <div v-for="(item,idx) in 10" :key="idx" class="item"></div>
@@ -9,6 +10,7 @@
     <div>
       <img class="image" :src="image" alt="" />
     </div>
+    </div>
   </div>
 </template>
 
@@ -30,7 +32,12 @@ const props = defineProps({
 </script>
 
 <style lang="scss" scoped>
-.image {
+.content{
+  width: 1200px;
+  margin: 0 auto;
+   padding: 80px 0px ;
+}
+.image{
   width: 1200px;
   height: 270px;
   margin-top: 60px;
@@ -43,10 +50,10 @@ const props = defineProps({
   margin-top: 40px;
 }
 .bg {
-  width: 1920px;
+  // width: 1920px;
   // height: 560px;
   background: #f5f9ff;
-  padding: 80px 360px;
+  // padding: 80px 360px ;
   box-sizing: border-box;
   .item {
     width: 225px;

src/components/Form/from.vue

@@ -119,14 +119,20 @@ onMounted(type);
 </script>
 
 <style lang="scss" scoped>
+.two{
+  overflow: hidden;
+}
 :deep(.el-dialog) {
   --el-dialog-width: 520px !important;
 }
+:deep(.el-popup-parent--hidden) {
+  width: 100% !important;
+}
 ::v-deep(.el-form-item__label) {
   width: 83px !important;
 }
 .formbox {
-  padding: 0 50px;
+  padding: 0 50px;  
 }
 
 :deep(.el-popup-parent--hidden) {

src/components/Layout/bottom.vue

@@ -1,45 +1,47 @@
 <template>
   <div class="bg">
-    <div class="top">
-      <div v-for="(item, idx) in foot.list" :key="idx">
-        <div class="title">{{ item.title }}</div>
-        <div
-          class="item"
-          @click="topage(child.url)"
-          v-for="(child, index) in item.footer"
-          :key="index"
-        >
-          {{ child.title }}
+    <!-- <div class="content"> -->
+      <div class="top">
+        <div v-for="(item, idx) in foot.list" :key="idx">
+          <div class="title">{{ item.title }}</div>
+          <div
+            class="item"
+            @click="topage(child.url)"
+            v-for="(child, index) in item.footer"
+            :key="index"
+          >
+            {{ child.title }}
+          </div>
         </div>
-      </div>
-      <div>
-        <div class="title">联系我们</div>
-        <div class="item">售前电话：{{ foot.info.pre_sale_mobile }}</div>
-        <div class="item">市场合作:{{ foot.info.market_cooperation }}</div>
-        <div class="item">渠道合作:{{ foot.info.channel_cooperation }}</div>
-        <div class="item">投诉电话:{{ foot.info.complaint_mobile }}</div>
-      </div>
-      <div>
-        <div class="title">关注我们</div>
-        <div class="item">{{ foot.info.service_time }}</div>
-        <div class="img">
-          <img class="image" :src="foot.info.service_qr_code" alt="" />
-          <img class="image" :src="foot.info.official_qr_code" alt="" />
+        <div>
+          <div class="title">联系我们</div>
+          <div class="item">售前电话：{{ foot.info.pre_sale_mobile }}</div>
+          <div class="item">市场合作:{{ foot.info.market_cooperation }}</div>
+          <div class="item">渠道合作:{{ foot.info.channel_cooperation }}</div>
+          <div class="item">投诉电话:{{ foot.info.complaint_mobile }}</div>
+        </div>
+        <div>
+          <div class="title">关注我们</div>
+          <div class="item">{{ foot.info.service_time }}</div>
+          <div class="img">
+            <img class="image" :src="foot.info.service_qr_code" alt="" />
+            <img class="image" :src="foot.info.official_qr_code" alt="" />
+          </div>
         </div>
       </div>
-    </div>
-    <div class="center">
-      <div>
-        <div class="emil">官方邮箱：{{ foot.info.email }}</div>
-        <div class="address">{{ foot.info.address }}</div>
-      </div>
-      <div>
-        <!-- <div class="logo"></div> -->
-        <img class="logo" :src="foot.info.logo" alt="" />
+      <div class="center">
+        <div>
+          <div class="emil">官方邮箱：{{ foot.info.email }}</div>
+          <div class="address">{{ foot.info.address }}</div>
+        </div>
+        <div>
+          <!-- <div class="logo"></div> -->
+          <img class="logo" :src="foot.info.logo" alt="" />
+        </div>
       </div>
-    </div>
-    <div class="line"></div>
-    <div class="bottom_font">{{ foot.info.copyright }}</div>
+      <div class="line"></div>
+      <div class="bottom_font">{{ foot.info.copyright }}</div>
+    <!-- </div> -->
   </div>
 </template>
 
@@ -77,6 +79,11 @@ const topage = (url) => {
 </script>
 
 <style lang="scss" scoped>
+// .content{
+//   width: 1200px;
+//   margin: 0 auto;
+//   padding: 65px 0;
+// }
 .bottom_font {
   font-family: SFPro, SFPro;
   font-weight: 400;
@@ -137,7 +144,7 @@ const topage = (url) => {
   }
 }
 .bg {
-  width: 1920px;
+  // width: 1920px;
   //   height: 480px;
   background: #131415;
   padding: 65px 360px;

src/components/corporation.vue

@@ -1,55 +1,57 @@
 <template>
   <!-- 公司模块 -->
   <div class="bgbox">
-    <div class="title">{{ title }}</div>
-    <div v-if="info" class="info">{{ info }}</div>
-    <div class="box" v-if="ing == 0">
-      <img
-        class="item"
-        v-for="(item, idx) in list"
-        :key="idx"
-        :src="item.image"
-        alt=""
-      />
-    </div>
-    <div v-else class="box">
-      <el-carousel indicator-position="none" :autoplay="false">
-        <el-carousel-item v-for="(child, index) in newlist.list" :key="index">
-          <div class="" style="display: flex; align-items: center">
-            <div
-              class="imgbox"
-              :style="{
-                background: 'url(' + item.background_image + ')',
-                backgroundSize: 'cover',
-              }"
-              v-for="(item, idx) in child"
-              :key="idx"
-            >
+    <div class="contentbig">
+      <div class="title">{{ title }}</div>
+      <div v-if="info" class="info">{{ info }}</div>
+      <div class="box" v-if="ing == 0">
+        <img
+          class="item"
+          v-for="(item, idx) in list"
+          :key="idx"
+          :src="item.image"
+          alt=""
+        />
+      </div>
+      <div v-else class="box">
+        <el-carousel indicator-position="none" :autoplay="false">
+          <el-carousel-item v-for="(child, index) in newlist.list" :key="index">
+            <div class="" style="display: flex; align-items: center">
               <div
-                class="bo"
-                @mouseover="changeBackground(idx)"
-                @mouseleave="leave"
+                class="imgbox"
+                :style="{
+                  background: 'url(' + item.background_image + ')',
+                  backgroundSize: 'cover',
+                }"
+                v-for="(item, idx) in child"
+                :key="idx"
               >
-                <img class="logo" :src="item.logo" alt="" />
-                <div class="name">{{ item.company_name }}</div>
-                <div class="content">{{ item.content }}</div>
                 <div
-                  v-if="over == 1 && ind == idx"
-                  style="
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                  "
+                  class="bo"
+                  @mouseover="changeBackground(idx)"
+                  @mouseleave="leave"
                 >
-                  <div class="btntitle" @click="apply">
-                    {{ item.button_title }}
+                  <img class="logo" :src="item.logo" alt="" />
+                  <div class="name">{{ item.company_name }}</div>
+                  <div class="content">{{ item.content }}</div>
+                  <div
+                    v-if="over == 1 && ind == idx"
+                    style="
+                      display: flex;
+                      align-items: center;
+                      justify-content: center;
+                    "
+                  >
+                    <div class="btntitle" @click="apply">
+                      {{ item.button_title }}
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
-          </div>
-        </el-carousel-item>
-      </el-carousel>
+          </el-carousel-item>
+        </el-carousel>
+      </div>
     </div>
   </div>
   <forma :dialogTableVisible2="dialogTableVisible2" @clos="close"></forma>
@@ -133,6 +135,11 @@ watch(
 </script>
 
 <style lang="scss" scoped>
+.contentbig{
+  width: 1200px;
+  margin: 0 auto;
+  padding: 80px 0;
+}
 .btntitle {
   width: 428px;
   height: 56px;
@@ -246,9 +253,9 @@ watch(
   }
 }
 .bgbox {
-  width: 100%;
+  // width: 100%;
   // height: 820px;
-  padding: 80px 360px 0;
+  // padding: 80px 360px 0;
   box-sizing: border-box;
   .title {
     font-family: PingFangSC, PingFang SC;

src/components/row/row.vue

@@ -214,7 +214,7 @@ userid.value = JSON.parse(localStorage.getItem("USER_STORE"));
   top: 0;
   left: 0;
   z-index: 1900;
-  width: 1920px;
+  // width: 1920px;
   height: 100vh;
   display: flex;
   align-items: center;

src/view/handbook/bookinfo.vue

@@ -28,12 +28,11 @@
             :unique-opened="true"
             v-for="(item, idx) in book.category"
             :key="idx"
-            default-active="1"
             class="el-menu-vertical-demo"
             @open="document(item.id, item.name)"
             @close="handleClose"
           >
-            <el-sub-menu index="1">
+            <el-sub-menu :index="idx">
               <template #title>
                 <div>
                   <span>{{ item.name }}</span>
@@ -44,23 +43,25 @@
                   @click="document(item2.id, item2.name)"
                   v-for="(item2, ind) in item.children"
                   :key="ind"
-                  index="1-4"
+                  :index="idx + '*' + 1"
                 >
                   <template #title>{{ item2.name }}</template>
 
                   <template v-if="item2.children">
                     <el-sub-menu
                       @click="document(item3.id, item3.name)"
-                      v-for="(item3, ind) in item2.children"
-                      :key="ind"
-                      index="1-4"
+                      v-for="(item3, inda) in item2.children"
+                      :key="inda"
+                      :index="idx+'*'+ind + '*' + 1"
                     >
                       <template #title>{{ item3.name }}</template>
                       <el-menu-item
                         v-for="(child, inx) in book.documentlist"
                         :key="inx"
                         @click="change(e, child.content, child.title)"
-                        :index="'1' + index"
+                        :index="
+                          idx + '-' + idx + 1 + '-' + ind + 1 + '-' + inx + 1
+                        "
                         >{{ child.title }}</el-menu-item
                       >
                     </el-sub-menu>
@@ -70,7 +71,7 @@
                       v-for="(child, index) in book.documentlist"
                       :key="index"
                       @click="change(e, child.content, child.title)"
-                      :index="'1' + index"
+                      :index="idx+'-'+ind +'-' + index"
                       >{{ child.title }}</el-menu-item
                     >
                   </template>
@@ -81,7 +82,7 @@
                   v-for="(child, index) in book.documentlist"
                   :key="index"
                   @click="change(e, child.content, child.title)"
-                  :index="'1' + index"
+                  :index="idx + '-' + index + 1"
                   >{{ child.title }}</el-menu-item
                 >
               </template>
@@ -128,8 +129,8 @@ const topchange = (name, index, id) => {
   changefont.value = name;
   changeindex.value = index;
   type_id.value = id;
-  docu.value = ''
-  categoryname.value = ''
+  docu.value = "";
+  categoryname.value = "";
   book.documentlist = [];
   book.content.con = "";
   category();
@@ -164,14 +165,14 @@ const category = async () => {
         console.log(111);
         categoryname.value = data[0].children[0].children[0].name;
         category_id.value = data[0].children[0].children[0].id;
-        console.log(category_id.value );
-        
+        console.log(category_id.value);
+
         document(category_id.value);
       } else {
         console.log(222);
         categoryname.value = data[0].children[0].name;
         category_id.value = data[0].children[0].id;
-        console.log(category_id.value );
+        console.log(category_id.value);
         document(category_id.value);
       }
     } else {
@@ -180,7 +181,6 @@ const category = async () => {
       category_id.value = data[0].id;
       document(category_id.value);
     }
-    
   } catch (error) {}
 };
 onMounted(category);
@@ -299,7 +299,7 @@ const change = (e, content, title) => {
   margin-top: 24px;
 }
 .top {
-  width: 1920px;
+  // width: 1920px;
   height: 60px;
   background: #ffffff;
   box-shadow: 0px 2px 10px -2px rgba(0, 0, 0, 0.2);

src/view/handbook/handbook.vue

@@ -128,7 +128,7 @@ onMounted(documentType);
   margin-top: 40px;
 }
 .bga {
-  width: 1920px;
+  // width: 1920px;
   // height: 560px;
   background: #f5f9ff;
   padding: 80px 360px;

src/view/video/course.vue

@@ -727,13 +727,13 @@ const videoinfo = (id, time) => {
   }
 }
 .tabs {
-  width: 1920px;
+  // width: 1920px;
   height: 74px;
   background: #ffffff;
   position: relative;
 }
 .bg {
-  width: 1920px;
+  // width: 1920px;
   min-height: calc(100vh - 60px);
   background: #f5f5f7;
   position: relative;
@@ -750,7 +750,7 @@ const videoinfo = (id, time) => {
   margin-left: 40px;
 }
 .top {
-  width: 1920px;
+  // width: 1920px;
   height: 200px;
   background: rgba(0, 0, 0, 0.6);
   backdrop-filter: blur(10px);