From 2ed32e97db14fe956f6dd10ee54c6d7cec713712 Mon Sep 17 00:00:00 2001
From: wuhongjian <wuhongjian@hisense.com>
Date: Thu, 14 Jul 2022 14:17:20 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/public/static/config/location.js     |  6 ++--
 front/src/store/modules/user.js            |  2 +-
 front/src/views/home/components/header.vue | 35 +++++++++++++---------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js
index 0fc99b77..66106bcf 100644
--- a/front/public/static/config/location.js
+++ b/front/public/static/config/location.js
@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-13 18:05:38
+ * @LastEditTime: 2022-07-14 10:01:08
  * @Description: 数据资源参数配置
  */
 const newLocation = 'qingdao'
@@ -32,12 +32,12 @@ if (newLocation === 'qingdao') {
     { name: '能力统计', key: 'abilityStatistics' },
     // { name: '开发指南', key: 'developmentGuide' },
     { name: '指导手册', key: 'instructionManual' },
-    { name: '需求中心', key: 'demandCenter' },
+    // { name: '需求中心', key: 'demandCenter' },
     // { name: '个人中心', key: 'personalCenter' },
     { name: '区市站点', key: 'mapTest' },
     // { name: '后台管理', key: 'houtaiguanli' },
     { name: '赋能案例', key: 'assignCase' },
-    // { name: '融合服务', key: 'integrationServices' },
+    { name: '融合服务', key: 'integrationServices' },
   ]
   footerDataList.footerList = {
     company: {
diff --git a/front/src/store/modules/user.js b/front/src/store/modules/user.js
index e37acb80..f3b183ff 100644
--- a/front/src/store/modules/user.js
+++ b/front/src/store/modules/user.js
@@ -120,7 +120,7 @@
        return false
      }
      // debugger
-     commit('setUsername', data.data.username)
+     commit('setUsername', data.data.realName)
      commit('setRole', data.data.roleIdList.length)
      commit('setUserId', data.data.id)
      // TODO 获取用户信息，后续执行部分操作
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index eaac12de..2f67446f 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -113,7 +113,7 @@
   import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
   import { recordRoute } from '@/config'
   import { useRoute, useRouter } from 'vue-router'
-  import { getUser, mynotice } from '@/api/home'
+  import { mynotice } from '@/api/home'
   import { useStore } from 'vuex'
   import { getSgcTotal } from '@/api/home'
   import mybus from '@/myplugins/mybus'
@@ -132,22 +132,25 @@
   //   // { name: '后台管理', key: 'houtaiguanli' },
   //   { name: '赋能案例', key: 'assignCase' },
   // ])
-  const user = ref({})
+  const user = ref({
+    username: store.getters['user/username'],
+  })
+  // user.username.value = store.getters(['user/username'])
   const select = ref(router.currentRoute.value.name)
   const mynoticeFlag = ref(false)
   const mynoticeData = ref([])
-  console.log('navListManagement------------>', navListManagement);
+  console.log('navListManagement------------>', navListManagement)
 
   // eslint-disable-next-line no-undef
   const navList = ref(navListManagement.navList)
   const props = defineProps({
     showView: { type: String, default: '' },
   })
-  // 获取用户信息
-  getUser().then((res) => {
-    user.value = res.data.data
-    // console.log('user===============>', user.value)
-  })
+  // // 获取用户信息
+  // getUser().then((res) => {
+  //   user.value = res.data.data
+  //   // console.log('user===============>', user.value)
+  // })
   // 退出登录
   const logout = async () => {
     await store.dispatch('user/logout')
@@ -221,9 +224,9 @@
         router.push({
           path: '/integrationServices',
           //  path: '/DetailsPageconetent',
-            query: {
-              select: '融合服务',
-            },
+          query: {
+            select: '融合服务',
+          },
         })
         break
       default:
@@ -323,7 +326,7 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    padding: 0 1rem;
+    // padding: 0 1rem;
     background-color: rgba(0, 0, 25, 0.7);
     position: fixed;
     z-index: 1000;
@@ -362,7 +365,7 @@
       color: #fff !important;
     }
     .info {
-      width: 2rem;
+      // width: 2rem;
       margin-left: 0.2rem;
       display: flex;
       justify-content: center;
@@ -381,7 +384,11 @@
         font-size: 0.16rem;
       }
       .name {
-        max-width: 0.75rem;
+        max-width: 3.3rem;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 1;
+        -webkit-box-orient: vertical;
         overflow: hidden;
       }
       .out {

From deb886a254aa1ef57212b53ab9b4415743876065 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 14 Jul 2022 14:55:49 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/sys/log-operation.vue  |  2 +-
 .../components/PutOnTheShelf.vue              | 17 +++--
 .../Algorithm/AlgorithmUsageMode.vue          |  6 +-
 .../components/Business/BusinessUsageMode.vue |  6 +-
 ...operOwningDepartmentAndServiceProvider.vue |  4 +-
 .../LayerService/LayerServiceUsageMode.vue    |  6 +-
 .../views/personalCenter/VueTemplateDemo.vue  | 75 ++++++++++++++++---
 7 files changed, 80 insertions(+), 36 deletions(-)

diff --git a/back/src/views/modules/sys/log-operation.vue b/back/src/views/modules/sys/log-operation.vue
index 3a6cafa8..ba1808bd 100644
--- a/back/src/views/modules/sys/log-operation.vue
+++ b/back/src/views/modules/sys/log-operation.vue
@@ -232,7 +232,7 @@ export default {
         startDate: '',
         endDate: '',
         operation: '',
-        operationType: 'all'
+        operationType: ''
       }
       this.value1 = '' // 格式化日期
       this.operationType = '' // 操作类型转化
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
index 518634ed..ccb76044 100644
--- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
+++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
@@ -162,6 +162,13 @@
               @click="showTextFunction()"
             >
               编辑富文本
+              <div
+                v-show="showText"
+                class="fuwenbenbianjiqi"
+                style="position: absolute; z-index: 10000"
+              >
+                <VueTemplateDemo :dataFrom="props.dataFrom"></VueTemplateDemo>
+              </div>
             </div>
             <upload
               v-else-if="item.type == 'video'"
@@ -240,13 +247,6 @@
         </div>
       </template>
     </div>
-    <div
-      v-show="showText"
-      class="fuwenbenbianjiqi"
-      style="width: 100px; height: 100px; z-index: 10000"
-    >
-      <VueTemplateDemo></VueTemplateDemo>
-    </div>
   </div>
 </template>
 <script setup>
@@ -260,7 +260,7 @@
     queryResourceRelByKeyId,
     filesUpload,
   } from '@/api/personalCenter'
-  import VueTemplateDemo from '@/views/capacityOnTheShelf/FilesUpload.vue'
+  import VueTemplateDemo from '@/views/personalCenter/VueTemplateDemo.vue'
   import { useRouter } from 'vue-router'
   const router = useRouter()
   const abilityToType = router.currentRoute.value.query.abilityToType
@@ -417,6 +417,7 @@
   }
   mybus.on('showTextFunctionEmit', (show) => {
     console.log('ssdcsd')
+    debugger
     showText.value = show
   })
   mybus.off('func')
diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
index 40ec5db8..bbde3d6a 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmUsageMode.vue
@@ -187,11 +187,7 @@
     )[0]
     // console.log('dataFrom.value.link', obj.attrValue)
     if (obj) {
-      window.open(
-        window.SITE_CONFIG.previewUrl +
-          'hisense_office/onlinePreview?url=' +
-          btoa(encodeURI(obj.attrValue))
-      )
+      window.open(window.SITE_CONFIG.frontUrl + obj.attrValue)
     } else {
       message.config({
         top: '100px', // 距离顶部的位置
diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
index 06a2f533..698980e5 100644
--- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
@@ -207,11 +207,7 @@
       (item) => item.attrType === '技术文档'
     )[0]
     if (obj) {
-      window.open(
-        window.SITE_CONFIG.previewUrl +
-          'hisense_office/onlinePreview?url=' +
-          btoa(encodeURI(obj.attrValue))
-      )
+      window.open(window.SITE_CONFIG.frontUrl + obj.attrValue)
     } else {
       message.config({
         top: '100px', // 距离顶部的位置
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
index ec1d4bd8..04aae90b 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperOwningDepartmentAndServiceProvider.vue
@@ -138,10 +138,9 @@
     let obj = props.dataList.infoList.filter(
       (item) => item.attrType === '技术文档'
     )[0]
-    debugger
     console.log('dataFrom.value.link', obj.attrValue)
     window.open(
-      window.SITE_CONFIG.previewUrl +
+      window.SITE_CONFIG.frontUrl +
         'hisense_office/onlinePreview?url=' +
         btoa(encodeURI(obj.attrValue))
     )
@@ -150,7 +149,6 @@
     let obj = props.dataList.infoList.filter(
       (item) => item.attrType === '使用手册'
     )[0]
-    debugger
     console.log('dataFrom.value.link', obj.attrValue)
     window.open(
       window.SITE_CONFIG.previewUrl +
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
index f6f7b1c8..a0702fc7 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
@@ -215,11 +215,7 @@
       (item) => item.attrType === '技术文档'
     )[0]
     if (obj) {
-      window.open(
-        window.SITE_CONFIG.previewUrl +
-          'hisense_office/onlinePreview?url=' +
-          btoa(encodeURI(obj.attrValue))
-      )
+      window.open(window.SITE_CONFIG.frontUrl + obj.attrValue)
     } else {
       message.config({
         top: '100px', // 距离顶部的位置
diff --git a/front/src/views/personalCenter/VueTemplateDemo.vue b/front/src/views/personalCenter/VueTemplateDemo.vue
index 6808a71d..10f12b37 100644
--- a/front/src/views/personalCenter/VueTemplateDemo.vue
+++ b/front/src/views/personalCenter/VueTemplateDemo.vue
@@ -16,6 +16,7 @@
 
 <script>
   import { defineComponent } from 'vue'
+  import mybus from '@/myplugins/mybus'
   import { message } from 'ant-design-vue'
   import { useRouter } from 'vue-router'
   import { getDevelopmentFile, updateDevelopmentFile } from '@/api/file'
@@ -27,34 +28,88 @@
   export default defineComponent({
     name: 'VueTemplateDemo',
     components: { Editor },
+    props: {
+      dataFrom: {
+        type: Object,
+      },
+    },
     data() {
       return {
         text: '',
         route: useRouter(),
         iconfontJs: fontJs,
+        uuidOne: '',
+        uuidTwo: '',
+        uuidSnum: '',
       }
     },
     created() {
+      this.uuidSplice()
       this.getDevelopmentFile()
     },
     methods: {
+      uuid(len, radix) {
+        var chars =
+          '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+        var uuid = [],
+          i
+        radix = radix || chars.length
+
+        if (len) {
+          // Compact form
+          for (i = 0; i < len; i++) uuid[i] = chars[0 | (Math.random() * radix)]
+        } else {
+          // rfc4122, version 4 form
+          var r
+
+          // rfc4122 requires these characters
+          uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
+          uuid[14] = '4'
+
+          // Fill in random data.  At i==19 set the high bits of clock sequence as
+          // per rfc4122, sec. 4.1.5
+          for (i = 0; i < 36; i++) {
+            if (!uuid[i]) {
+              r = 0 | (Math.random() * 16)
+              uuid[i] = chars[i == 19 ? (r & 0x3) | 0x8 : r]
+            }
+          }
+        }
+
+        return uuid.join('')
+      },
+
+      uuidSplice() {
+        this.uuidOne = this.uuid(13, 16)
+        this.uuidTwo = this.uuid(13, 16)
+        this.uuidSnum = this.uuidOne + this.uuidTwo
+        this.uuidSnum = this.uuidSnum.replace(/\s+/g, '')
+        console.log('this.uuidOne', this.uuidSnum)
+      },
       async saveText(file) {
         // console.log('保存成功', e)
         // const jsonStr = JSON.stringify(e)
         const blob = new Blob([file], {
           type: 'md',
         })
-        let myfile = new File([blob], this.route.currentRoute.query.id + '.md')
+        let myfile = new File([blob], this.uuidSnum + '.md')
         var formData = new FormData()
-        const type = pinyin(this.route.currentRoute.query.type, {
+        const type = pinyin(this.dataFrom.type, {
           pattern: 'initial',
         }).replace(/\s*/g, '')
-        formData.append('fileName', this.route.currentRoute.query.id + '.md')
+        formData.append('fileName', this.uuidSnum + '.md')
         formData.append('type', type)
         formData.append('file', myfile) // 'file' 为HTTP Post里的字段名, file 对浏览器里的File对象
         // formData.append('name', this.route.currentRoute.query.id + '.md')
         // FileSaver.saveAs(blob, '开发指南.md')
         const res = await updateDevelopmentFile(formData)
+        let infoList = {
+          attrType: '技术文档',
+          attrValue: res.data.data,
+          delFlag: 0,
+        }
+        mybus.emit('chageDataFrom', infoList)
+        mybus.emit('showTextFunctionEmit', false)
         console.log('res', res)
         if (res.data.code === 0) {
           message.success('保存成功')
@@ -63,20 +118,22 @@
         }
       },
       async getDevelopmentFile() {
-        console.log(
-          this.route.currentRoute.query.id,
-          this.route.currentRoute.query.type
-        )
-        const type = pinyin(this.route.currentRoute.query.type, {
+        const type = pinyin(this.dataFrom.type, {
           pattern: 'initial',
         }).replace(/\s*/g, '')
         console.log(type)
         const param = {
           type: type,
-          resourceId: this.route.currentRoute.query.id,
+          resourceId: this.uuidSnum,
         }
         const res = await getDevelopmentFile(param)
         this.text = res.data
+        let infoList = {
+          attrType: '技术文档',
+          attrValue: this.text.data,
+          delFlag: 0,
+        }
+        mybus.emit('chageDataFrom', infoList)
         console.log('res', res)
       },
     },

From ea665df41ef55e4a3a3625aba9c2a89c4cb5363b Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 14 Jul 2022 15:12:40 +0800
Subject: [PATCH 3/6] bug568

---
 .../AlgorithmApplicationScenarios.vue         |   6 +-
 .../Business/BusinessApplicationScenarios.vue | 126 ++++++++++--------
 .../DeveloperApplicationScenarios.vue         |   6 +-
 .../LayerServiceApplicationScenarios.vue      | 126 ++++++++++--------
 4 files changed, 152 insertions(+), 112 deletions(-)

diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue
index 016bb3ee..436aec93 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmApplicationScenarios.vue
@@ -35,7 +35,7 @@
       </div>
       <template v-for="itemSonTitle in dataFrom.attrValue" :key="itemSonTitle">
         <div class="content" v-if="tabindex == itemSonTitle.name">
-          <div class="content-right">
+          <div class="content-left">
             <div class="content-left-scene" v-if="!itemSonTitle.img"></div>
             <a-image
               :width="635"
@@ -121,13 +121,13 @@
     log(index, title)
     if (index == 0) {
       if (title == '应用场景') {
-        return 'content-right'
+        return 'content-left'
       } else {
         return 'content-left'
       }
     } else {
       if (title == '应用场景') {
-        return 'content-left'
+        return 'content-right'
       } else {
         return 'content-right'
       }
diff --git a/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue b/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue
index 4ba703cb..436aec93 100644
--- a/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessApplicationScenarios.vue
@@ -1,10 +1,10 @@
 <!-- 应用场景-->
 <template>
-  <div class="function-intorduction" v-if="flag">
+  <div class="application-scenarios-and-case" v-if="flag">
     <div class="application-scenarios-and-case-son">
       <!-- {{ dataFrom.attrType }} -->
       <div class="title">
-        <DetalsTitle :title="dataFrom.attrType" type="SCENE"></DetalsTitle>
+        <DetalsTitle :title="dataFrom.attrType" :type="SCENE"></DetalsTitle>
       </div>
       <div class="tab">
         <div
@@ -44,9 +44,9 @@
               v-if="itemSonTitle.img"
             ></a-image>
           </div>
-          <div class="content-right">
-            <div class="content-right-scene">
-              <!-- <div class="content-top">{{ itemSonTitle.name }}</div>-->
+          <div :class="contentLocation(1, dataFrom.attrType)">
+            <div class="content-right-scene" :class="'content-right-case'">
+              <div class="content-top">{{ itemSonTitle.name }}</div>
               <a-tooltip>
                 <template #title>{{ itemSonTitle.desc }}</template>
                 <div class="content-bottom">{{ itemSonTitle.desc }}</div>
@@ -97,11 +97,15 @@
       }
     }
   )
+  const { log } = console
   //滚动条样式
   function tabIndexClass(index, title, content) {
     if (title == '应用场景' && index == 0 && content.length > 6) {
       return 'tab-son-class'
     }
+    if (title == '应用案例' && index == 0 && content.length > 6) {
+      return 'tab-son-class-two'
+    }
   }
   //初始化tab切换（判断标题不同，点击事件的判断变量不同）
   function tabInitialize() {
@@ -112,10 +116,27 @@
     tabindex.value = name
     return tabindex.value
   }
+  //内容位置初始化
+  function contentLocation(index, title) {
+    log(index, title)
+    if (index == 0) {
+      if (title == '应用场景') {
+        return 'content-left'
+      } else {
+        return 'content-left'
+      }
+    } else {
+      if (title == '应用场景') {
+        return 'content-right'
+      } else {
+        return 'content-right'
+      }
+    }
+  }
 </script>
 
 <style lang="less" scoped>
-  .function-intorduction {
+  .application-scenarios-and-case {
     width: 100%;
     background: #f7f8fa;
     display: flex;
@@ -123,63 +144,62 @@
     align-items: center;
     overflow-x: unset;
     .application-scenarios-and-case-son {
-      padding-top: 0.8rem;
-      padding-bottom: 0.8rem;
+      padding-top: 80px;
+      padding-bottom: 80px;
       display: flex;
       flex-direction: column;
       align-items: center;
       overflow: unset;
       .tab {
-        max-width: 13rem;
+        max-width: 1300px;
         overflow-x: auto;
         display: flex;
         justify-content: center;
         color: #808080;
-        border-bottom: 0.01rem #e4e6f5 solid;
-        margin-top: 0.45rem;
-        margin-bottom: 0.4rem;
+        border-bottom: 1px #e4e6f5 solid;
+        margin-top: 45px;
+        margin-bottom: 40px;
         cursor: pointer;
-        padding-left: 0.4rem;
-        padding-right: 0.4rem;
+        padding-left: 40px;
+        padding-right: 40px;
         .tab-son {
           display: flex;
           flex-direction: column;
           align-items: center;
-          text-align: center;
-          margin-right: 1rem;
+          margin-right: 100px;
           .tab-top {
-            min-width: 1.2rem;
-            font-size: 0.24rem;
-            line-height: 0.24rem;
-            margin-bottom: 0.2rem;
-            max-width: 2rem;
-            height: 0.24rem;
+            min-width: 120px;
+            font-size: 24px;
+            line-height: 24px;
+            margin-bottom: 20px;
+            max-width: 200px;
+            height: 24px;
             display: -webkit-box;
             overflow: hidden;
             -webkit-line-clamp: 1;
             -webkit-box-orient: vertical;
           }
           .tab-top-down {
-            min-width: 1.2rem;
+            min-width: 120px;
             color: #526aff;
-            margin-bottom: 0.16rem;
+            margin-bottom: 16px;
           }
           .tab-bottom {
-            height: 0.04rem;
-            width: 0.6rem;
+            height: 4px;
+            width: 60px;
             background: #526aff;
           }
         }
         .tab-son-class {
-          margin-left: 4.3rem;
-          margin-bottom: 0.02rem;
+          margin-left: 430px;
+          margin-bottom: 2px;
         }
         .tab-son-class-two {
-          margin-left: 2.3rem;
-          margin-bottom: 0.02rem;
+          margin-left: 230px;
+          margin-bottom: 2px;
         }
         .tab-son:last-child {
-          margin-right: 0rem;
+          margin-right: 0px;
         }
       }
       .tab::-webkit-scrollbar-thumb {
@@ -189,57 +209,57 @@
         display: flex;
         position: relative;
         width: 100%;
-        min-width: 13rem;
-        height: 3.4rem;
+        min-width: 1300px;
+        height: 340px;
         .content-left {
           position: absolute;
           left: 0;
-          min-width: 6.2rem;
-          :deep(.ant-image-img) {
-            width: 100%;
-            height: 100%;
-            object-fit: contain;
-          }
+          min-width: 620px;
           // text-align: center;
           .content-top {
             text-align: left;
           }
         }
         .content-right {
-          width: 6.2rem;
-          height: 3.4rem;
+          width: 620px;
+          height: 340px;
           position: absolute;
           right: 0;
           display: flex;
           justify-content: center;
+          :deep(.ant-image-img) {
+            width: 100%;
+            height: 100%;
+            object-fit: contain;
+          }
         }
         .content-right-scene,
         .content-right-case {
-          width: 6.2rem;
-          height: 3.4rem;
+          width: 620px;
+          height: 340px;
           display: flex;
           flex-direction: column;
           justify-content: center;
         }
         .content-left-scene,
         .content-left-case {
-          height: 3.4rem;
-          width: 6.35rem;
-          border-radius: 0.1rem;
+          height: 340px;
+          width: 635px;
+          border-radius: 10px;
           background: url('~@/assets/detailsAll/sf_tupianceshi.png') no-repeat;
           background-position: center;
-          background-size: 6.35rem 3.4rem;
+          background-size: 635px 340px;
         }
         .content-top {
-          font-size: 0.22rem;
-          line-height: 0.22rem;
+          font-size: 22px;
+          line-height: 22px;
           color: #000000;
-          margin-bottom: 0.35rem;
+          margin-bottom: 35px;
         }
         .content-bottom {
-          font-size: 0.18rem;
+          font-size: 18px;
           color: #999999;
-          line-height: 0.26rem;
+          line-height: 26px;
           display: -webkit-box;
           overflow: hidden;
           -webkit-line-clamp: 6;
@@ -248,7 +268,7 @@
       }
     }
     .application-scenarios-and-case-son:first-child {
-      padding-top: 1rem;
+      padding-top: 100px;
     }
   }
 </style>
diff --git a/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue b/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue
index 016bb3ee..436aec93 100644
--- a/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue
+++ b/front/src/views/detailsAll/components/Developer/DeveloperApplicationScenarios.vue
@@ -35,7 +35,7 @@
       </div>
       <template v-for="itemSonTitle in dataFrom.attrValue" :key="itemSonTitle">
         <div class="content" v-if="tabindex == itemSonTitle.name">
-          <div class="content-right">
+          <div class="content-left">
             <div class="content-left-scene" v-if="!itemSonTitle.img"></div>
             <a-image
               :width="635"
@@ -121,13 +121,13 @@
     log(index, title)
     if (index == 0) {
       if (title == '应用场景') {
-        return 'content-right'
+        return 'content-left'
       } else {
         return 'content-left'
       }
     } else {
       if (title == '应用场景') {
-        return 'content-left'
+        return 'content-right'
       } else {
         return 'content-right'
       }
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue
index 4ba703cb..436aec93 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceApplicationScenarios.vue
@@ -1,10 +1,10 @@
 <!-- 应用场景-->
 <template>
-  <div class="function-intorduction" v-if="flag">
+  <div class="application-scenarios-and-case" v-if="flag">
     <div class="application-scenarios-and-case-son">
       <!-- {{ dataFrom.attrType }} -->
       <div class="title">
-        <DetalsTitle :title="dataFrom.attrType" type="SCENE"></DetalsTitle>
+        <DetalsTitle :title="dataFrom.attrType" :type="SCENE"></DetalsTitle>
       </div>
       <div class="tab">
         <div
@@ -44,9 +44,9 @@
               v-if="itemSonTitle.img"
             ></a-image>
           </div>
-          <div class="content-right">
-            <div class="content-right-scene">
-              <!-- <div class="content-top">{{ itemSonTitle.name }}</div>-->
+          <div :class="contentLocation(1, dataFrom.attrType)">
+            <div class="content-right-scene" :class="'content-right-case'">
+              <div class="content-top">{{ itemSonTitle.name }}</div>
               <a-tooltip>
                 <template #title>{{ itemSonTitle.desc }}</template>
                 <div class="content-bottom">{{ itemSonTitle.desc }}</div>
@@ -97,11 +97,15 @@
       }
     }
   )
+  const { log } = console
   //滚动条样式
   function tabIndexClass(index, title, content) {
     if (title == '应用场景' && index == 0 && content.length > 6) {
       return 'tab-son-class'
     }
+    if (title == '应用案例' && index == 0 && content.length > 6) {
+      return 'tab-son-class-two'
+    }
   }
   //初始化tab切换（判断标题不同，点击事件的判断变量不同）
   function tabInitialize() {
@@ -112,10 +116,27 @@
     tabindex.value = name
     return tabindex.value
   }
+  //内容位置初始化
+  function contentLocation(index, title) {
+    log(index, title)
+    if (index == 0) {
+      if (title == '应用场景') {
+        return 'content-left'
+      } else {
+        return 'content-left'
+      }
+    } else {
+      if (title == '应用场景') {
+        return 'content-right'
+      } else {
+        return 'content-right'
+      }
+    }
+  }
 </script>
 
 <style lang="less" scoped>
-  .function-intorduction {
+  .application-scenarios-and-case {
     width: 100%;
     background: #f7f8fa;
     display: flex;
@@ -123,63 +144,62 @@
     align-items: center;
     overflow-x: unset;
     .application-scenarios-and-case-son {
-      padding-top: 0.8rem;
-      padding-bottom: 0.8rem;
+      padding-top: 80px;
+      padding-bottom: 80px;
       display: flex;
       flex-direction: column;
       align-items: center;
       overflow: unset;
       .tab {
-        max-width: 13rem;
+        max-width: 1300px;
         overflow-x: auto;
         display: flex;
         justify-content: center;
         color: #808080;
-        border-bottom: 0.01rem #e4e6f5 solid;
-        margin-top: 0.45rem;
-        margin-bottom: 0.4rem;
+        border-bottom: 1px #e4e6f5 solid;
+        margin-top: 45px;
+        margin-bottom: 40px;
         cursor: pointer;
-        padding-left: 0.4rem;
-        padding-right: 0.4rem;
+        padding-left: 40px;
+        padding-right: 40px;
         .tab-son {
           display: flex;
           flex-direction: column;
           align-items: center;
-          text-align: center;
-          margin-right: 1rem;
+          margin-right: 100px;
           .tab-top {
-            min-width: 1.2rem;
-            font-size: 0.24rem;
-            line-height: 0.24rem;
-            margin-bottom: 0.2rem;
-            max-width: 2rem;
-            height: 0.24rem;
+            min-width: 120px;
+            font-size: 24px;
+            line-height: 24px;
+            margin-bottom: 20px;
+            max-width: 200px;
+            height: 24px;
             display: -webkit-box;
             overflow: hidden;
             -webkit-line-clamp: 1;
             -webkit-box-orient: vertical;
           }
           .tab-top-down {
-            min-width: 1.2rem;
+            min-width: 120px;
             color: #526aff;
-            margin-bottom: 0.16rem;
+            margin-bottom: 16px;
           }
           .tab-bottom {
-            height: 0.04rem;
-            width: 0.6rem;
+            height: 4px;
+            width: 60px;
             background: #526aff;
           }
         }
         .tab-son-class {
-          margin-left: 4.3rem;
-          margin-bottom: 0.02rem;
+          margin-left: 430px;
+          margin-bottom: 2px;
         }
         .tab-son-class-two {
-          margin-left: 2.3rem;
-          margin-bottom: 0.02rem;
+          margin-left: 230px;
+          margin-bottom: 2px;
         }
         .tab-son:last-child {
-          margin-right: 0rem;
+          margin-right: 0px;
         }
       }
       .tab::-webkit-scrollbar-thumb {
@@ -189,57 +209,57 @@
         display: flex;
         position: relative;
         width: 100%;
-        min-width: 13rem;
-        height: 3.4rem;
+        min-width: 1300px;
+        height: 340px;
         .content-left {
           position: absolute;
           left: 0;
-          min-width: 6.2rem;
-          :deep(.ant-image-img) {
-            width: 100%;
-            height: 100%;
-            object-fit: contain;
-          }
+          min-width: 620px;
           // text-align: center;
           .content-top {
             text-align: left;
           }
         }
         .content-right {
-          width: 6.2rem;
-          height: 3.4rem;
+          width: 620px;
+          height: 340px;
           position: absolute;
           right: 0;
           display: flex;
           justify-content: center;
+          :deep(.ant-image-img) {
+            width: 100%;
+            height: 100%;
+            object-fit: contain;
+          }
         }
         .content-right-scene,
         .content-right-case {
-          width: 6.2rem;
-          height: 3.4rem;
+          width: 620px;
+          height: 340px;
           display: flex;
           flex-direction: column;
           justify-content: center;
         }
         .content-left-scene,
         .content-left-case {
-          height: 3.4rem;
-          width: 6.35rem;
-          border-radius: 0.1rem;
+          height: 340px;
+          width: 635px;
+          border-radius: 10px;
           background: url('~@/assets/detailsAll/sf_tupianceshi.png') no-repeat;
           background-position: center;
-          background-size: 6.35rem 3.4rem;
+          background-size: 635px 340px;
         }
         .content-top {
-          font-size: 0.22rem;
-          line-height: 0.22rem;
+          font-size: 22px;
+          line-height: 22px;
           color: #000000;
-          margin-bottom: 0.35rem;
+          margin-bottom: 35px;
         }
         .content-bottom {
-          font-size: 0.18rem;
+          font-size: 18px;
           color: #999999;
-          line-height: 0.26rem;
+          line-height: 26px;
           display: -webkit-box;
           overflow: hidden;
           -webkit-line-clamp: 6;
@@ -248,7 +268,7 @@
       }
     }
     .application-scenarios-and-case-son:first-child {
-      padding-top: 1rem;
+      padding-top: 100px;
     }
   }
 </style>

From 1ed9909e47d3ead227c26c87a4cb24a58cf123a7 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Thu, 14 Jul 2022 15:12:47 +0800
Subject: [PATCH 4/6] 570bug

---
 .../Business/BusinessTopDetails.vue           | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
index ca179210..bd29eef3 100644
--- a/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessTopDetails.vue
@@ -232,34 +232,26 @@
       }
 
       .bottom {
-        margin-top: 0.4rem;
+        margin-top: 40px;
         display: flex;
-
         .ant-btn {
-          height: 0.5rem;
-          margin-right: 0.2rem;
-          background: #ffffff;
-          border-radius: 0.06rem;
-          font-size: 0.2rem;
+          height: 50px;
+          margin-right: 20px;
+          background: #ff8b55;
+          border-radius: 6px;
+          font-size: 20px;
           display: flex;
           justify-content: center;
           align-items: center;
         }
-
-        .ant-btn-primary {
-          color: #1890ff;
-        }
-
         .ant-btn:nth-of-type(1) {
-          width: 1.8rem;
+          width: 180px;
         }
-
         .ant-btn:nth-of-type(2) {
-          width: 2.2rem;
+          width: 220px;
         }
-
         .ant-btn:nth-of-type(3) {
-          width: 1.45rem;
+          width: 145px;
           background: #fff;
           color: #526aff;
         }

From 0929b51faf69a15c78f8f35a38f89fef74f6b4a2 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Thu, 14 Jul 2022 15:37:27 +0800
Subject: [PATCH 5/6] 562bug

---
 .../LayerService/LayerServicePreview.vue      | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue
index 8611e43d..df9022ea 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue
@@ -9,12 +9,15 @@
   <div class="application-presentation" v-if="flag">
     <detals-title title="图层预览" type="PREVIEW"></detals-title>
     <div class="main">
-      <iframe
+      <!-- <iframe
         :src="img"
         width="100%"
         height="100%"
         border-radius="0.1rem"
-      ></iframe>
+      ></iframe> -->
+      <div class="iframe-box">
+        <iframe :src="img" width="100%" height="440"></iframe>
+      </div>
     </div>
   </div>
 </template>
@@ -37,7 +40,7 @@
     } else {
       props.dataList.infoList.map((item) => {
         if (item.attrType === '预览服务地址') {
-          img.value = imgindex.attrValue || '--'
+          img.value = item.attrValue.replace(/amp;/g, '') || '--'
         }
       })
     }
@@ -54,7 +57,7 @@
         } else {
           val.infoList.map((item) => {
             if (item.attrType === '预览服务地址') {
-              img.value = imgindex.attrValue || '--'
+              img.value = item.attrValue.replace(/amp;/g, '') || '--'
             }
           })
         }
@@ -64,14 +67,23 @@
 </script>
 <style lang="less" scoped>
   .application-presentation {
-    padding: 0.8rem 3rem 0;
+    padding: 0.8rem 3rem 0.6rem;
     .main {
-      height: 5rem;
-      border-radius: 0.1rem;
+      // border-radius: 0.1rem;
       margin-top: 0.4rem;
-      display: flex;
-      justify-content: center;
-      align-items: center;
+      // display: flex;
+      // justify-content: center;
+      // align-items: center;
+      iframe {
+        border: none;
+      }
+      .iframe-box {
+        width: 100%;
+        height: 440px;
+        margin-top: 10px;
+        display: flex;
+        justify-content: center;
+      }
     }
   }
 </style>

From bd77db0ce40e90888ad3f19f05aa2e711a7fc9f4 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 14 Jul 2022 15:37:55 +0800
Subject: [PATCH 6/6] bug582

---
 back/src/views/modules/sys/log-data-modification-log.vue | 2 +-
 back/src/views/modules/sys/log-operation.vue             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/sys/log-data-modification-log.vue b/back/src/views/modules/sys/log-data-modification-log.vue
index 8f5f7c0c..37079a4d 100644
--- a/back/src/views/modules/sys/log-data-modification-log.vue
+++ b/back/src/views/modules/sys/log-data-modification-log.vue
@@ -322,7 +322,7 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-.blue-font-color:hover {
+.blue-font-color {
   color: #0058e1;
   cursor: pointer;
 }
diff --git a/back/src/views/modules/sys/log-operation.vue b/back/src/views/modules/sys/log-operation.vue
index ba1808bd..d1bf9fab 100644
--- a/back/src/views/modules/sys/log-operation.vue
+++ b/back/src/views/modules/sys/log-operation.vue
@@ -281,7 +281,7 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-.blue-font-color:hover {
+.blue-font-color {
   color: #0058e1;
   cursor: pointer;
 }