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

src/components/Layout/bottom.vue

@@ -103,7 +103,7 @@ const topage = (url) => {
   background: #979797;
 }
 .center {
-  margin-top: 60px;
+  margin-top: 40px;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -148,7 +148,7 @@ const topage = (url) => {
   // width: 1920px;
   //   height: 480px;
   background: #131415;
-  padding: 65px 360px;
+  padding: 65px 360px 20px;
   box-sizing: border-box;
 }
 .title {

src/components/advantage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 方案优势组件 -->
-  <div class="bgbox animate__animated animate__bounceInUp" >
+  <div class="bgbox animate__animated animate__bounceInUp">
     <div class="title">{{ title }}</div>
     <div class="top_font" v-if="titleinfo">{{ titleinfo }}</div>
     <div style="position: relative">
@@ -40,7 +40,12 @@
             申请试用
           </div>
         </div>
-        <div :class="state==1?'animate__animated animate__pulse':''" @mouseover="changestate" @mouseleave="leave" class="righta ">
+        <div
+          :class="state == 1 ? 'animate__animated animate__pulse' : ''"
+          @mouseover="changestate"
+          @mouseleave="leave"
+          class="righta"
+        >
           <!-- <img class="right" src="../../assets/images/model.png" alt="" /> -->
           <img class="right" :src="item.image" alt="" />
         </div>
@@ -74,15 +79,14 @@ const apply = () => {
     });
   }
 };
-const state = ref(0)
-
-const changestate = ()=>{
-  state.value = 1
-}
-const leave =()=>{
-  state.value = 0
-}
+const state = ref(0);
 
+const changestate = () => {
+  state.value = 1;
+};
+const leave = () => {
+  state.value = 0;
+};
 
 //关闭
 const close = () => {
@@ -176,6 +180,10 @@ const props = defineProps({
     margin-top: 80px;
     cursor: pointer;
   }
+  .trybtn:hover {
+    opacity: 0.7;
+    transform: scale(1.1, 1.1);
+  }
 }
 
 .right {
@@ -184,8 +192,6 @@ const props = defineProps({
   transition: width 0.5s ease-in-out; /* 设置过渡效果 */
 }
 
-
-
 .line {
   background: #e4e7ed;
   height: 2px;

src/components/corporation.vue

@@ -135,11 +135,15 @@ watch(
 </script>
 
 <style lang="scss" scoped>
-.contentbig{
+.contentbig {
   width: 1200px;
   margin: 0 auto;
   padding: 80px 0;
 }
+.btntitle:hover {
+  opacity: 0.7;
+  transform: scale(1.1, 1.1);
+}
 .btntitle {
   width: 428px;
   height: 56px;

src/view/Home/price.vue

@@ -315,6 +315,10 @@ const close = () => {
     text-align: left;
     font-style: normal;
   }
+  .draw:hover {
+    opacity: 0.7;
+    transform: scale(1.1, 1.1);
+  }
   .draw {
     width: 140px;
     height: 48px;

src/view/handbook/bookinfo.vue

@@ -37,9 +37,18 @@
               :index="String(item.id) + '-' + item.name"
             >
               <template #title>
-                <div>
-                  <span>{{ item.name }}</span>
-                </div>
+                <el-popover
+                  placement="top-start"
+                  :width="200"
+                  trigger="hover"
+                  :content="item.name"
+                >
+                  <template #reference>
+                    <div class="over">
+                      <span>{{ item.name }}</span>
+                    </div>
+                  </template>
+                </el-popover>
               </template>
               <template v-if="item.children">
                 <el-sub-menu
@@ -47,7 +56,20 @@
                   :key="ind"
                   :index="item.id + '-' + item2.id + '-' + item2.name"
                 >
-                  <template #title>{{ item2.name }}</template>
+                  <template #title>
+                    <el-popover
+                      placement="top-start"
+                      :width="200"
+                      trigger="hover"
+                      :content="item2.name"
+                    >
+                      <template #reference>
+                        <div class="over">
+                          <span>{{ item2.name }}</span>
+                        </div>
+                      </template>
+                    </el-popover>
+                  </template>
 
                   <template v-if="item2.children">
                     <el-sub-menu
@@ -55,7 +77,20 @@
                       :key="inda"
                       :index="item.id + '-' + item2.id + '-' + item3.id"
                     >
-                      <template #title>{{ item3.name }}</template>
+                      <template #title>
+                        <el-popover
+                          placement="top-start"
+                          :width="200"
+                          trigger="hover"
+                          :content="item3.name"
+                        >
+                          <template #reference>
+                            <div class="over">
+                              <span>{{ item3.name }}</span>
+                            </div>
+                          </template>
+                        </el-popover>
+                      </template>
                       <el-menu-item
                         v-for="(child, inx) in item3.documents"
                         :key="inx"
@@ -71,7 +106,17 @@
                           '-' +
                           item3.name
                         "
-                        >{{ child.title }}</el-menu-item
+                      >
+                        <el-popover
+                          placement="top-start"
+                          :width="200"
+                          trigger="hover"
+                          :content="child.title"
+                        >
+                          <template #reference>
+                            <div class="over">{{ child.title }}</div>
+                          </template>
+                        </el-popover></el-menu-item
                       >
                     </el-sub-menu>
                   </template>
@@ -81,7 +126,17 @@
                       :key="index"
                       @click="change(child.content, child.title)"
                       :index="item.id + '-' + item2.id + '-' + child.id"
-                      >{{ child.title }}</el-menu-item
+                    >
+                      <el-popover
+                        placement="top-start"
+                        :width="200"
+                        trigger="hover"
+                        :content="child.title"
+                      >
+                        <template #reference>
+                          <div class="over">{{ child.title }}</div>
+                        </template>
+                      </el-popover></el-menu-item
                     >
                   </template>
                 </el-sub-menu>
@@ -92,8 +147,18 @@
                   :key="index"
                   :index="item.id + '-' + child.id"
                   @click="change(child.content, child.title)"
-                  >{{ child.title }}</el-menu-item
                 >
+                  <el-popover
+                    placement="top-start"
+                    :width="200"
+                    trigger="hover"
+                    :content="child.title"
+                  >
+                    <template #reference>
+                      <div class="over">{{ child.title }}</div>
+                    </template>
+                  </el-popover>
+                </el-menu-item>
               </template>
             </el-sub-menu>
           </el-menu>
@@ -176,7 +241,9 @@ const closeb = (key, keyPath) => {};
 //搜索结果
 if (route.query.indexid) {
   defaultact.value = route.query.indexid;
-  book.content.con = route.query.content;
+  const regex = new RegExp('<img', 'gi')
+  book.content.con = route.query.content.replace(regex, `<img style="width: 100%; height: auto;margin-top:20px;"`)
+  // book.content.con = route.query.content;
   docu.value = route.query.title;
   categoryname.value = route.query.category_name;
 }
@@ -187,7 +254,9 @@ const agreement = async (code) => {
     const { data } = await agreementAPi.agreement({
       code: code,
     });
-    book.content.first = data;
+    const regex = new RegExp('<img', 'gi')
+    book.content.con = data.replace(regex, `<img style="width: 100%; height: auto;margin-top:20px;"`)
+    // book.content.first = data;
   } catch (error) {}
 };
 if (book.content.con == "" && type_id.value == 1) {
@@ -227,13 +296,21 @@ const category = async () => {
 };
 onMounted(category);
 const change = (content, title) => {
-  book.content.con = content;
+  const regex = new RegExp('<img', 'gi')
+  book.content.con = content.replace(regex, `<img style="width: 100%; height: auto;margin-top:20px;"`)
+  // book.content.con = content;
   docu.value = title;
   categoryname.value = lastname.value;
 };
 </script>
 
 <style lang="scss" scoped>
+.over {
+  width: 160px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .scroll-container {
   height: 100vh;
   overflow-y: scroll;
@@ -244,7 +321,7 @@ const change = (content, title) => {
   height: 16px !important;
 }
 .btnline {
-  width: 880px;
+  // width: 880px;
   height: 1px;
   background: rgba(151, 151, 151, 0.2);
   margin-bottom: 25px;

src/view/video/course.vue

@@ -392,7 +392,8 @@ const videoinfo = (child) => {
     query: {
       id: child.video_id || child.id,
       time: child.study_record == null ? 0 : child.study_record.duration,
-      is_complete:child.study_record == null ? 1 : child.study_record.is_complete,
+      is_complete:
+        child.study_record == null ? 1 : child.study_record.is_complete,
     },
   });
 };
@@ -476,6 +477,10 @@ const videoinfo = (child) => {
   font-style: normal;
   cursor: pointer;
 }
+.bluebtn:hover {
+  opacity: 0.7;
+  transform: scale(1.1, 1.1);
+}
 // }
 .comment {
   &-list {
@@ -639,6 +644,10 @@ const videoinfo = (child) => {
     margin-top: 30px;
     cursor: pointer;
   }
+  .button:hover {
+    opacity: 0.7;
+    transform: scale(1.1, 1.1);
+  }
   .updata {
     font-family: PingFangSC, PingFang SC;
     font-weight: 400;

src/view/video/info.vue

@@ -1,15 +1,15 @@
 <template>
-  <div class="scroll-container" >
+  <div class="scroll-container">
     <div class="toptitle flex">
       <div class="content flex">
         <div class="flex">
-          <img class="returnimg" src="../../assets/images/return.png" alt="">
+          <img class="returnimg" src="../../assets/images/return.png" alt="" />
           <div class="return" @click="returna">返回课程</div>
         </div>
         <div class="line"></div>
         <div class="title">{{ videoinfo.info.title }}</div>
       </div>
-    </div>  
+    </div>
     <div class="videobox">
       <div class="content" style="position: relative">
         <!-- <div > -->
@@ -194,7 +194,7 @@ const imgList = reactive({
 });
 
 const is_complete = ref(0);
-is_complete.value = route.query.is_complete
+is_complete.value = route.query.is_complete;
 if (is_complete.value == 1) {
   is_complete.value = 1;
 } else {
@@ -538,6 +538,10 @@ onUnmounted(() => {
     font-style: normal;
     cursor: pointer;
   }
+  .bluebtn:hover {
+    opacity: 0.7;
+    transform: scale(1.1, 1.1);
+  }
 }
 .right {
   position: absolute;
@@ -700,7 +704,7 @@ onUnmounted(() => {
     cursor: pointer;
     margin-left: 12px;
   }
-  .returnimg{
+  .returnimg {
     width: 18px;
     height: 18px;
     color: #ffffff;