From d4db10d5ca024dc8b72f5cef9f2d8a5947af2fe5 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Wed, 12 Jun 2024 16:16:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=8E=B0=E5=9C=BA=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PreviewFile/index.vue          |  9 ++++--
 .../panorama/components/details/evaluate.vue  | 29 ++++++++++++++-----
 .../panorama/components/details/point.vue     |  8 +++--
 .../panorama/components/details/stand.vue     | 20 ++++++++++---
 .../components/details/temporaryState.vue     |  6 ++--
 .../panorama/components/details/terminal.vue  |  8 +++--
 .../panorama/components/mapL.vue              | 20 +++++++++++--
 .../panorama/components/mapR.vue              |  4 +--
 .../components/undocumented/detail.vue        |  2 +-
 src/views/user/login.vue                      |  4 +--
 vite.config.ts                                | 20 +++++++++----
 11 files changed, 96 insertions(+), 34 deletions(-)

diff --git a/src/components/PreviewFile/index.vue b/src/components/PreviewFile/index.vue
index 00a1ce12..415b180b 100644
--- a/src/components/PreviewFile/index.vue
+++ b/src/components/PreviewFile/index.vue
@@ -3,7 +3,10 @@
         <vue-office-docx v-if="url.includes('.doc') || url.includes('.docx')" :src="url" />
         <vue-office-excel v-if="url.includes('.xls') || url.includes('.xlsx')" :src="url" />
         <vue-office-pdf v-if="url.includes('.pdf')" :src="url" />
-        <img v-if="url.includes('.png') || url.includes('.jpg') || url.includes('.gif')" :src="url" />
+        <img
+            v-if="url.includes('.png') || url.includes('.jpg') || url.includes('.gif') || url.includes('.bmp')"
+            :src="url"
+        />
     </div>
 </template>
 <script lang="ts" setup>
@@ -17,7 +20,9 @@ import VueOfficeExcel from '@vue-office/excel'
 //引入VueOfficePdf组件
 import VueOfficePdf from '@vue-office/pdf'
 const { push, options, currentRoute } = useRouter()
-const url = 'http://192.168.1.22:9009/excelreport/supervision/' + currentRoute.value.href?.split('?')[1]
+// const url = 'http://192.168.1.22:9009/excelreport/supervision/' + currentRoute.value.href?.split('?')[1]
+
+const url = '/api-docx/excelreport/supervision/' + currentRoute.value.href?.split('?')[1]
 onMounted(() => {
     console.log()
 })
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
index f41afb91..87cf51d9 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
@@ -16,9 +16,7 @@
                                     ? 'background3'
                                     : ''
                             " -->
-                        <span
-                          
-                        >
+                        <span>
                             {{ scope.row.assessData }}
                         </span>
                     </template>
@@ -124,15 +122,26 @@
             </vxe-table>
         </div>
         <div style="height: 300px; margin-top: 10px; position: relative" v-loading="loading">
-            <el-select
+            <!-- <el-select
                 v-model="time"
                 size="small"
-                style="width: 50px; position: absolute; top: 20px; right: 20px; z-index: 1"
+               
                 @change="analysis"
             >
                 <el-option label="年" value="1" />
                 <el-option label="月" value="3" />
-            </el-select>
+            </el-select> -->
+            <div style="position: absolute; width: 100px; top: 0px; right: 10px; z-index: 1">
+                <el-radio-group v-model="city" size="small" >
+                    <el-radio-button label="1">省</el-radio-button>
+                    <el-radio-button label="2">地市</el-radio-button>
+                </el-radio-group>
+                <el-radio-group v-model="time" size="small" @change="analysis">
+                    <el-radio-button label="1">年</el-radio-button>
+                    <el-radio-button label="3">月</el-radio-button>
+                </el-radio-group>
+            </div>
+
             <MyEChart style="height: 300px" :options="picEChart" />
         </div>
     </el-dialog>
@@ -145,6 +154,7 @@ import { getAssessDetail, getAssessTrend } from '@/api/device-boot/panorama'
 const dialogVisible: any = ref(false)
 const rowList: any = ref({})
 const time = ref('1')
+const city = ref('1')
 const loading = ref(false)
 const tableData: any = ref([])
 
@@ -165,6 +175,10 @@ const analysis = (e: any) => {
             title: {
                 text: '各地市综合评估趋势对比'
             },
+            legend: {
+                right: 120,
+                top: 20
+            },
             // tooltip: {
             //     formatter: function (params: any) {
             //         // console.log(123, params)
@@ -215,7 +229,8 @@ const analysis = (e: any) => {
             },
 
             grid: {
-                bottom: '10px'
+                bottom: '10px',
+                top: '60px',
             },
 
             yAxis: {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/point.vue b/src/views/pqs/qualityInspeection/panorama/components/details/point.vue
index b1f6e41c..faa14357 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/point.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/point.vue
@@ -5,10 +5,14 @@
             <el-col :span="12">
                 <div class="title">
                     <span>趋势分析</span>
-                    <el-select v-model="time" style="width: 80px; margin-right: 80px" @change="analysis">
+                    <!-- <el-select v-model="time" style="width: 80px; margin-right: 80px" @change="analysis">
                         <el-option label="年" value="1" />
                         <el-option label="月" value="3" />
-                    </el-select>
+                    </el-select> -->
+                    <el-radio-group v-model="time" style="margin-right: 50px" @change="analysis" size="small">
+                        <el-radio-button label="1">年</el-radio-button>
+                        <el-radio-button label="3">月</el-radio-button>
+                    </el-radio-group>
                 </div>
                 <MyEChart style="height: 260px" :options="trendEChart" />
             </el-col>
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
index 2785b779..44568879 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/stand.vue
@@ -5,10 +5,14 @@
             <el-col :span="12">
                 <div class="title">
                     <span>趋势分析</span>
-                    <el-select v-model="time" style="width: 80px; margin-right: 80px" @change="analysis">
+                    <!-- <el-select v-model="time" style="width: 80px; margin-right: 80px" @change="analysis">
                         <el-option label="年" value="1" />
                         <el-option label="月" value="3" />
-                    </el-select>
+                    </el-select> -->
+                    <el-radio-group v-model="time" style="margin-right: 50px" @change="analysis" size="small">
+                        <el-radio-button label="1">年</el-radio-button>
+                        <el-radio-button label="3">月</el-radio-button>
+                    </el-radio-group>
                 </div>
                 <MyEChart style="height: 260px" :options="trendEChart" />
             </el-col>
@@ -33,9 +37,17 @@
                             </div>
                         </el-popover>
                     </span>
-                    <el-select v-model="contaminate" style="width: 120px; margin-right: 80px" @change="contaminateC">
+                    <!-- <el-select v-model="contaminate" style="width: 120px; margin-right: 80px" @change="contaminateC">
                         <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
+                    </el-select> -->
+                    <el-radio-group
+                        v-model="contaminate"
+                        style="margin-right: 50px"
+                        @change="contaminateC"
+                        size="small"
+                    >
+                        <el-radio-button v-for="item in options" :label="item.id">{{ item.name }}</el-radio-button>
+                    </el-radio-group>
                 </div>
 
                 <div class="pie">
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue b/src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue
index f903c9d4..e278b323 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/temporaryState.vue
@@ -10,9 +10,9 @@
                 <vxe-column sortable field="interruptTimes" title="短时中断次数" />
 
                 <vxe-colgroup title="暂态严重度占比">
-                    <vxe-column sortable field="rate20" title="SARFI-90" />
-                    <vxe-column sortable field="rate20" title="SARFI-50" />
-                    <vxe-column sortable field="rate90" title="SARFI-20" />
+                    <vxe-column sortable field="rate90" title="SARFI-90" />
+                    <vxe-column sortable field="rate50" title="SARFI-50" />
+                    <vxe-column sortable field="rate20" title="SARFI-20" />
                 </vxe-colgroup>
             </vxe-table>
         </div>
diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue b/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
index 6f25daed..73a1e783 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/terminal.vue
@@ -5,10 +5,14 @@
             <el-col :span="12">
                 <div class="title">
                     <span>趋势分析</span>
-                    <el-select v-model="time" style="width: 80px; margin-right: 80px" @change="analysis">
+                    <!-- <el-select v-model="time" style="width: 80px; margin-right: 80px" @change="analysis">
                         <el-option label="年" value="1" />
                         <el-option label="月" value="3" />
-                    </el-select>
+                    </el-select> -->
+                    <el-radio-group v-model="time" style="margin-right: 50px" @change="analysis" size="small">
+                        <el-radio-button label="1">年</el-radio-button>
+                        <el-radio-button label="3">月</el-radio-button>
+                    </el-radio-group>
                 </div>
                 <MyEChart style="height: 260px" :options="trendEChart" />
             </el-col>
diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue
index 8c3489d6..ceb30c72 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/mapL.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/mapL.vue
@@ -52,7 +52,12 @@
                         <p class="numOne" @click="LookMap(item.list[3].numOneList, item.list[3].numTwoList, 0)">
                             {{ item.list[3].numOne }}
                         </p>
-                        <p style="font-size: 12px; width: 32px; cursor: pointer;color: var(--el-color-primary);" @click.stop="open(i)">详情</p>
+                        <p
+                            style="font-size: 12px; width: 32px; cursor: pointer; color: var(--el-color-primary)"
+                            @click.stop="open(i)"
+                        >
+                            详情
+                        </p>
                     </div>
                 </div>
             </div>
@@ -70,7 +75,11 @@
                             <img src="@/assets/img/TJ.png" />
                             {{ item.title }}
                         </div>
-                        <div class="card-Box" :style="`height:calc((${boxHeight.height} - 50px )/ 3);`"  v-for="val in item.children">
+                        <div
+                            class="card-Box"
+                            :style="`height:calc((${boxHeight.height} - 50px )/ 3);`"
+                            v-for="val in item.children"
+                        >
                             <div>
                                 <span class="line"></span>
                                 <span class="vol">{{ val.title }}</span>
@@ -427,7 +436,9 @@ defineExpose({ info, show })
 }
 .vcl {
     display: flex;
-    border-bottom: 1px solid #e6e0e0;
+    border-bottom: 2px solid #fff;
+    background-color: #edededc0;
+    border-radius: 5px;
     font-size: 14px;
     p {
         text-align: center;
@@ -439,6 +450,9 @@ defineExpose({ info, show })
         font-weight: 550;
         cursor: pointer;
     }
+    &:nth-child(1) {
+        background-color: #fff;
+    }
 }
 
 .title {
diff --git a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
index 7be6d18f..ba8cfaa1 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/mapR.vue
@@ -147,9 +147,9 @@
                             </div>
                             <div class="ml22" style="font-size: 12px">
                                 <span>
-                                    幅值低于90%:
+                                    SARFI-90:
                                     <span class="num">{{ transientNum[0] }} 　</span>
-                                    幅值低于50%:
+                                    SARFI-50:
                                     <span class="num">{{ transientNum[1] }}</span>
                                 </span>
                             </div>
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
index 8b3dc7cc..bd3bd020 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue
@@ -52,7 +52,7 @@
             <el-descriptions-item label="预测评估单位">
                 {{ detailData.evaluationDept }}
             </el-descriptions-item>
-            <el-descriptions-item label="预测评估结论">
+            <el-descriptions-item label="预测评估结论"  :span="2">
                 {{ detailData.evaluationConclusion }}
             </el-descriptions-item>
             <el-descriptions-item
diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index f6fc00df..04fb44ec 100644
--- a/src/views/user/login.vue
+++ b/src/views/user/login.vue
@@ -54,13 +54,13 @@
                 </el-form-item>
             </el-form>
         </div>
-        <div class="copy-right">
+        <!-- <div class="copy-right">
             <span>版权所有 @ 南京灿能电力自动化股份有限公司</span>
             <br />
             <img style="width: 20px; height: 20px; position: absolute" src="@/assets/login/jhui.png" />
 
             <span>　　苏公网安备 32011502011902号</span>
-        </div>
+        </div> -->
         <PopupUpdatePwd ref="popupUpdatePwdRef"></PopupUpdatePwd>
     </div>
 </template>
diff --git a/vite.config.ts b/vite.config.ts
index 57473793..d2f917b0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -9,11 +9,14 @@ import path from 'path'
 const nodeResolve = (dir: string): any => path.resolve(__dirname, '.', dir)
 // https://vitejs.dev/config/
 export default defineConfig({
-    plugins: [vue(), svgBuilder('./src/assets/icons/'), vueJsx(),
+    plugins: [
+        vue(),
+        svgBuilder('./src/assets/icons/'),
+        vueJsx(),
         AutoImport({
             //自动引入
-            imports: ["vue", "vue-router","pinia"],
-        }),
+            imports: ['vue', 'vue-router', 'pinia']
+        })
     ],
     server: {
         host: '0.0.0.0',
@@ -21,12 +24,17 @@ export default defineConfig({
         proxy: {
             '/api': {
                 // target: 'http://10.95.53.49:10215', //海南服务器ip
-                target: 'http://192.168.1.125:10215', //hsw
-                // target: 'http://192.168.1.81:10215', //数据中心
-                // target: 'http://192.168.1.130:10215',
+                target: 'http://10.118.135.128:10215', ///hsw
+                //  target: 'http://10.119.65.152:10215', //数据中心
                 changeOrigin: true,
                 rewrite: path => path.replace(/^\/api/, '') //路径重写，把'/api'替换为''
             },
+            '/api-docx': {
+                // 文件服务器地址
+                target: 'http://10.118.135.128:9009', 
+                changeOrigin: true,
+                rewrite: path => path.replace(/^\/api-docx/, '')
+            },
             '/map': {
                 // target: 'http://10.95.53.49:8088', //海南服务器ip
                 target: 'http://192.168.1.125:8088', //hsw