From d6fde5d5047496b087f7675b7494886a410e5ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=B7=E5=86=89=E5=86=89?= <kangranran@dingxuantech.cn>
Date: Tue, 18 Nov 2025 18:24:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E7=9C=8B=E6=9D=BF=E3=80=81?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=81=E6=9C=8D=E5=8A=A1=E5=99=A8=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E6=B7=BB=E5=8A=A0=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、监控看板_前端开发并联调
2、脚本管理页面_前端开发并联调
3、服务器脚本模块执行结果查看_前端开发并联调
---
 src/api/disRevenue/resource.js                |   8 ++
 src/components/echartsList/line.vue           |   7 +-
 src/components/table/index.vue                |  79 ++++++-----
 src/router/index.js                           |  15 +++
 .../businessScript/businessScript.vue         |   7 +-
 .../earnManage/businessScript/details.vue     |   1 +
 .../resource/monitorBoard/monitorBoard.vue    |  24 +++-
 .../monitorBoard/monitorBoardView.vue         | 126 ++++++++++++------
 src/views/resource/serverRegister/handle.vue  |   3 +-
 .../resource/serverScriptStrat/details.vue    |   2 +-
 .../resource/serverScriptStrat/resultView.vue |  70 ++++++++++
 .../serverScriptStrat/serverScriptStrat.vue   |  23 +++-
 12 files changed, 274 insertions(+), 91 deletions(-)
 create mode 100644 src/views/resource/serverScriptStrat/resultView.vue

diff --git a/src/api/disRevenue/resource.js b/src/api/disRevenue/resource.js
index c149699..5ba013b 100644
--- a/src/api/disRevenue/resource.js
+++ b/src/api/disRevenue/resource.js
@@ -362,6 +362,14 @@ export function getScriptResultBySn(data) {
     data: data
   })
 }
+// 执行结果详情列表
+export function getScriptResultList(data) {
+  return request({
+    url: '/rocketmq/remote/getScriptResultByScriptId',
+    method: 'post',
+    data: data
+  })
+}
 //  获取资源分组列表
 export function getResGroupList() {
   return request({
diff --git a/src/components/echartsList/line.vue b/src/components/echartsList/line.vue
index ff1f2d3..01f61d3 100644
--- a/src/components/echartsList/line.vue
+++ b/src/components/echartsList/line.vue
@@ -87,7 +87,8 @@
       },
       methods: {
         getList(title, dataXY) {
-          const lineDataListIntance = echarts.init(document.getElementById('lineChart' + this.num));
+          let that = this;
+          const lineDataListIntance = echarts.init(document.getElementById('lineChart' + that.num));
           let titleList = [{text: title, x: '50%', y: '3%', textAlign: 'center',textStyle: {fontSize: 16}}];
           if (dataXY && dataXY.titleSubtext) {
             titleList.push(dataXY.titleSubtext);
@@ -203,6 +204,10 @@
               this.positionYAxisSelector(lineDataListIntance);
             }
           });
+          lineDataListIntance.off('click');
+          lineDataListIntance.on("click", function(params) {
+            that.$emit("chartClickModel", {params: params});
+          });
         },
         positionYAxisSelector(chartInstance) {
           const selector = document.querySelector('.yaxis-selector' + this.num);
diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 65e2878..00ca598 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -25,7 +25,26 @@
               </template>
             </el-table-column>
             <template v-for="(column, key, index) of columns">
-                <el-table-column v-if="column && column.visible" :label="column.label" :key="key" :prop="key" :width="column.width" :min-width="column.minWidth || '100px'" align="left">
+                <!--      customTooltip:true 走  自定义tooltip 展示    -->
+                <template v-if="column.customTooltip">
+                  <el-table-column v-if="column && column.visible" :label="column.label" :key="key" :prop="key" :width="column.width" :min-width="column.minWidth || '100px'" align="left">
+                    <template #default="scope">
+                      <el-tooltip
+                        :disabled="!isCellOverflow(scope.row[key], `cell-${key}-${scope.row.id}`)"
+                        placement="top"
+                        effect="dark"
+                        popper-class="my-custom-tooltip">
+                        <div slot="content" v-html="formatCellContent(scope.row[key])"></div>
+                        <div :ref="`cell-${key}-${scope.row.id}`" class="cell-content">
+                          {{ scope.row[key] }}
+                        </div>
+                      </el-tooltip>
+                    </template>
+                  </el-table-column>
+                </template>
+              <!--        原tooltip展示逻辑     -->
+              <template v-else>
+                <el-table-column v-if="column && column.visible" :label="column.label" :key="key" :prop="key" :width="column.width" :min-width="column.minWidth || '100px'" align="left" :show-overflow-tooltip="true">
                   <!--  插槽 自定义列表表头数据格式  -->
                   <template #header v-if="column && column.slotHeaderName">
                     <span>{{column.label}}</span>
@@ -34,41 +53,20 @@
                       <i class="el-icon-question"></i>
                     </el-tooltip>
                   </template>
-                  <!-- 单元格内容：自定义tooltip支持换行 -->
-                  <template #default="scope">
-                    <!-- 1. 有自定义插槽时，插槽内容仍用原逻辑，但包裹tooltip -->
-                    <template v-if="column && column.slotName">
-                     <el-tooltip
-                        :disabled="!isCellOverflow(scope.row[key], `cell-${key}-${scope.row.id}`)"
-                        placement="top"
-                        effect="dark">
-                        <div slot="content" v-html="formatCellContent(scope.row[key])"></div>
-                        <div :ref="`cell-${key}-${scope.row.id}`" class="cell-content">
-                          <slot
-                            :name="column.slotName"
-                            :valueKey="key"
-                            :row="scope.row"
-                            :rowIndex="scope.$index"
-                            :column="column"
-                            :scope="scope"
-                          ></slot>
-                        </div>
-                      </el-tooltip>
-                    </template>
-                    <!-- 2. 无自定义插槽时，直接渲染内容+tooltip -->
-                    <template v-else>
-                      <el-tooltip
-                        :disabled="!isCellOverflow(scope.row[key], `cell-${key}-${scope.row.id}`)"
-                        placement="top"
-                        effect="dark">
-                        <div slot="content" v-html="formatCellContent(scope.row[key])"></div>
-                        <div :ref="`cell-${key}-${scope.row.id}`" class="cell-content">
-                          {{ scope.row[key] }}
-                        </div>
-                      </el-tooltip>
-                    </template>
+                  <!--  插槽 自定义列表内数据格式  -->
+                  <template #default="scope" v-if="column && column.slotName">
+                    <!-- 传递行数据、行索引等信息到父组件的插槽 -->
+                    <slot
+                      :name="column.slotName"
+                      :valueKey="key"
+                      :row="scope.row"
+                      :rowIndex="scope.$index"
+                      :column="column"
+                      :scope="scope"
+                    ></slot>
                   </template>
                 </el-table-column>
+              </template>
             </template>
             <!--  表格行内按钮   -->
             <el-table-column v-if="config && config.tableButton && config.tableButton.line" :width="calculateOperationColumnWidth(config.tableButton.line, tableList)" label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
@@ -217,6 +215,9 @@
               maxTotalWidth = currentLineWidth;
             }
           });
+          if (maxTotalWidth === 0) {
+            maxTotalWidth = 20;
+          }
           // 加上单元格内边距
           return Math.max(maxTotalWidth + 40); // 最小宽度120px
         },
@@ -369,7 +370,6 @@
           this.selectList = [];
           this.ids = [];
           if (tableInstance) {
-            console.log('rows===',rows);
             if (rows && rows.length > 0) {
               rows.forEach(row => {
                 tableInstance.toggleRowSelection(row, true);
@@ -439,3 +439,12 @@
     line-height: 1.6; /* 调整行高，提升可读性 */
   }
 </style>
+<style>
+  .my-custom-tooltip {
+    box-sizing: border-box !important;
+    max-height: 500px !important; /* 设置最大高度 */
+    overflow-y: auto !important; /* 内容超出时显示垂直滚动条 */
+    line-height: 1.5 !important; /* 设置行高，提升可读性 */
+    padding: 8px 12px !important; /* 设置内边距 */
+  }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 0c8241b..1ae910e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -556,6 +556,21 @@ export const dynamicRoutes = [
       }
     ]
   },
+  //  服务器脚本策略--执行结果查看
+  {
+    path: '/resource/serverScriptStrat/resultView',
+    component: Layout,
+    hidden: true,
+    permissions: ['resource:serverScriptStrat:resultView'],
+    children: [
+      {
+        path: ':id?',
+        component: () => import('@/views/resource/serverScriptStrat/resultView'),
+        name: 'serverScriptStatResultView',
+        meta: { title: '执行结果详情', activeMenu: '/resource/serverScriptStrat' }
+      }
+    ]
+  },
 //  监控模版
   {
     path: '/resource/monitorTemp/details',
diff --git a/src/views/earnManage/businessScript/businessScript.vue b/src/views/earnManage/businessScript/businessScript.vue
index 7e74db7..1529f36 100644
--- a/src/views/earnManage/businessScript/businessScript.vue
+++ b/src/views/earnManage/businessScript/businessScript.vue
@@ -41,9 +41,10 @@
         // 列显隐信息
         columns: {
           id: {label: 'ID', width: '50'},
-          scriptName: { label: `脚本名称`, visible: true},
-          scriptPath: { label: `脚本文件地址`, visible: true},
-          defaultParams: { label: `脚本默认参数`, visible: true},
+          scriptName: { label: `脚本名称`, minWidth: '120', visible: true},
+          scriptPath: { label: `脚本文件地址`, minWidth: '150', visible: true},
+          defaultParams: { label: `脚本默认参数`, minWidth: '120', visible: true},
+          failedKeywords: { label: `结果失败判断关键字`, minWidth: '120', visible: true},
         },
         config: {
           searcherForm: [
diff --git a/src/views/earnManage/businessScript/details.vue b/src/views/earnManage/businessScript/details.vue
index 4f9f486..fa959aa 100644
--- a/src/views/earnManage/businessScript/details.vue
+++ b/src/views/earnManage/businessScript/details.vue
@@ -44,6 +44,7 @@
             scriptName: {label: '脚本名称', span: 12, type: 'input', required: true},
             scriptPath: {label: '脚本文件地址', span: 12, type: 'input', required: true},
             defaultParams: {label: '脚本默认参数', span: 12, type: 'input'},
+            failedKeywords: {label: '结果失败判断关键字', span: 12, type: 'input'},
             createBy: {label: '创建人', span: 12, type: 'input', hidden: !(this.paramsData && this.paramsData.readonly)},
             createTime: {label: '创建时间', span: 12, type: 'datetime', hidden: !(this.paramsData && this.paramsData.readonly)},
             updateTime: {label: '修改时间', span: 12, type: 'datetime', hidden: !(this.paramsData && this.paramsData.readonly)},
diff --git a/src/views/resource/monitorBoard/monitorBoard.vue b/src/views/resource/monitorBoard/monitorBoard.vue
index da3f0eb..4d04712 100644
--- a/src/views/resource/monitorBoard/monitorBoard.vue
+++ b/src/views/resource/monitorBoard/monitorBoard.vue
@@ -13,7 +13,7 @@
             end-placeholder="结束日期时间"
             @change="dateChange">
           </el-date-picker>
-          <el-select v-model="timeModel" placeholder="请选择" style="width: 100px;margin-right: 10px;">
+          <el-select v-model="timeModel" placeholder="请选择" style="width: 100px;margin-right: 10px;" @change="fnTimeInter">
             <el-option
               v-for="item in timeModelOptions"
               :key="item.value"
@@ -72,6 +72,7 @@
           currTimeList: {},
           datetimeModel: [],
           timeModel: '30000',
+          timeInterModel: null,
           open: false,
           timeModelOptions: [
             {value: '30000', label: '30s刷新'},
@@ -107,12 +108,12 @@
       endData = `${year}-${month}-${day} 23:59:59`;
       this.currTimeList = {startTime: startData, endTime: endData};
       this.datetimeModel = [startData, endData];
-      // 循环定时查询
-      // setInterval(() => {
-      //   console.log('vvv====',Number(this.timeModel));
-      // }, Number(this.timeModel));
       this.fnChartView({});
     },
+    beforeDestroy() {
+      clearInterval(this.timeInterModel);
+      this.timeInterModel = null;
+    },
     methods: {
       // 查询流量图
       fnChartView(unitVal,keyName) {
@@ -142,6 +143,11 @@
               };
             }
           }
+          // 循环定时查询
+          this.fnTimeInter(this.timeModel);
+        }).catch(() => {
+          // 循环定时查询
+          this.fnTimeInter(this.timeModel);
         });
       },
       // 时间选择器
@@ -149,6 +155,14 @@
         this.currTimeList = {startTime: this.datetimeModel[0], endTime: this.datetimeModel[1]};
         this.fnChartView({});
       },
+      // 定时刷新下拉
+      fnTimeInter(val) {
+        clearInterval(this.timeInterModel);
+        this.timeInterModel = null;
+        this.timeInterModel = setInterval(() => {
+          this.fnChartView();
+        }, Number(val));
+      },
       addMonitor() {
         this.open = true;
         // 使用$nextTick确保DOM更新完成后再初始化子组件
diff --git a/src/views/resource/monitorBoard/monitorBoardView.vue b/src/views/resource/monitorBoard/monitorBoardView.vue
index e9b2bbe..41c40ff 100644
--- a/src/views/resource/monitorBoard/monitorBoardView.vue
+++ b/src/views/resource/monitorBoard/monitorBoardView.vue
@@ -26,7 +26,7 @@
           end-placeholder="结束日期时间"
           @change="dateChange">
         </el-date-picker>
-        <el-select v-model="timeModel" placeholder="请选择" style="width: 100px;margin-right: 10px;">
+        <el-select v-model="timeModel" placeholder="请选择" style="width: 100px;margin-right: 10px;" @change="fnTimeInter">
           <el-option
             v-for="item in timeModelOptions"
             :key="item.value"
@@ -40,11 +40,17 @@
     <div style="height: calc(100% - 60px);" class="w100">
       <div v-for="(chartItem, key, index) of lineDataParams" class="h40 w100" style="min-height: 300px;">
         <div class="w100 h100" style="border: 1px solid #e8e8e8;">
-          <EchartsLine :lineData="chartItem || {}" :title="chartItem && chartItem.title || ''"  class="w100 h100" :chartData="(valData, unit) => chartDataEvent(valData, unit)"></EchartsLine>
+          <EchartsLine :lineData="chartItem || {}" :title="chartItem && chartItem.title || ''" class="w100 h100" @chartClickModel="chartClickModel" :chartData="(valData, unit) => chartDataEvent(valData, unit)"></EchartsLine>
         </div>
       </div>
+      <div class="w100 mt20" v-if="reserveForm && reserveForm.resourceType !== '3'">
+        <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList">
+          <template #tempDay="{ valueKey, row, column }">
+            <span v-if="row && row[valueKey] || row[valueKey] === 0">{{row[valueKey]}}/{{row.createTime}}</span>
+          </template>
+        </TableList>
+      </div>
     </div>
-<!--    <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="roleList" @fnClick="callback" @fnRenderList="getList"></TableList>-->
     <!--    弹窗  -->
     <el-dialog title="添加配置" :visible.sync="open" width="800px" append-to-body>
       <dialogMonitor :formModel="formModel" @dialogResult="fnDialogResult"></dialogMonitor>
@@ -69,6 +75,7 @@
         reserveForm: {},
         datetimeModel: [],
         timeModel: '30000',
+        timeInterModel: null,
         open: false,
         timeModelOptions: [
           {value: '30000', label: '30s刷新'},
@@ -93,19 +100,8 @@
         lineDataParams: {},
         btnList: [{title: '详情', value: 'view'}, {title: '修改', value: 'edit'}, {title: '删除', value: 'del'}],
         // 列显隐信息
-        columns: {
-          id: { label: `ID`,width: '50'},
-          clientId: { label: `ClientID`, visible: true, minWidth: '120'},
-          businessName: {label: `业务名称`, minWidth: '150', visible: true},
-          bandwidth95Daily: {label: `95带宽值/日(Mbit)`, minWidth: '150', slotName: 'tempDay',visible: true},
-        },
-        config: {
-          tableButton: {
-            line: [
-              {content: '详情', fnCode: 'details', type: 'text', icon: 'el-icon-view', hasPermi: 'resource:monitorBoardView:details'},
-            ]
-          }
-        },
+        columns: {},
+        config: {},
         roleList: [],
         queryParams: {
           pageNum: 1,
@@ -128,31 +124,16 @@
       this.currTimeList = {startTime: startData, endTime: endData};
       this.datetimeModel = [startData, endData];
       this.lineDataParams['one'] = this.echartData;
-      // 循环定时查询
-      // setInterval(() => {
-      //   console.log('vvv====',Number(this.timeModel));
-      // }, Number(this.timeModel));
       this.fnConfigName();
       if (this.configModel) {
         this.fnChartView();
       }
     },
+    beforeDestroy() {
+      clearInterval(this.timeInterModel);
+      this.timeInterModel = null;
+    },
     methods: {
-      getList() {
-        if (this.reserveForm.resourceType === '1') {
-          getBandWidthList(this.queryParams).then(response => {
-            this.roleList = response.rows;
-            this.queryParams.total = response.total;
-            this.loading = false;
-          });
-        } else if (this.reserveForm.resourceType === '2') {
-          getSwitchInfoList(this.queryParams).then(response => {
-            this.roleList = response.rows;
-            this.queryParams.total = response.total;
-            this.loading = false;
-          })
-        }
-      },
       // 查询流量图
       fnChartView(unitData) {
         this.lineDataParams = {};
@@ -161,7 +142,11 @@
           res && res.data.forEach(item => {
             let chart = JSON.parse(JSON.stringify(this.echartData));
             let modelVal = item && item.rmMonitorConfig || {id: 'one', configName: 'one'};
+            modelVal['deployDevice'] = item && item.yData  && item.yData.deployDevice || [];
             this.reserveForm = modelVal;
+            this.columns = {};
+            this.config = {};
+            this.tableShowModel(modelVal);
             dataList[modelVal && modelVal.configName + '_' + modelVal.id] = {};
             if (item && item.unit) {
               chart.unitModel = item.unit;
@@ -177,8 +162,41 @@
           } else {
             this.lineDataParams['one'] = this.echartData;
           }
+          // 循环定时查询
+          this.fnTimeInter(this.timeModel);
+        }).catch(() => {
+          // 循环定时查询
+          this.fnTimeInter(this.timeModel);
         });
       },
+      // 列表数据展示
+      tableShowModel(modelVal){
+        if (modelVal && modelVal.resourceType && modelVal.resourceType !== '3') {
+          if (modelVal && modelVal.resourceType && modelVal.resourceType === '1') {
+            this.config = {
+              colTopHiddenIcon: true,
+              tableButton: {
+                line: [
+                  {content: '详情', fnCode: 'details', type: 'text', icon: 'el-icon-view', hasPermi: 'resource:monitorBoardView:details'},
+                ]
+              }
+            };
+          } else if (modelVal && modelVal.resourceType && modelVal.resourceType === '2') {
+            this.config = {colTopHiddenIcon: true};
+          }
+          this.columns = {
+            id: { label: `ID`,width: '50'},
+            clientId: { label: `ClientID`, minWidth: '120', visible: modelVal && modelVal.resourceType === '1' ? true : false},
+            businessName: {label: `业务名称`, minWidth: '150', visible: modelVal && modelVal.resourceType === '1' ? true : false},
+            bandwidth95Daily: {label: `95带宽值/日(Mbit)`, minWidth: '150', slotName: 'tempDay', visible: modelVal && modelVal.resourceType === '1' ? true : false},
+            switchName: {label: `交换机名称`, minWidth: '150', visible: modelVal && modelVal.resourceType === '2' ? true : false},
+            name: {label: `端口名称`, minWidth: '150', visible: modelVal && modelVal.resourceType === '2' ? true : false},
+            inSpeed: {label: `接收速率值(bits/s)`, minWidth: '150', visible: modelVal && modelVal.resourceType === '2' ? true : false},
+            outSpeed: {label: `发送速率值(bits/s)`, minWidth: '150', visible: modelVal && modelVal.resourceType === '2' ? true : false},
+            createTime: {label: `时间`, minWidth: '150', visible: modelVal && modelVal.resourceType === '2' ? true : false},
+          };
+        }
+      },
       // 下拉
       fnConfigName() {
         monitorConfigList({}).then(res => {
@@ -197,6 +215,14 @@
           }
         });
       },
+      // 定时刷新下拉
+      fnTimeInter(val) {
+        clearInterval(this.timeInterModel);
+        this.timeInterModel = null;
+        this.timeInterModel = setInterval(() => {
+          this.fnChartView();
+        }, Number(val));
+      },
       // 按钮操作弹窗
       fnFormHandle(val) {
         if (val === 'add') {
@@ -246,20 +272,40 @@
           path: '/resource/monitorBoard',
         });
       },
+      // 点击图表
+      chartClickModel(chart) {
+        let paramsModel = {clientIds: this.reserveForm.deployDevice.toString(), startTime: chart.params.name, endTime: chart.params.name};
+        this.getList(paramsModel);
+      },
+      getList(val) {
+        if (this.reserveForm.resourceType === '1') {
+          getBandWidthList(Object.assign({}, this.queryParams, val)).then(response => {
+            this.roleList = response.rows;
+            this.queryParams.total = response.total;
+            this.loading = false;
+          });
+        } else if (this.reserveForm.resourceType === '2') {
+          getSwitchInfoList(Object.assign({}, this.queryParams, val)).then(response => {
+            this.roleList = response.rows;
+            this.queryParams.total = response.total;
+            this.loading = false;
+          })
+        }
+      },
       chartDataEvent(valData, unit) {
         if (unit) {
           let unitData = {unit: unit};
           this.fnChartView(unitData);
         }
       },
-      callback(){
+      callback(result, rowData) {
         if (result && result.fnCode) {
           switch (result.fnCode) {
             case 'details':
-              // this.$router.push({
-              //   path:'/resource/serverRegister/edit',
-              //   query: {id: rowData.id, readonly: true}
-              // });
+              this.$router.push({
+                path:'/resource/serverRegister/edit',
+                query: {id: rowData.clientId, readonly: true, type: 'alarmLog'}
+              });
               break;
             default:
           }
diff --git a/src/views/resource/serverRegister/handle.vue b/src/views/resource/serverRegister/handle.vue
index a2e7a10..bc69827 100644
--- a/src/views/resource/serverRegister/handle.vue
+++ b/src/views/resource/serverRegister/handle.vue
@@ -181,7 +181,8 @@
               break;
             case 'cancel':
               if (this.paramsData && this.paramsData.type === 'alarmLog') {
-                this.$router.push("/resource/alarmLog");
+                // this.$router.push("/resource/alarmLog");
+                history.go(-1);
               } else {
                 this.$router.push("/resource/serverRegister");
               }
diff --git a/src/views/resource/serverScriptStrat/details.vue b/src/views/resource/serverScriptStrat/details.vue
index 76e144c..20d7286 100644
--- a/src/views/resource/serverScriptStrat/details.vue
+++ b/src/views/resource/serverScriptStrat/details.vue
@@ -1,4 +1,4 @@
-、、<template>
+<template>
   <div class="app-container">
     <Form ref="formRef" :formList="formList" :ruleFormData="ruleForm" :config="this.paramsData && this.paramsData.readonly ? {labelWidth: '140px', buttonGroup: []} : {labelWidth: '140px'}" @fnClick="callback"></Form>
     <el-button v-if="this.paramsData && this.paramsData.readonly" style="float: right;margin-top: 12px;margin-left: 10px;" @click="callback({fnCode: 'cancel'})">返回</el-button>
diff --git a/src/views/resource/serverScriptStrat/resultView.vue b/src/views/resource/serverScriptStrat/resultView.vue
new file mode 100644
index 0000000..db5a537
--- /dev/null
+++ b/src/views/resource/serverScriptStrat/resultView.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="app-container">
+    <div>
+      <TableList :columns="columns" :config="config" :queryParams="queryParams" :tableList="tableList" @fnRenderList="getList">
+        <template #tempCopy="{ row, column}">
+          {{row.clientId}}<el-link :underline="false" icon="el-icon-document-copy" title="复制" v-clipboard:copy="row.clientId" v-clipboard:success="clipboardSuccess" style="margin-left: 10px;color: #409EFF;"></el-link>
+        </template>
+        <template #tempResult="{row, column}">
+          <i v-if="row.resultFlag === 1" class="el-icon-check" style="color: #2ba870;font-weight: 700;"></i>
+          <i v-if="row.resultFlag === 0" class="el-icon-close" style="color: #f00;font-weight: bold;"></i>
+        </template>
+      </TableList>
+    </div>
+    <div style="float: right;margin-top: 20px;">
+      <el-button @click="goBack">返回</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+  import TableList from '@/components/table/index.vue';
+  import {getScriptResultList} from "@/api/disRevenue/resource"
+  export default {
+    name: "resultView",
+    components: {TableList},
+    data() {
+        return {
+          paramsData: {},
+          // 列显隐信息
+          columns: {
+            id: { label: `ID`,width: '50'},
+            clientId: { label: `ClientID`, minWidth: '220', visible: true, slotName: 'tempCopy'},
+            resultFlag: {label: `执行结果`, minWidth: '80', visible: true, slotName: 'tempResult'},
+            content: {label: `结果详情`, minWidth: '150', visible: true},
+            createTime: {label: `结果返回时间`, minWidth: '150', visible: true},
+          },
+          config: {colTopHiddenIcon: true},
+          tableList: [],
+          queryParams: {
+            pageNum: 1,
+            pageSize: 10,
+            total: 0
+          }
+        }
+    },
+    created() {
+      this.paramsData = this.$route && this.$route.query;
+      this.getList();
+    },
+    methods: {
+      /** 复制代码成功 */
+      clipboardSuccess() {
+        this.$modal.msgSuccess("复制成功")
+      },
+      getList() {
+        getScriptResultList(Object.assign({}, this.queryParams,{scriptId: this.paramsData.id})).then(res => {
+          this.tableList = res.rows;
+          this.queryParams.total = res.total;
+        });
+      },
+      goBack() {
+        this.$router.push("/resource/serverScriptStrat");
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/resource/serverScriptStrat/serverScriptStrat.vue b/src/views/resource/serverScriptStrat/serverScriptStrat.vue
index 3b01cf2..9bc8e0f 100644
--- a/src/views/resource/serverScriptStrat/serverScriptStrat.vue
+++ b/src/views/resource/serverScriptStrat/serverScriptStrat.vue
@@ -56,17 +56,17 @@
       </template>
     </TableList>
     <!--    弹窗  -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
       <template v-if="clientList && clientList.length > 0">
         <el-radio-group v-model="checkboxGroup" :disabled="dialogData['timeline'] ? false : true" size="mini" @input="handleCheckedCitiesChange">
-          <el-radio-button style="margin-right: 10px;" v-for="city in clientList" :label="city" :key="city">{{city}}</el-radio-button>
+          <el-radio-button style="margin: 5px;" v-for="city in clientList" :label="city" :key="city">{{city}}</el-radio-button>
         </el-radio-group>
 
         <div v-if="dialogData['timeline']" class="block mt10">
           <el-timeline :reverse="true">
             <template v-for="(timeline,key,index) of dialogData.timelineList">
               <el-timeline-item v-for="item of timeline" :timestamp="item.createTime" placement="top">
-                <pre>{{item.content}}</pre>
+                <pre style="overflow: auto;">{{item.content}}</pre>
               </el-timeline-item>
             </template>
           </el-timeline>
@@ -126,10 +126,12 @@
               {content: '修改', fnCode: 'edit', type: 'text', showName: 'policyStatus', showVal: '0', icon: 'el-icon-edit', hasPermi: 'resource:serverScriptStrat:edit'},
               {content: '详情', fnCode: 'details', type: 'text', icon: 'el-icon-view', hasPermi: 'resource:serverScriptStrat:details'},
               {content: '删除', fnCode: 'delete', type: 'text', showName: 'policyStatus', showVal: '0', icon: 'el-icon-delete', hasPermi: 'resource:serverScriptStrat:detele'},
+              {content: '执行结果查看', fnCode: 'resultView', type: 'text', showName: 'policyStatus', showVal: '1', icon: 'el-icon-help', hasPermi: 'resource:serverScriptStrat:resultView'},
             ]
           }
         },
         open: false,
+        statusNum: null,
         checkboxGroup: '',
         title: '',
         dialogData: {
@@ -182,6 +184,7 @@
         this.checkboxGroup = '';
         this.changeRowData = row;
         this.clientList = [];
+        this.statusNum = null;
         this.open = true;
         if (num === 1) {
           this.title = '不在线设备';
@@ -193,6 +196,7 @@
           this.clientList = row.sucessClientIds;
           if (this.clientList && this.clientList.length > 0) {
             this.checkboxGroup = this.clientList[0];
+            this.statusNum = 1;
             this.handleCheckedCitiesChange(this.clientList[0]);
           }
         } else {
@@ -201,14 +205,15 @@
           this.clientList = row.failClientIds;
           if (this.clientList && this.clientList.length > 0) {
             this.checkboxGroup = this.clientList[0];
+            this.statusNum = 0;
             this.handleCheckedCitiesChange(this.clientList[0]);
           }
         }
       },
       // 选中clientId
-      handleCheckedCitiesChange(valModel) {
+      handleCheckedCitiesChange(valModel, num) {
         if (valModel) {
-          getScriptResultBySn({clientId: valModel, scriptId: this.changeRowData.id}).then(val => {
+          getScriptResultBySn({clientId: valModel, scriptId: this.changeRowData.id, resultFlag: this.statusNum}).then(val => {
             if ( val && val.data && val.data.scriptResult && val.data.scriptResult.length > 0) {
               this.dialogData['timelineList'] = {};
               this.$set(this.dialogData['timelineList'], valModel, val.data.scriptResult);
@@ -245,6 +250,14 @@
                 }
               });
               break;
+            case 'resultView':
+              this.$router.push({
+                path:'/resource/serverScriptStrat/resultView',
+                query:{
+                  id: rowData.id
+                }
+              });
+              break;
             case 'delete':
               let ids;
               if (rowData && rowData.id) {