Update .gitlab-ci.yml

2021-10-25 07:19:30 +00:00 · 2021-10-25 07:11:56 +00:00 · 2021-10-25 07:04:20 +00:00 · 2021-10-25 06:07:00 +00:00 · 2021-10-25 05:58:16 +00:00 · 2021-10-25 03:45:46 +00:00
24 changed files with 178 additions and 1117 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,8 @@ before_script:
  - export CNUI_TAG=$(date +%Y%m%d%H%M%S)

 generate_git-log:
+  variables:
+    CI_DEBUG_TRACE: "true"
  stage: gen_git-log
  script:
    - if (( `grep git-log.html ./public/index.html | wc -l` == 0 )); then         sed -i '/<body>/ a <a style="position:fixed;bottom:20px;left:40px;z-index:999;color:white;" target="_blank" href="./git-log.html">更新记录</a>' ./public/index.html;         echo "添加更新记录链接"; fi;
@@ -25,25 +27,29 @@ generate_git-log:
    - echo "</pre></body></html>" >> ./public/git-log.html
    - echo "处理 git-log.html 结束"
  only:
-    - dev
+    - dev-ci-debug
  tags:
    - GN-XXG-Server

 build_project:
  stage: build_project
+  variables:
+    CI_DEBUG_TRACE: "true"
  script:
    - echo "npm install ..."
    - npm install --save-dev --unsafe-perm
    - echo "npm run build"
    - npm run build
  only:
-    - dev
+    - dev-ci-debug
    - tags
  tags:
    - GN-XXG-Server

 build_image:
  stage: build_image
+  variables:
+    CI_DEBUG_TRACE: "true"
  script:
    - echo "docker build"
    - sudo docker build -t dev_cn-ui:$CNUI_TAG .
@@ -53,13 +59,15 @@ build_image:
    - sudo docker push 192.168.40.153:9080/cyber-narrator/dev_cn-ui:$CNUI_TAG
  when: on_success
  only:
-    - dev
+    - dev-ci-debug
  tags:
    - GN-XXG-Server


 build_release_image:
  stage: build_image
+  variables:
+    CI_DEBUG_TRACE: "true"
  script:
    - echo 'tag名称是'
    - echo $CI_COMMIT_TAG
--- a/3
+++ b/3
@@ -2,8 +2,9 @@ FROM nginx:latest

 MAINTAINER shizhendong shizhendong@zdjizhi.com

+
 # 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面
-COPY dist/  /usr/share/nginx/html/
+ADD dist/  /usr/share/nginx/html/

 # nginx 配置 ， 制作镜像时不做处理 ， 容器可自己挂载配置文件
 #COPY nginx.conf /etc/nginx/nginx.conf
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
    "core-js": "^3.6.5",
    "dayjs": "^1.10.5",
    "echarts": "^5.1.1",
-    "element-plus": "^1.0.2-beta.44",
+    "element-plus": "1.0.2-beta.44",
    "leaflet": "^1.7.1",
    "lib-flexible": "^0.3.2",
    "lodash": "^4.17.21",
--- a/src/assets/css/common.scss
+++ b/src/assets/css/common.scss
@@ -70,15 +70,3 @@ g [aria-labelledby$=-title] {
  opacity: 0.1;
  transform: translateX(calc(100% - 52px)) scale(.7);
 }
-
-.no-data {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  width: 100%;
-  color: #999;
-}
-.no-data-hide {
-  display: none;
-}
--- a/src/assets/css/font/iconfont.css
+++ b/src/assets/css/font/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
  font-family: "cn-icon"; /* Project id 2614877 */
-  src: url('iconfont.woff2?t=1636701851616') format('woff2'),
-       url('iconfont.woff?t=1636701851616') format('woff'),
-       url('iconfont.ttf?t=1636701851616') format('truetype');
+  src: url('iconfont.woff2?t=1634635259684') format('woff2'),
+       url('iconfont.woff?t=1634635259684') format('woff'),
+       url('iconfont.ttf?t=1634635259684') format('truetype');
 }

 .cn-icon {
@@ -13,22 +13,6 @@
  -moz-osx-font-smoothing: grayscale;
 }

-.cn-icon-debug:before {
-  content: "\e606";
-}
-
-.cn-icon-override:before {
-  content: "\e68a";
-}
-
-.cn-icon-download1:before {
-  content: "\e6ab";
-}
-
-.cn-icon-upload1:before {
-  content: "\e6ac";
-}
-
 .cn-icon-position2:before {
  content: "\e745";
 }
--- a/src/assets/css/font/iconfont.ttf
+++ b/src/assets/css/font/iconfont.ttf
--- a/src/assets/css/font/iconfont.woff
+++ b/src/assets/css/font/iconfont.woff
--- a/src/assets/css/font/iconfont.woff2
+++ b/src/assets/css/font/iconfont.woff2
--- a/src/components/charts/chart-table-title.js
+++ b/src/components/charts/chart-table-title.js
@@ -13,7 +13,7 @@ export const tableTitleMapping = {
    prop: 'ip'
  },
  appId: {
-    label: 'APP',
+    label: 'APP ID',
    prop: 'appId'
  },
  app: {
@@ -47,8 +47,5 @@ export const legendMapping = {
  session_rate: i18n.global.t('trafficSummary.sessionsPerSecond'),
  packets_rate: i18n.global.t('trafficSummary.packetsPerSecond'),
  packets_received_rate: i18n.global.t('trafficSummary.packetsPerSecondC2s'),
-  packets_sent_rate: i18n.global.t('trafficSummary.packetsPerSecondS2c'),
-  ip_packets_rate: i18n.global.t('trafficSummary.packetsPerSecond'),
-  ip_packets_received_rate: i18n.global.t('trafficSummary.packetsPerSecondC2s'),
-  ip_packets_sent_rate: i18n.global.t('trafficSummary.packetsPerSecondS2c')
+  packets_sent_rate: i18n.global.t('trafficSummary.packetsPerSecondS2c')
 }
--- a/src/components/charts/panel.scss
+++ b/src/components/charts/panel.scss
@@ -458,7 +458,7 @@
    }
    .detail-header__operation {
      display: flex;
-      align-items: flex-end;
+      align-items: end;

      .panel__time {
        display: flex;
@@ -493,7 +493,7 @@
      }
      &>.el-tabs { // 底部对齐
        display: flex;
-        align-items: flex-end;
+        align-items: end;
      }
    }
  }
--- a/src/components/common/popBox/topToolMoreOptions.vue
+++ b/src/components/common/popBox/topToolMoreOptions.vue
@@ -1,243 +0,0 @@
-<template>
-  <el-dropdown :size="size" style="margin-left: 0px;">
-    <button id="more" :class="triggerButtonClass" title="more...">
-      <i class="cn-icon cn-icon-more-arrow-down" style="font-size: 12px;"></i>
-    </button>
-    <template #dropdown>
-        <el-dropdown-menu >
-          <!-- import、export之前的内容 -->
-          <slot name="before"></slot>
-          <el-dropdown-item v-if="importUrl">
-            <div id="chart-import" @click="showImportBox(1)"><i class="cn-icon cn-icon-upload1"></i>{{$t('overall.import')}}</div>
-          </el-dropdown-item>
-          <el-dropdown-item v-if="exportUrl">
-            <div id="chart-export" @click="exportAll"><i class="cn-icon cn-icon-download1"></i>{{$t('overall.export')}}</div>
-          </el-dropdown-item>
-          <!-- import、export之后的内容 -->
-          <slot name="after"></slot>
-        </el-dropdown-menu>
-    </template>
-    <el-dialog :close-on-click-modal="importBox.type!=3" :show-close="true" :title="importBox.title"  v-model="importBox.show" :width="importBox.width" append-to-body custom-class="cn-dialog" @close="closeDialog">
-      <div v-if="importBox.type == 1">
-        <div class="upload-body">
-          <el-upload :id="id+'-json-input-file'"
-                     ref="uploadExcel"
-                     :auto-upload="false"
-                     :file-list="importFileList"
-                     :on-change="importChange"
-                     accept=".json"
-                     action=""
-                     class="upload-demo"
-                     drag>
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">{{$t('overall.dragFileTip')}}，{{$t('overall.or')}}&nbsp;<em>{{$t('overall.clickUpload')}}</em></div>
-            <template #tip>
-              <div class="el-upload__tip" >
-                {{$t('overall.importTip')}}
-              </div>
-            </template>
-          </el-upload>
-        </div>
-        <div slot="footer" class="footer">
-          <div class="el-message-box__btns" style="text-align: right;">
-            <button :id="id+'-json-import-template'" class="el-button el-button--default el-button--small" @click="downloadTemplate">
-              <span>{{$t('overall.template')}}</span>
-            </button>
-            <button  :id="id+'-json-import-add'" :class="{'cn-btn-disabled':prevent_opt.import}" :disabled="prevent_opt.import" class="cn-btn el-button el-button--default el-button--small" @click="importJson">
-              <span>{{$t('overall.import')}}</span>
-            </button>
-            <button :id="id+'-json-import-esc'" class="el-button el-button--default el-button--small" @click="closeDialog">
-              <span>{{$t('overall.cancel')}}</span>
-            </button>
-          </div>
-        </div>
-      </div>
-    </el-dialog>
-  </el-dropdown>
-</template>
-
-<script>
-import axios from 'axios'
-import { post } from '@/utils/http'
-let timeout
-export default {
-  name: 'topToolMoreOptions',
-  props: {
-    size: {
-      type: String,
-      default: 'small'
-    },
-    exportUrl: { type: String, default: '' },
-    params: { type: Object },
-    params2: { type: Object },
-    exportFileName: { type: String },
-    importUrl: { type: String, default: '' }, // 为空时不显示导入按钮
-    link: { type: Object }, // 为空时不显示导出按钮
-    showCur: { type: Boolean, default: true },
-    id: { type: String, default: 'export' },
-    triggerButtonClass: { // 触发下拉事件的按钮的class
-      type: String,
-      default: 'top-tool-btn'
-    }
-  },
-  data () {
-    return {
-      importBox: { show: false, title: this.$t('overall.import'), type: 1, width: '600px' },
-      importFile: null,
-      importFileList: [],
-      importResult: null,
-      exportShow: false,
-      paramsType: ''
-    }
-  },
-  mounted () {
-    this.getParamsType()
-  },
-  methods: {
-    importChange (file, fileList) {
-      if (fileList.length > 0) {
-        this.importFileList = [fileList[fileList.length - 1]]
-      }
-      this.importFile = this.importFileList[0]
-    },
-    importJson () {
-      if (this.importFile && this.importFile.raw) {
-        this.prevent_opt.import = true
-        const form = new FormData()
-        form.append('file', this.importFile.raw)
-        if (this.paramsType) {
-          form.append('type', this.paramsType)
-        }
-        form.append('language', localStorage.getItem('cn-language') ? localStorage.getItem('cn-language') : 'en')
-        post(this.importUrl, form, { 'Content-Type': 'multipart/form-data' }).then(response => {
-          if (response.code == 200 && response.msg == 'success') {
-            this.$message({ duration: 2000, type: 'success', message: this.$t('tip.importSuccess') })
-          } else {
-            this.$message.error(response.msg)
-          }
-          this.prevent_opt.import = false
-        })
-      } else {
-        this.$message.error(this.$t('tip.noImportFile'))
-      }
-    },
-    closeDialog () {
-      this.importBox.show = false
-      this.importResult = null
-      this.importFileList = []
-      this.importFile = null
-    },
-    downloadTemplate () {
-      const language = localStorage.getItem('cn-language') || 'en' // 初始未选择默认 en 英文
-      const fileName = this.exportFileName + '-' + this.$t('overall.template') + '-' + this.getTimeString() + '.json'
-
-      let url = null
-      const param = { language: language }
-      if (this.paramsType === 'galaxy') {
-        url = '/galaxy/setting/export'
-        param.type = 'galaxy'
-      }
-
-      if (!url) {
-        console.error('no interface support')
-      }
-      this.export(url, param, fileName)
-    },
-    exportAll () {
-      const params = JSON.parse(JSON.stringify(this.params))
-      if (this.params2) {
-        Object.keys(this.params2).forEach(key => {
-          if (params[key]) {
-            if (params[key].prototype.toString.call(val) === '[object Object]') {
-              Object.assign(params[key], this.params2[key])
-            } else if (params[key].prototype.toString.call(val) === '[object Array]') {
-              params[key].concat(this.params2[key])
-            }
-          } else {
-            params[key] = this.params2[key]
-          }
-        })
-      }
-      params.pageSize = -1
-      params.language = localStorage.getItem('cn-language') || 'en'
-
-      this.export(this.exportUrl, params, this.exportFileName + '-' + this.getTimeString() + '.json')
-      this.closeDialog()
-    },
-    export (url, params, fileName) {
-      if (this.paramsType) {
-        params.type = this.paramsType
-      }
-      axios.get(url, { responseType: 'blob', params: params }).then(res => {
-        if (window.navigator.msSaveOrOpenBlob) {
-          // 兼容ie11
-          const blobObject = new Blob([res.data])
-          window.navigator.msSaveOrOpenBlob(blobObject, fileName)
-        } else {
-          const url = URL.createObjectURL(new Blob([res.data]))
-          const a = document.createElement('a')
-          document.body.appendChild(a) // 此处增加了将创建的添加到body当中
-          a.href = url
-          a.download = fileName
-          a.target = '_blank'
-          a.click()
-          a.remove() // 将a标签移除
-        }
-      }, error => {
-        const $self = this
-        const reader = new FileReader()
-        reader.onload = function (event) {
-          const responseText = reader.result
-          const exception = JSON.parse(responseText)
-          if (exception.message) {
-            $self.$message.error(exception.message)
-          } else {
-            console.error(error)
-          }
-        }
-        reader.readAsText(error.response.data)
-      })
-    },
-    showImportBox (type) {
-      this.importBox.show = true
-      this.importBox.type = type
-      if (type == 1) { // import
-        this.importBox.title = this.$t('overall.import')
-        this.importBox.width = '600px'
-      }
-    },
-    getTimeString () {
-      const split = '-'
-      const date = new Date()
-      const year = date.getFullYear()
-      const month = this.formatNum(date.getMonth() + 1)
-      const day = this.formatNum(date.getDate())
-      const hours = this.formatNum(date.getHours())
-      const minutes = this.formatNum(date.getMinutes())
-      const seconds = this.formatNum(date.getSeconds())
-      return year + split + month + split + day + ' ' + hours + split + minutes + split + seconds
-    },
-    formatNum (num) {
-      return num > 9 ? num : '0' + num
-    },
-    getParamsType () {
-      const path = this.$route.path
-      switch (path) {
-        case '/galaxyProxy': this.paramsType = 'galaxy'; break
-        default: this.paramsType = ''; break
-      }
-    }
-  },
-  watch: {
-  }
-}
-</script>
-
-<style scoped lang="scss">
-  .cn-dialog {
-    overflow: hidden;
-  }
-  .upload-body{
-    text-align: center;
-  }
-</style>
--- a/src/components/entities/EntityList.vue
+++ b/src/components/entities/EntityList.vue
@@ -83,7 +83,7 @@
          </template>
          <template v-else-if="from === 'app'">
            <div class="body__row">
-              <span class="body__row-label"><i class="cn-icon cn-icon-id"></i>APP：</span>
+              <span class="body__row-label"><i class="cn-icon cn-icon-id"></i>APP ID：</span>
              <div class="body__row-value" :title="d.appId">{{d.appId || '-'}}</div>
            </div>
            <div class="body__row">
--- a/src/components/rightBox/settings/ChartBox.vue
+++ b/src/components/rightBox/settings/ChartBox.vue
@@ -103,12 +103,8 @@
          </el-form-item>

          <!--params-->
-          <el-form-item :label="$t('config.chart.params')" prop="params">
-            <v-ace-editor
-                    v-model:value="editObject.params"
-                    lang="json"
-                    theme="chrome"
-                    style="height: 300px" />
+          <el-form-item :label="$t('config.chart.params')">
+            <el-input maxlength="1024" show-word-limit :rows="2" size='mini' type="textarea" v-model="editObject.params" id="chart-box-params"/>
          </el-form-item>
          <!--remark-->
          <el-form-item :label="$t('config.chart.remark')">
@@ -134,17 +130,10 @@ import rightBoxMixin from '@/mixins/rightBox'
 import { get, post, put } from '@/utils/http'
 import { panelTypeAndRouteMapping } from '@/utils/constants'
 import { api } from '@/utils/api'
-import { VAceEditor } from 'vue3-ace-editor'
-import 'ace-builds/src-noconflict/mode-javascript'
-import 'ace-builds/src-noconflict/mode-json'
-import 'ace-builds/src-noconflict/theme-chrome'

 export default {
  name: 'ChartBox',
  mixins: [rightBoxMixin],
-  components: {
-    VAceEditor
-  },
  data () {
    return {
      url: api.chart,
@@ -391,13 +380,3 @@ export default {
  }
 }
 </script>
-<style lang="scss">
-  .my-editor {
-    margin-top: 4px;
-    border: 1px solid $--right-box-border-color;
-
-    .prism-editor__textarea {
-      outline: none;
-    }
-  }
-</style>
--- a/src/components/setting/GalaxyProxyDebug.vue
+++ b/src/components/setting/GalaxyProxyDebug.vue
@@ -1,525 +0,0 @@
-<template>
-  <el-dialog
-      v-model="show"
-      :top="top"
-      :modal="modal"
-      :custom-class="customClass"
-      :show-close="showClose"
-      :width="width"
-      @close="closeDebug"
-      @open="openDebug"
-      destroy-on-close
-  >
-
-    <div class="wrapper">
-        <el-select v-model="name" filterable placeholder="Select" class="item item-1" allow-create
-                   @change="changPath">
-          <template v-for="(proxy,index) in galaxyProxyData" :key="proxy.id">
-            <el-option :label="proxy.name" :value="index"></el-option>
-          </template>
-        </el-select>
-      <div class="item item-2 sub-grid-send">
-        <el-select v-model="method" filterable placeholder="Select" style="width:100px;" >
-          <el-option
-              v-for="item in methodOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-input v-model="path" placeholder="Please input" />
-        <el-button @click="send">{{$t('galaxyProxy.debug.send')}}</el-button>
-      </div>
-
-      <div class="item item-3 sub-grid-params">
-        <div class="sub-grid-params-add">
-            <span style="padding-left: 15px;">{{$t('galaxyProxy.debug.requestParams')}}</span>
-            <el-button size="mini" @click="handleAddDetails"><i class="cn-icon-add cn-icon"></i></el-button>
-        </div>
-
-        <el-table :data="paramsTableData" style="width: 100%;"
-                  @selection-change="handleDetailSelectionChange"
-                  ref="tb">
-          <el-table-column  type="selection" align="center" label="" width="50px" style="border-left:0px;" />
-
-          <el-table-column prop="key"  label="Key" align="center" width="100px" >
-            <template #default="scope">
-              <el-input   @change=""  v-model="scope.row.key"></el-input>
-            </template>
-          </el-table-column>
-
-          <el-table-column prop="value"  label="Value" align="center" style="border-right:0px;">
-            <template #default="scope">
-              <el-input  @change=""  v-model="scope.row.value"></el-input>
-            </template>
-          </el-table-column>
-
-        </el-table>
-
-      </div>
-      <div class="item item-4">
-        <div class="request-header" >{{$t('galaxyProxy.debug.request.header')}}</div>
-        <div class="request-header-content" ><pre v-html="proxyRequestHeader"  style="height: 98%;width: 98%;margin-left: -15px;margin-top: -10px;"></pre></div>
-        <div class="response-header">{{$t('galaxyProxy.debug.response.header')}}</div>
-        <div class="response-body">{{$t('galaxyProxy.debug.response.body')}}</div>
-        <div class="response-header-content"><pre v-html="proxyResponseHeader"  style="height: 98%;width: 98%;margin-left: -15px;margin-top: -10px;"></pre></div>
-        <div class="response-body-content color-pre__style">
-            <pre v-html="proxyResponseBody"  style="height: 95%;width: 95%;"></pre>
-        </div>
-      </div>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { ref, defineComponent } from 'vue'
-import { api } from '@/utils/api'
-import { get, getForDebug, postForDebug } from '@/utils/http'
-import axios from 'axios'
-import { VAceEditor } from 'vue3-ace-editor'
-import 'ace-builds/src-noconflict/mode-javascript'
-import 'ace-builds/src-noconflict/mode-json'
-import 'ace-builds/src-noconflict/theme-chrome'
-
-export default {
-  name: 'GalaxyProxyDebug',
-  props: {
-    showDebug: Boolean,
-    top: {
-      type: String,
-      default: '5vh'
-    },
-    modal: {
-      type: Boolean,
-      default: true
-    },
-    customClass: {
-      type: String,
-      default: 'proxy-debug__dialog'
-    },
-    showClose: {
-      type: Boolean,
-      default: true
-    },
-    width: { // 高度需要通过customClass自行定义
-      type: [String, Number],
-      default: '90vw'
-    },
-    curGalaxyProxy: Object // 实体，{ name: '', path: '', icon: icon-class }
-  },
-  components: {
-    VAceEditor
-  },
-  data () {
-    return {
-      show: false,
-      galaxyProxyData: [],
-      name: '',
-      paramsTableData: [
-        {
-          key: 'q',
-          value: 'ip'
-        },
-        {
-          key: 'addr',
-          value: '192'
-        }
-      ],
-      // 选中的数据
-      checkedDetail: {},
-      methodOptions: [
-        {
-          value: 'GET',
-          label: 'GET'
-        },
-        {
-          value: 'POST',
-          label: 'POST'
-        }
-      ],
-      method: 'GET',
-      path: '',
-      proxyResponseBody: '',
-      proxyRequestHeader: '',
-      proxyResponseHeader: ''
-    }
-  },
-  setup () {
-  },
-  methods: {
-
-    handleAddDetails () {
-      if (this.paramsTableData == undefined) {
-        this.paramsTableData = new Array()
-      }
-      const obj = {}
-      obj.key = ''
-      obj.value = ''
-
-      this.paramsTableData.push(obj)
-    },
-
-    // 单选框选中数据
-    handleDetailSelectionChange (selection) {
-      this.checkedDetail = {}
-      selection.forEach(t => {
-        this.checkedDetail[t.key] = t.value
-      })
-    },
-
-    async getGalaxyProxyData (value) {
-      await get(api.galaxyProxy + '?pageSize=-1').then(response => {
-        if (response.code === 200) {
-          this.galaxyProxyData = response.data.list
-        }
-      })
-    },
-
-    changPath (index) {
-      // 修改input的值
-      this.path = this.galaxyProxyData[index].path
-      this.method = this.galaxyProxyData[index].method.toUpperCase()
-    },
-
-    send () {
-      // this.path = "galaxy/setting?pageNo=1&pageSize=1"
-      const finalUrl = axios.defaults.baseURL + 'interface' + this.path
-      // 注意有GET与POST两种方式
-      if (this.method.toUpperCase() == 'GET') {
-        getForDebug(finalUrl, this.checkedDetail).then(response => {
-          this.proxyResponseBody = this.syntaxHighlight(JSON.parse(JSON.stringify(response.data)))
-          this.proxyResponseHeader = this.syntaxHighlight(JSON.parse(JSON.stringify(response.headers)))
-          this.proxyRequestHeader = this.syntaxHighlight(JSON.parse(JSON.stringify(response.config.headers)))
-          this.proxyResponseHeader = this.proxyResponseHeader.replace(/{/g, '').replace(/}/g, '').replace(/"/g, '')
-          this.proxyRequestHeader = this.proxyRequestHeader.replace(/{/g, '').replace(/}/g, '').replace(/"/g, '')
-        })
-      } else if (this.method.toUpperCase() == 'POST') {
-        postForDebug(finalUrl, this.checkedDetail).then(response => {
-          if (response) {
-            this.proxyResponseBody = this.syntaxHighlight(JSON.parse(JSON.stringify(response.data)))
-            this.proxyResponseHeader = this.syntaxHighlight(JSON.parse(JSON.stringify(response.headers)))
-            this.proxyRequestHeader = this.syntaxHighlight(JSON.parse(JSON.stringify(response.config.headers)))
-
-            this.proxyResponseHeader = this.proxyResponseHeader.replace(/{/g, '').replace(/}/g, '').replace(/"/g, '')
-            this.proxyRequestHeader = this.proxyRequestHeader.replace(/{/g, '').replace(/}/g, '').replace(/"/g, '')
-          }
-        })
-      }
-    },
-
-    // 格式化json
-    syntaxHighlight (json) {
-      if (typeof json != 'string') {
-        json = JSON.stringify(json, undefined, 2)
-      }
-      json = json.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>')
-      return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
-        let cls = 'number'
-        if (/^"/.test(match)) {
-          if (/:$/.test(match)) {
-            cls = 'key'
-          } else {
-            cls = 'string'
-          }
-        } else if (/true|false/.test(match)) {
-          cls = 'boolean'
-        } else if (/null/.test(match)) {
-          cls = 'null'
-        }
-        return '<span class="' + cls + '">' + match + '</span>'
-      })
-    },
-
-    closeDebug () {
-      const paramsTableData = []
-      const q = {}
-      q.key = 'q'
-      q.value = 'ip'
-      const addr = {}
-      addr.key = 'addr'
-      addr.value = '192'
-
-      paramsTableData.push(q)
-      paramsTableData.push(addr)
-
-      this.paramsTableData = JSON.parse(JSON.stringify(paramsTableData))
-      this.proxyResponseBody = ''
-      this.proxyResponseHeader = ''
-      this.proxyRequestHeader = ''
-      this.name = ''
-      this.path = ''
-      for (const key in this.curGalaxyProxy) {
-        delete this.curGalaxyProxy[key]
-      }
-    },
-    openDebug () {
-      if (this.curGalaxyProxy.path) {
-        this.name = this.curGalaxyProxy.name
-        this.path = this.curGalaxyProxy.path
-        this.method = this.curGalaxyProxy.method.toUpperCase()
-      } else {
-        this.name = ''
-        this.path = ''
-        this.method = 'GET'
-      }
-    }
-  },
-  mounted () {
-    // 获取代理名称及路径
-    this.getGalaxyProxyData()
-  },
-  watch: {
-    showDebug (n, o) {
-      this.show = n
-    },
-    show (n, o) {
-      this.$emit('update:show-debug', n)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-
-  .proxy-debug__dialog {
-    height: 90vh;
-    overflow: hidden;
-    .el-dialog__header {
-      display: none;
-    }
-    .el-dialog__body {
-      height: 100%;
-      padding: 0;
-    }
-  }
-  .my-editor {
-    margin-top: 4px;
-    border: 1px solid $--right-box-border-color;
-
-    .prism-editor__textarea {
-      outline: none;
-    }
-  }
-  .wrapper{
-      width: 100%;
-      height:100%;
-      background: #fff;
-      text-align: center;
-      display: grid;
-      grid-template-columns: 25% auto;
-      grid-template-rows: 60px auto;
-      grid-row-gap: 20px;
-      grid-column-gap: 20px;
-      padding:25px;
-
-      .item{
-        text-align: center;
-        border:1px solid #bbbbbb;
-        font-size: 4em;
-        text-align: center;
-
-        color: #000C18;
-        line-height: 60px;
-        font-size: 16px;
-        text-align: left;
-      }
-
-      .item-1 {
-        border:0px;
-      }
-
-      .item-2 {
-        background-color: #ffffff;
-        border:0px;
-        .el-input__inner {
-          border-radius: 0px;
-          border-left: 0px;
-          border-right:0px;
-          border-top: 1px solid #bbbbbb;
-          border-bottom: 1px solid #bbbbbb;
-          color: #606266;
-          height: 60px;
-          line-height: 60px;
-          padding: 0 15px;
-        }
-      }
-
-      .sub-grid-send{
-        width: 100%;
-        height:100%;
-        background: #fff;
-        text-align: center;
-        display: grid;
-        grid-template-columns: 100px auto 80px;
-        grid-template-rows: 60px;
-        grid-row-gap: 0px;
-        grid-column-gap: 0px;
-        padding:0px;
-      }
-
-      .item-3 {
-        background-color: #ffffff;
-
-        .el-input__inner{
-          border: 0px;
-        }
-        .el-input__inner:hover {
-          border: 0px;
-        }
-        .el-input__inner:focus {
-          border: 1px solid #bbbbbb;
-        }
-
-        .el-table__header, .el-table__body{
-          witdh:100% !important;
-        }
-
-        .el-table__header-wrapper{
-          height: 60px;
-        }
-
-        .el-table th.is-leaf, .el-table td {
-          border-top: 1px solid #bbbbbb;
-          border-left: 1px solid #bbbbbb;
-          border-right: 0px;
-          padding-top: 3px;
-          padding-bottom: 3px;
-        }
-
-        .el-table{
-          border-bottom: 1px solid #bbbbbb;
-          border-right: 1px solid #bbbbbb;
-        }
-
-        .el-table .cell {
-          line-height: 23px;
-          padding-left: 3px;
-          padding-right: 3px;
-          text-align: center;
-        }
-
-        .el-table__body tr:hover >td {
-          background-color: #ffffff;
-        }
-
-        .el-table__body tr:focus >td {
-          background-color: cadetblue;
-        }
-      }
-
-      .item-4 {
-        height:100%;
-        overflow:hidden;
-        background-color: #ffffff;
-        display: grid;
-        grid-template-columns: 40% 60%;
-        grid-template-rows: 60px  minmax(100px, 1fr) 60px minmax(100px, 2fr);
-        grid-row-gap: 0px;
-        grid-column-gap: 0px;
-
-        pre {outline: 0px; padding: 0px; margin: 0px;height:360px;line-height: 20px; font-family: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace;}
-        .color-pre__style{
-          height: 95%;
-          width: 95%;
-          .string { color: green; }
-          .number { color: darkorange; }
-          .boolean { color: blue; }
-          .null { color: magenta; }
-          .key { color: red; }
-        }
-        .request-header {
-          grid-column-start: 1;
-          grid-column-end: 3;
-          border-bottom:1px solid #bbbbbb;
-          padding-left: 15px;
-        }
-
-        .request-header-content{
-          grid-column-start: 1;
-          grid-column-end: 3;
-          border-bottom:1px solid #bbbbbb;
-          padding-left: 0px;
-          overflow:scroll;
-          height: 100%;
-          width:100%;
-          line-height: 30px;
-        }
-
-        .response-header {
-          border-right:1px solid #bbbbbb;
-          border-bottom:1px solid #bbbbbb;
-          padding-left: 15px;
-        }
-
-        .response-header-content {
-          border-right:1px solid #bbbbbb;
-          padding-left: 0px;
-          height: 100%;
-          width:100%;
-          overflow:scroll;
-          line-height: 30px;
-        }
-
-        .response-body {
-          border-bottom:1px solid #bbbbbb;
-          padding-left: 15px;
-        }
-
-        .response-body-content {
-          padding-left: 5px;
-          height:100%;
-          width:100%;
-          overflow:scroll;
-        }
-      }
-
-      .sub-grid-params{
-            width: 100%;
-            height:100%;
-            background: #fff;
-            text-align: center;
-            display: grid;
-            grid-template-columns: 100%;
-            grid-template-rows: 60px auto;
-            grid-row-gap: 0px;
-            grid-column-gap: 0px;
-            padding:0px;
-
-      }
-
-      .sub-grid-params-add{
-        width: 100%;
-        height:100%;
-        background: #fff;
-        text-align: left;
-        display: grid;
-        grid-template-columns: 70% 30%;
-        grid-template-rows:100%;
-        grid-row-gap: 0px;
-        grid-column-gap: 0px;
-        padding:0px;
-      }
-
-      .el-select .el-input .el-input__inner{
-        height: 60px;
-        border-radius:0px;
-        border:1px solid #bbbbbb;
-      }
-      .el-select .el-input .el-select__caret {
-        line-height:60px;
-        font-weight: bolder;
-        color:black;
-      }
-
-      .el-button {
-        border-color: #bbbbbb;
-      }
-
-      .sub-grid-params-add  .el-button {
-        height: 38px;
-        margin-top: 11px;
-        margin-right: 10px;
-      }
-  }
-</style>
--- a/src/components/table/settings/GalaxyProxyTable.vue
+++ b/src/components/table/settings/GalaxyProxyTable.vue
@@ -97,9 +97,8 @@
            </div>
            <template #dropdown>
              <el-dropdown-menu >
-                <el-dropdown-item :command="['copy', scope.row]"><i class="cn-icon cn-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
+                <el-dropdown-item :command="['copy', scope.row]"><i class="cn-icon cn-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
                <el-dropdown-item :command="['delete', scope.row]"><i class="cn-icon cn-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
-                <el-dropdown-item :command="['debug', scope.row]"><i class="cn-icon cn-icon-debug"></i><span class="operation-dropdown-text">{{$t('overall.debug')}}</span></el-dropdown-item>
              </el-dropdown-menu>
            </template>
          </el-dropdown>
--- a/src/components/table/settings/OperationLogTable.vue
+++ b/src/components/table/settings/OperationLogTable.vue
@@ -4,7 +4,6 @@
    ref="dataTable"
    :data="tableData"
    :height="height"
-    tooltip-effect="light"
    border
    class="no-operation"
    @header-dragend="dragend"
@@ -28,32 +27,17 @@
      :sort-orders="['ascending', 'descending']"
      :width="`${item.width}`"
      class="data-column"
-      :show-overflow-tooltip="['params', 'response'].indexOf(item.prop) > -1"
    >
      <template #header>
        <span class="data-column__span">{{item.label}}</span>
        <div class="col-resize-area"></div>
      </template>
      <template  #default="scope">
-        <span v-if="item.prop === 'duration'">
-                {{scope.row[item.prop]}}ms
+        <span v-if="item.prop === 'time'">
+                {{scope.row[item.prop]}} ms
              </span>
-        <span v-else-if="item.prop === 'state'">
-          <template v-if="scope.row[item.prop]==operationLogStateMapping.success">
-            {{$t('operationLog.state.success')}}
-          </template>
-          <template v-else-if="scope.row[item.prop]==operationLogStateMapping.fail">
-            {{$t('operationLog.state.fail')}}
-          </template>
-          <template v-else>
-            {{scope.row[item.prop]}}
-          </template>
-        </span>
        <span v-else-if="item.prop === 'username'">{{formatUsername(scope.row)}}</span>
        <span v-else-if="item.prop === 'ctime'">{{utcTimeToSysTime(scope.row[item.prop])}}</span>
-        <template v-else-if="item.prop === 'params' || item.prop === 'response'">
-          <span>{{scope.row[item.prop]}}</span>
-        </template>
        <span v-else>{{scope.row[item.prop]}}</span>
      </template>
    </el-table-column>
@@ -62,14 +46,11 @@

 <script>
 import table from '@/mixins/table'
-import { operationLogStateMapping } from '@/utils/constants'
-
 export default {
  name: 'roleTable',
  mixins: [table],
  data () {
    return {
-      operationLogStateMapping: operationLogStateMapping,
      tableTitle: [
        {
          label: this.$t('config.operationlog.id'),
@@ -118,20 +99,18 @@ export default {
        },
        {
          label: this.$t('config.operationlog.time'),
-          prop: 'duration',
+          prop: 'time',
          show: false
        },
        {
          label: this.$t('config.operationlog.params'),
          prop: 'params',
-          show: false,
-          width: 150
+          show: false
        },
        {
          label: this.$t('config.operationlog.response'),
          prop: 'response',
-          show: false,
-          width: 150
+          show: false
        }
      ]
    }
--- a/src/mixins/dataList.js
+++ b/src/mixins/dataList.js
@@ -179,9 +179,7 @@ export default {
    let localStorageTableTitle = localStorage.getItem('cn-tableTitle-' + localStorage.getItem('cn-username') + '-' + this.tableId)
    localStorageTableTitle = localStorageTableTitle ? JSON.parse(localStorageTableTitle) : this.$refs.dataTable.tableTitle
    this.tools.customTableTitle = this.$refs.dataTable.tableTitle.map((item, index) => { // 修复切换中英文的问题
-      if (localStorageTableTitle[index]) {
-        item.show = localStorageTableTitle[index].show
-      }
+      item.show = localStorageTableTitle[index].show
      return item
    })
    if (localStorageTableTitle && (localStorageTableTitle.length > this.$refs.dataTable.tableTitle.length)) {
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -118,7 +118,7 @@ export async function getI18n () {
 export async function getIso36112JsonData (suffix) {
  const request = new Promise(resolve => {
    axios({
-      url: `${window.location.protocol}//${window.location.host}:${window.location.port}/geojson/${suffix}.json`
+      url: `${window.location.protocol}//${window.location.host}:${window.location.port}/geojson/${suffix}.json`,
    }).then(response => {
      resolve(response.data || response || null)
    })
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -39,12 +39,6 @@ export const panelTypeAndRouteMapping = {
  appEntityDetail: 6
 }

-/* operationLog state 执行状态属性 值与名称之间的映射 */
-export const operationLogStateMapping = {
-  success: 1,
-  fail: 0
-}
-
 export const position = {
  tableHeight: {
    normal: 'calc(100% - 48px)' // 常规高度，特例在下方定义
@@ -52,9 +46,9 @@ export const position = {
 }

 export const entityType = {
-  app: 'APP',
+  ip: 'IP',
  domain: 'Domain',
-  ip: 'IP'
+  app: 'APP'
 }

 export const entityFilterType = {
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -55,36 +55,6 @@ axios.interceptors.response.use(
    return Promise.reject(error)
  }
 )
-export function getForDebug (url, params) {
-  return new Promise((resolve) => {
-    axios.get(url, {
-      params: params
-    }).then(response => {
-      resolve(response)
-    }).catch(err => {
-      if (err.response) {
-        resolve(err.response)
-      } else if (err.message) {
-        resolve(err.message)
-      }
-    })
-  })
-}
-
-export function postForDebug (url, params, headers) {
-  return new Promise(resolve => {
-    axios.post(url, params, { headers: headers }).then(response => {
-      resolve(response, response)
-    }).catch(err => {
-      if (err.response) {
-        resolve(err.response)
-      } else if (err.message) {
-        resolve(err.message)
-      }
-    })
-  })
-}
-
 export function get (url, params) {
  return new Promise((resolve) => {
    axios.get(url, {
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -346,33 +346,11 @@ export const clickOutside = {
    delete el.__vueClickOutside__
  }
 }
-
-const noDataDom = document.createElement('div')
-noDataDom.setAttribute('class', 'no-data')
-noDataDom.innerText = 'No data'
 export const noData = {
  updated (el, binding) {
-    if (el && binding.oldValue !== binding.value) {
+    if (el) {
      if (binding.value) {
-        setTimeout(() => {
-          el.childNodes.forEach(node => {
-            node.style && (node.style.display = 'none')
-          })
-          el.insertBefore(noDataDom, el.childNodes[0])
-        })
-      } else {
-        setTimeout(() => {
-          for (let i = 0; i < el.childNodes.length; i++) {
-            const node = el.childNodes[i]
-            if (node.innerText === 'No data') {
-              el.removeChild(node)
-              break
-            }
-          }
-          el.childNodes.forEach(node => {
-            node.style && (node.style.display = '')
-          })
-        })
+        el.innerHTML = '<div style="display: flex; justify-content: center; align-items: center; height: 100%; width: 100%; color: #999;">No data</div>'
      }
    }
  }
--- a/src/views/charts/Chart.vue
+++ b/src/views/charts/Chart.vue
@@ -857,8 +857,7 @@ export default {
        polygonTemplate.strokeWidth = 0.5
        polygonTemplate.fill = am4Core.color('rgba(176,196,222,.5)')
        polygonTemplate.events.on('hit', ev => {
-          let countryId = ev.target.dataItem.dataContext.id
-          countryId = countryId === 'Private IP' ? 'China' : countryId
+          const countryId = ev.target.dataItem.dataContext.id
          if (countryId) {
            ev.target.series.chart.zoomToMapObject(ev.target)
            ev.target.isHover = false
@@ -1285,21 +1284,24 @@ export default {
    initSankey (chartParams) {
      const vm = this
      const entityName = this.entity.ip || this.entity.domain || this.entity.app
-      const queryParams = { ...this.queryTimeRange, ...this.entity }
      this.chartOption.series[0].tooltip = {
-        formatter: function (param) {
+        formatter: function ({ name }) {
          return `
            <div class="sankey__tooltip">
              <div class="sankey__tooltip-row">
                <div class="sankey__row-label">Via:</div>
-                <div class="sankey__row-value">${param.data.name}</div>
+                <div class="sankey__row-value">1521</div>
+              </div>
+              <div class="sankey__tooltip-row">
+                <div class="sankey__row-label">To:</div>
+                <div class="sankey__row-value">21522</div>
              </div>
              <div class="sankey__tooltip-row">
                <div style="margin: 6px 0; height: 1px; width: 100%; background-color: #E7EAED;"></div>
              </div>
              <div class="sankey__tooltip-row">
                <div class="sankey__row-label">Traffic:</div>
-                <div class="sankey__row-value">${param.data.convert[0]}${param.data.convert[1]}&nbsp;(${param.data.percent[0]}%)</div>
+                <div class="sankey__row-value">150bps(8%)</div>
              </div>
              <div class="sankey__tooltip-row">
                <div class="sankey__row-label">Performance:</div>
@@ -1307,151 +1309,150 @@ export default {
              <div class="sankey__tooltip-table">
                <div class="sankey__table-row">
                  <div class="sankey__table-cell">${vm.$t('networkAppPerformance.tripTime')}:</div>
-                  <div class="sankey__table-cell">${param.data.latency[0]}&nbsp;${param.data.latency[1]}</div>
+                  <div class="sankey__table-cell">58ms</div>
                </div>
                <div class="sankey__table-row">
                  <div class="sankey__table-cell">${vm.$t('overall.packetLoss')}:</div>
-                  <div class="sankey__table-cell">${param.data.lossPercent[0]}&nbsp;%</div>
+                  <div class="sankey__table-cell">5%</div>
                </div>
                <div class="sankey__table-row">
                  <div class="sankey__table-cell">${vm.$t('overall.packetRetrans')}:</div>
-                  <div class="sankey__table-cell">${param.data.retransPercent[0]}&nbsp;%</div>
+                  <div class="sankey__table-cell">58%</div>
                </div>
              </div>
            </div>
          `
        }
      }
-      get(replaceUrlPlaceholder(chartParams.url, queryParams)).then(response => {
-        if (response.code === 200) {
-          if (this.$_.isEmpty(response.data.result)) {
-            this.noData = true
-          } else {
-            this.noData = false
-            let inTotalValue = 0
-            let outTotalValue = 0
-
-            /* 测试代码
-            const t = []
-            for (const k in response.data.result) {
-              t.push(response.data.result[k])
-            }
-            response.data.result = t */
-
-            response.data.result.forEach(item => {
-              if (item.direction === 'in') {
-                inTotalValue += parseInt(item.bytes)
-              } else if (item.direction === 'out') {
-                outTotalValue += parseInt(item.bytes)
-              }
-            })
-            const data = response.data.result.map(item => {
-              return {
-                ...item,
-                name: item.linkID,
-                percent: valueToRangeValue(parseInt(item.bytes) / (item.direction === 'in' ? inTotalValue : outTotalValue) * 100, unitTypes.percent),
-                convert: unitConvert(item.bytes, unitTypes.byte),
-                latency: valueToRangeValue(item.latency, unitTypes.time),
-                lossPercent: valueToRangeValue(item.lossPercent, unitTypes.percent),
-                retransPercent: valueToRangeValue(item.retransPercent, unitTypes.percent),
-                bytes: parseFloat(item.bytes)
-              }
-            })
-            data.push({ name: entityName })
-
-            const link = data.map(item => {
-              const source = item.direction === 'in' ? item.linkID : entityName
-              const target = item.direction === 'in' ? entityName : item.linkID
-              return {
-                ...item,
-                source,
-                target,
-                value: item.bytes
-              }
-            })
-            this.chartOption.series[0].data = data
-            this.chartOption.series[0].links = link
-            this.myChart.setOption(this.chartOption)
+      this.chartOption.series[0].data = [
+        {
+          name: '1521'
+        },
+        {
+          name: '2714'
+        },
+        {
+          name: entityName,
+          label: {
+            show: false
          }
+        },
+        {
+          name: '21521'
+        },
+        {
+          name: '22714'
+        },
+        {
+          name: '29047'
+        },
+        {
+          name: '21522'
+        },
+        {
+          name: '22715'
+        },
+        {
+          name: '29048'
+        },
+        {
+          name: '121521'
+        },
+        {
+          name: '122714'
+        },
+        {
+          name: '129047'
+        },
+        {
+          name: '121522'
+        },
+        {
+          name: '122715'
+        },
+        {
+          name: '129048'
        }
-      }).finally(() => {
-        setTimeout(() => {
-          this.loading = false
-          this.$nextTick(() => {
-            this.echartsResize()
-          })
-        }, 250)
-      })
-      /* const inDirection = new Promise(resolve =>
-        get(replaceUrlPlaceholder(chartParams.url, { ...queryParams, direction: 'ingress' })).then(response => {
-          if (response.code === 200) {
-            if (this.$_.isEmpty(response.data.result)) {
-              this.noData = true
-            } else {
-              this.noData = false
-              resolve(handleData(response.data.result, 'in'))
-            }
-          }
-          resolve()
-        })
-      )
-      const outDirection = new Promise(resolve =>
-        get(replaceUrlPlaceholder(chartParams.url, { ...queryParams, direction: 'egress' })).then(response => {
-          if (response.code === 200) {
-            if (this.$_.isEmpty(response.data.result)) {
-              this.noData = true
-            } else {
-              this.noData = false
-              resolve(handleData(response.data.result, 'out'))
-            }
-          }
-          resolve()
-        })
-      )
-      Promise.all([inDirection, outDirection]).then(responses => {
-        const inData = responses[0]
-        const outData = responses[1]
-        this.chartOption.series[0].data = inData.data.concat(outData.data)
-        this.chartOption.series[0].links = inData.link.concat(outData.link)
-        this.myChart.setOption(this.chartOption)
-      }).finally(() => {
-        setTimeout(() => {
-          this.loading = false
-          this.$nextTick(() => {
-            this.echartsResize()
-          })
-        }, 250)
-      })
-
-      function handleData (originalData, direction) {
-        let totalValue = 0
-        originalData.forEach(item => {
-          totalValue += parseInt(item.bytes)
-        })
-        const data = originalData.map(item => {
-          return {
-            ...item,
-            name: item.linkID,
-            percent: unitConvert(parseInt(item.bytes) / totalValue, unitTypes.byte),
-            bytes: unitConvert(item.bytes, unitTypes.byte)
-          }
-        })
-
-        const link = data.map(item => {
-          const source = direction === 'in' ? item.linkID : entityName
-          const target = direction === 'in' ? entityName : item.linkID
-          return {
-            ...item,
-            source,
-            target,
-            value: item.bytes
-          }
-        })
-        return {
-          data,
-          link
+      ]
+      this.chartOption.series[0].links = [
+        {
+          source: '1521',
+          target: entityName,
+          value: 6779
+        },
+        {
+          source: '2714',
+          target: entityName,
+          value: 4417
+        },
+        {
+          source: entityName,
+          target: '21521',
+          value: 704
+        },
+        {
+          source: entityName,
+          target: '22714',
+          value: 55
+        },
+        {
+          source: entityName,
+          target: '29047',
+          value: 509
+        },
+        {
+          source: entityName,
+          target: '21522',
+          value: 3140
+        },
+        {
+          source: entityName,
+          target: '22715',
+          value: 550
+        },
+        {
+          source: entityName,
+          target: '29048',
+          value: 1290
+        },
+        {
+          source: entityName,
+          target: '121521',
+          value: 704
+        },
+        {
+          source: entityName,
+          target: '122714',
+          value: 55
+        },
+        {
+          source: entityName,
+          target: '129047',
+          value: 509
+        },
+        {
+          source: entityName,
+          target: '121522',
+          value: 2040
+        },
+        {
+          source: entityName,
+          target: '122715',
+          value: 550
+        },
+        {
+          source: entityName,
+          target: '129048',
+          value: 1090
        }
-      } */
+      ]
+      this.myChart.setOption(this.chartOption)
+      setTimeout(() => {
+        this.loading = false
+        this.$nextTick(() => {
+          this.echartsResize()
+        })
+      }, 250)
    },
    initIpOpenPort (chartParams) {
      get(replaceUrlPlaceholder(chartParams.url, { ip: this.entity.ip })).then(response => {
@@ -2080,7 +2081,7 @@ export default {
 }
 .sankey__tooltip {
  width: 270px;
-  height: 170px;
+  height: 200px;
  padding: 5px;
  display: flex;
  flex-direction: column;
--- a/src/views/charts/Panel.vue
+++ b/src/views/charts/Panel.vue
@@ -63,15 +63,7 @@
    </div>
    <div class="entity-detail__body">
      <div class="cn-panel">
-        <chart
-            v-for="chart in detailChartList"
-            :key="chart.id"
-            :chart="chart"
-            :time-filter="timeFilter"
-            :ref="`chart-${chart.id}`"
-            :entity="entity"
-            @getCurrentTimeRange="getCurrentTimeRange"
-        ></chart>
+        <chart v-for="chart in detailChartList" :key="chart.id" :chart="chart" :time-filter="timeFilter" :ref="`chart-${chart.id}`" :entity="entity"></chart>
      </div>
    </div>
  </div>
--- a/src/views/settings/GalaxyProxy.vue
+++ b/src/views/settings/GalaxyProxy.vue
@@ -18,23 +18,6 @@
                type="button" @click="add">
          <i class="cn-icon-add cn-icon"></i>
        </button>
-        <button id="galaxy-proxy-debug" class="top-tool-btn margin-r-10"  :title="$t('overall.debug')"
-                type="button" @click="debug(true,{})">
-          <i class="cn-icon-category cn-icon"></i>
-        </button>
-        <top-tool-more-options
-                ref="export"
-                id="model"
-                :params="searchLabel"
-                class="top-tool-export margin-l-10 margin-r-10"
-                export-file-name="galaxyProxy"
-                export-url="/galaxy/setting/export"
-                import-url="/galaxy/setting/import"
-                @afterImport="getTableData"
-        >
-          <template v-slot:before>
-          </template>
-        </top-tool-more-options>
      </template>
      <template v-slot:default>
        <galaxy-proxy-table
@@ -50,7 +33,6 @@
            @reload="getTableData"
            @selectionChange="selectionChange"
            @copy="copy"
-            @debug="debugRow"
        ></galaxy-proxy-table>
      </template>
      <!-- 分页组件 -->
@@ -67,11 +49,6 @@
      <galaxy-proxy-box :object="object" @close="closeRightBox"></galaxy-proxy-box>
    </el-drawer>
  </div>
-  <galaxy-proxy-debug
-          v-model:show-debug="showDebug"
-          top="5vh"
-          :show-close="false"
-          :curGalaxyProxy="curGalaxyProxy"></galaxy-proxy-debug>
 </template>

 <script>
@@ -81,17 +58,13 @@ import galaxyProxyTable from '@/components/table/settings/GalaxyProxyTable'
 import dataListMixin from '@/mixins/dataList'
 import { api } from '@/utils/api'
 import { get, put } from '@/utils/http'
-import topToolMoreOptions from '@/components/common/popBox/topToolMoreOptions'
-import galaxyProxyDebug from '@/components/setting/GalaxyProxyDebug'

 export default {
  name: 'GalaxyProxy',
  components: {
    cnDataList,
    galaxyProxyBox,
-    galaxyProxyTable,
-    topToolMoreOptions,
-    galaxyProxyDebug
+    galaxyProxyTable
  },
  mixins: [dataListMixin],
  data () {
@@ -100,9 +73,7 @@ export default {
      tableId: 'galaxySettingTable', // 需要分页的table的id，用于记录每页数量
      blankObject: { // 空白对象
        name: ''
-      },
-      showDebug: false,
-      curGalaxyProxy: {}
+      }
    }
  },
  methods: {
@@ -119,15 +90,6 @@ export default {
        }
      })
    },
-    debug (isTopDebug, u) {
-      if (!isTopDebug && u) {
-        this.curGalaxyProxy = JSON.parse(JSON.stringify(u))
-      }
-      this.showDebug = true
-    },
-    debugRow (u) {
-      this.debug(false, u)
-    },
    clearCache () {
      put(`${this.url}/clearCache`).then(response => {
        if (response.code === 200) {
@@ -139,7 +101,6 @@ export default {
        this.$message.error(this.$t('tip.unknownError'))
      })
    }
-
  }
 }
 </script>
Author	SHA1	Message	Date
张帅	1e5a6dab7f	Update .gitlab-ci.yml	2021-10-25 07:19:30 +00:00
张帅	aa0d0a3921	Update .gitlab-ci.yml	2021-10-25 07:11:56 +00:00
张帅	f7ea7f1a6c	Update .gitlab-ci.yml	2021-10-25 07:04:20 +00:00
张帅	1b3fe6cbd4	Update Dockerfile	2021-10-25 06:07:00 +00:00
张帅	36f5904766	Update Dockerfile	2021-10-25 05:58:16 +00:00
张帅	81a429b171	Update Dockerfile	2021-10-25 03:45:46 +00:00
张帅	d9a2821195	Update Dockerfile	2021-10-25 03:17:01 +00:00
zhangshuai	730e94f252	feat :还原Tiles文件	2021-10-23 21:34:13 +08:00
zhangshuai	c2d53e9209	feat :删除Tiles文件	2021-10-23 21:07:09 +08:00
张帅	b1673491c6	Update .gitlab-ci.yml	2021-10-22 09:53:40 +00:00
张帅	ebd19390ed	Update .gitlab-ci.yml	2021-10-22 09:44:32 +00:00
方顺健	315e127083	Update package.json	2021-10-22 07:20:06 +00:00
方顺健	c80cf743be	Update .gitlab-ci.yml file	2021-10-20 02:43:53 +00:00
方顺健	60ec39b5c9	Update .gitlab-ci.yml file	2021-10-20 02:35:16 +00:00
方顺健	a413eb6aed	Update .gitlab-ci.yml file	2021-10-20 02:12:17 +00:00
方顺健	56e30dfe47	Update .gitlab-ci.yml	2021-10-20 02:08:03 +00:00