Merge branch 'master' of http://git.cc-lotus.info/shuiTou/web

.env.development

@@ -3,4 +3,4 @@ NODE_ENV=production
 # 请求路径
 VITE_REQUEST_BASE='/warter/front/v2/api'
 
-VITE_BASE_URL="shuitou"
+VITE_BASE_URL=""

.env.production

@@ -4,5 +4,5 @@ NODE_ENV=production
 # 请求路径
 VITE_REQUEST_BASE='/warter/front/v2/api'
 
-VITE_BASE_URL="shuitou"
+VITE_BASE_URL=""
 

src/components/windows/menusIndex.vue

@@ -48,7 +48,7 @@ const key = ref('')
 
 const toSearch = () => {
   if (key.value) {
-    window.open(`/${import.meta.env.VITE_BASE_URL}/queryIndex?key=${key.value}`)
+    window.open(`/queryIndex?key=${key.value}`)
   }
 }
 

src/utils/getContent.ts

@@ -0,0 +1,7 @@
+export default (htmlString: string) => { 
+  let parser = new DOMParser()
+  let doc = parser.parseFromString(htmlString, 'text/html');
+  let text = doc.body.textContent || ""
+  text = text.replace(/\s*/g, "");
+  return text;
+}

src/views/win/introduceParts/combriefIndex.vue

@@ -20,7 +20,8 @@
           <!-- <el-col :span="24" class="title">
             {{ info.title }}
           </el-col> -->
-          <el-col :span="24" class="brief" v-html="info.txt"> </el-col>
+          <!-- <el-col :span="24" class="brief" v-html="info.txt"> </el-col> -->
+          <el-col :span="24" class="brief">{{ getContent(info.txt) }} </el-col>
           <el-col :span="24" class="btns">
             <el-button type="primary" size="default" @click="toOpen()">查看详情</el-button>
           </el-col>
@@ -36,6 +37,8 @@ import { ref, onMounted } from 'vue'
 import dividerIndex from '../../../components/windows/dividerIndex.vue'
 import { jtjs } from '@/api/api'
 import { get, head } from 'lodash-es'
+import getContent from '@/utils/getContent'
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const list = ref<any[]>([])
 const active = ref('1')
@@ -90,7 +93,7 @@ const toOpen = () => {
   const channel_id = get(info, 'value.channel_id', get(info, 'id'))
   if (!channel_id) return
   window.open(
-    `/${import.meta.env.VITE_BASE_URL}/introduceDetail?channel_id=${channel_id}&type=gsjs`,
+    `/introduceDetail?channel_id=${channel_id}&type=gsjs`,
   )
 }
 </script>

src/views/win/introduceParts/fengmaoIndex.vue

@@ -44,7 +44,7 @@ const list = ref([
   },
 ])
 const toOpen = (path: string) => {
-  window.open(`/${import.meta.env.VITE_BASE_URL}${path}`)
+  window.open(`${path}`)
 }
 </script>
 <style scoped lang="scss">

src/views/win/inwaterParts/honorIndex.vue

@@ -95,7 +95,7 @@ const list2 = ref([
 
 const toOpen = (data: any) => {
   const path = get(data, 'path')
-  window.open(`/${import.meta.env.VITE_BASE_URL}${path}`)
+  window.open(`${path}`)
 }
 </script>
 <style scoped lang="scss">

src/views/win/messParts/commessIndex.vue

@@ -71,7 +71,7 @@ const list = ref<any[]>([
   },
 ])
 const toOpen = (path: string) => {
-  window.open(`/${import.meta.env.VITE_BASE_URL}${path}`)
+  window.open(`${path}`)
 }
 </script>
 <style scoped lang="scss">

src/views/win/messParts/detail/khfw.vue

@@ -26,9 +26,9 @@ const toOpen = (data: object) => {
   const content_id = get(data, 'content_id')
   const url = get(data, 'url')
   if(content_id) {
-    window.open(`/${import.meta.env.VITE_BASE_URL}/messDetailSec?content_id=${content_id}`)
+    window.open(`/messDetailSec?content_id=${content_id}`)
   } else {
-    window.open(`/${import.meta.env.VITE_BASE_URL}${url}`)
+    window.open(`${url}`)
   }
 }
 </script>

src/views/win/messParts/detail/list.vue

@@ -77,7 +77,7 @@ onMounted(() => {
 })
 const toDetail = (data: any) => {
   const content_id = get(data, 'content_id')
-  window.open(`/${import.meta.env.VITE_BASE_URL}/messDetailSec?content_id=${content_id}`)
+  window.open(`/messDetailSec?content_id=${content_id}`)
 }
 </script>
 <style scoped lang="scss">

src/views/win/messParts/detail/zhfw.vue

@@ -32,9 +32,9 @@ const toOpen = (data: object) => {
   const content_id = get(data, 'content_id')
   const url = get(data, 'url')
   if(content_id) {
-    window.open(`/${import.meta.env.VITE_BASE_URL}/messDetailSec?content_id=${content_id}`)
+    window.open(`/messDetailSec?content_id=${content_id}`)
   } else {
-    window.open(`/${import.meta.env.VITE_BASE_URL}${url}`)
+    window.open(`${url}`)
   }
 }
 </script>

src/views/win/messParts/serviceIndex.vue

@@ -81,7 +81,7 @@ const list = ref<any[]>([
   },
 ])
 const toOpen = (path: string) => {
-  window.open(`/${import.meta.env.VITE_BASE_URL}${path}`)
+  window.open(`${path}`)
 }
 </script>
 <style scoped lang="scss">

src/views/win/newsParts/listIndex.vue

@@ -32,7 +32,9 @@
             <el-col :span="24" class="title">
               {{ item.title }}
             </el-col>
-            <el-col :span="24" class="brief" v-html="item.brief"> </el-col>
+            <!-- <el-col :span="24" class="brief" v-html="item.brief"> </el-col> -->
+            <el-col :span="24" class="brief"> {{ getContent(item.brief) }}</el-col>
+            
           </el-col>
           <el-col :span="6" class="imgs">
             <el-image class="images" :src="item.url || defUrl"></el-image>
@@ -49,6 +51,7 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
 import dayjs from 'dayjs'
+import getContent from '@/utils/getContent'
 
 /* 分页 */
 import pagesIndex from '../../../components/windows/pagesIndex.vue'
@@ -141,7 +144,7 @@ const toSearch = async ({ skip = 0, limit = 10, ...info } = {}) => {
 }
 const toDetail = (data: object) => {
   const content_id = get(data, 'content_id')
-  window.open(`/${import.meta.env.VITE_BASE_URL}/newsDetail?content_id=${content_id}`)
+  window.open(`/newsDetail?content_id=${content_id}`)
 }
 import { useRoute } from 'vue-router'
 const route = useRoute()

src/views/win/popularwillParts/respondIndex.vue

@@ -96,7 +96,7 @@ const toSearch = async ({ skip = 0, limit = 10, ...info } = {}) => {
 }
 const toDetail = (data: object) => {
   const content_id = get(data, 'content_id')
-  window.open(`/${import.meta.env.VITE_BASE_URL}/popularwillDetail?content_id=${content_id}`)
+  window.open(`/popularwillDetail?content_id=${content_id}`)
 }
 </script>
 <style scoped lang="scss">

src/views/win/queryParts/listIndex.vue

@@ -16,7 +16,8 @@
             {{ tf(item.release_date) }}
           </el-col>
         </el-row>
-        <el-row class="list_2" v-html="item.txt"> </el-row>
+        <!-- <el-row class="list_2" v-html="item.txt"> </el-row> -->
+        <el-row class="list_2"> {{ getContent(item.txt) }}</el-row>
       </el-col>
     </el-col>
     <el-col :span="24" class="pages">
@@ -27,6 +28,7 @@
 
 <script setup lang="ts">
 import { ref, onMounted, computed } from 'vue'
+import getContent from '@/utils/getContent'
 /* 分页 */
 import pagesIndex from '../../../components/windows/pagesIndex.vue'
 import { get } from 'lodash-es'
@@ -61,7 +63,7 @@ onMounted(() => {
 })
 const toDetail = (data: any) => {
   const content_id = get(data, 'content_id')
-  window.open(`/${import.meta.env.VITE_BASE_URL}/queryDetail?content_id=${content_id}`)
+  window.open(`/queryDetail?content_id=${content_id}`)
 }
 </script>
 <style scoped lang="scss">

src/views/win/watersupplyParts/listIndex.vue

@@ -176,7 +176,7 @@ onMounted(() => {
 })
 const toDetail = (data: any) => {
   const content_id = get(data, 'content_id')
-  window.open(`/${import.meta.env.VITE_BASE_URL}/watersupplyDetail?content_id=${content_id}`)
+  window.open(`/watersupplyDetail?content_id=${content_id}`)
 }
 </script>
 <style scoped lang="scss">

src/views/winParts/conductingBusiness.vue

@@ -55,7 +55,7 @@ const list = ref([
 ])
 /**打开对应的页面 */
 const toOpen = (path: string) => {
-  window.open(`/${import.meta.env.VITE_BASE_URL}${path}`)
+  window.open(`${path}`)
 }
 </script>
 <style scoped lang="scss">

src/views/winParts/introduceIndex.vue

@@ -50,7 +50,7 @@ const init = async () => {
   }
 }
 const toOpen = () => {
-  window.open(`/${import.meta.env.VITE_BASE_URL}/introduceIndex`)
+  window.open(`/introduceIndex`)
 }
 </script>
 <style scoped lang="scss">

src/views/winParts/newsIndex.vue

@@ -29,7 +29,9 @@
                   <!-- item.ext.title -->
                   <el-col :span="24" class="title textOver">{{ getProp(item, 'title') }}</el-col>
                   <!-- item.txt.txt -->
-                  <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col>
+                  <!-- <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col> -->
+                  <el-col :span="24" class="brief">{{ getContent(getProp(item, 'brief')) }}</el-col>
+
                   <!-- item.ext.release_date -->
                   <el-col :span="24" class="date">{{ getProp(item, 'date') }}</el-col>
                 </el-col>
@@ -54,7 +56,8 @@
                 </el-col>
                 <el-col :span="18" class="mess">
                   <el-col :span="24" class="title textOver">{{ getProp(item, 'title') }}</el-col>
-                  <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col>
+                  <!-- <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col> -->
+                  <el-col :span="24" class="brief">{{ getContent(getProp(item, 'brief')) }}</el-col>
                   <el-col :span="24" class="date">{{ getProp(item, 'date') }}</el-col>
                 </el-col>
               </el-col>
@@ -78,7 +81,8 @@
                 </el-col>
                 <el-col :span="18" class="mess">
                   <el-col :span="24" class="title textOver">{{ getProp(item, 'title') }}</el-col>
-                  <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col>
+                  <!-- <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col> -->
+                  <el-col :span="24" class="brief">{{ getContent(getProp(item, 'brief')) }}</el-col>
                   <el-col :span="24" class="date">{{ getProp(item, 'date') }}</el-col>
                 </el-col>
               </el-col>
@@ -102,7 +106,8 @@
                 </el-col>
                 <el-col :span="18" class="mess">
                   <el-col :span="24" class="title textOver">{{ getProp(item, 'title') }}</el-col>
-                  <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col>
+                  <!-- <el-col :span="24" class="brief" v-html="getProp(item, 'brief')"></el-col> -->
+                  <el-col :span="24" class="brief">{{ getContent(getProp(item, 'brief')) }}</el-col>
                   <el-col :span="24" class="date">{{ getProp(item, 'date') }}</el-col>
                 </el-col>
               </el-col>
@@ -124,7 +129,7 @@ import { index } from '@/api/api'
 import dividerIndex from '../../components/windows/dividerIndex.vue'
 import { get } from 'lodash-es'
 import { tf } from '@/utils/timeFormat'
-
+import getContent from '@/utils/getContent'
 const leftUrl = ref('news1.png')
 
 const activeName = ref('first')
@@ -161,7 +166,6 @@ const zcfgList: any = ref([])
 const zbcgList: any = ref([])
 /**集团要闻 */
 const jtxwList: any = ref([])
-
 /* 选项卡切换，换数据 */
 const handleClick = (tab: TabsPaneContext, event: Event) => {
   console.log(tab, event)
@@ -191,7 +195,7 @@ const getProp = (item: object, path: string) => {
 }
 const toDetail = (data: any) => {
   const content_id = get(data, 'content_id')
-  window.open(`/${import.meta.env.VITE_BASE_URL}/newsDetail?content_id=${content_id}`)
+  window.open(`/newsDetail?content_id=${content_id}`)
 }
 </script>
 <style scoped lang="scss">

src/views/winParts/notesIndex.vue

@@ -107,7 +107,7 @@ const toChange = (event: { id: string }) => {
       })
     } else {
       // 新开页面
-      window.open(`/${import.meta.env.VITE_BASE_URL}${to}`)
+      window.open(`${to}`)
     }
   }
 }

vite.config.ts

@@ -8,9 +8,7 @@ import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
 
 // https://vite.dev/config/
 export default defineConfig(({ command, mode }) => {
-  console.log(command, mode)
   const env = loadEnv(mode, process.cwd(), '')
-  console.log(env.NODE_ENV)
   return {
     /* 共享 */
     // 根目录
@@ -64,7 +62,8 @@ export default defineConfig(({ command, mode }) => {
     },
     /* 构建选项 */
     build: {
-      outDir: env.VITE_BASE_URL
+      outDir: 'shuitou'
+      //env.VITE_BASE_URL
       // 最终捆绑包的浏览器兼容性目标。默认值是 Vite 特殊值
       // target:'',
       // 预加载