From 1e48f0b479cc14e155c9ede7c932f8ad3331fe02 Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Tue, 30 Apr 2024 16:12:26 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E"=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83"=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-oper-web/src/utils/loadTinymce.js              | 3 ++-
 epmet-oper-web/src/views/modules/dyform/formList.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-oper-web/src/utils/loadTinymce.js b/epmet-oper-web/src/utils/loadTinymce.js
index ff84740..f3704d6 100644
--- a/epmet-oper-web/src/utils/loadTinymce.js
+++ b/epmet-oper-web/src/utils/loadTinymce.js
@@ -17,7 +17,8 @@ export default function loadTinymce(cb) {
         background: 'rgba(255, 255, 255, 0.5)'
     })
 
-    loadScript('https://lib.baomitu.com/tinymce/latest/tinymce.min.js', () => {
+    // loadScript('https://lib.baomitu.com/tinymce/latest/tinymce.min.js', () => {
+    loadScript('http://lib.baomitu.com/tinymce/4.9.2/tinymce.min.js', () => {
         loading.close()
         // eslint-disable-next-line no-undef
         tinymceObj = tinymce
diff --git a/epmet-oper-web/src/views/modules/dyform/formList.vue b/epmet-oper-web/src/views/modules/dyform/formList.vue
index efd0935..d193e88 100644
--- a/epmet-oper-web/src/views/modules/dyform/formList.vue
+++ b/epmet-oper-web/src/views/modules/dyform/formList.vue
@@ -137,7 +137,7 @@ export default {
             } else {
               this.$message({
                 type: 'error',
-                nessage: res.msg
+                message: res.msg
               })
             }
 

From bc1cbd60360fa0915c937c107226aa4cb6dfb839 Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Tue, 30 Apr 2024 16:14:42 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E"=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83"=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/upgrade-version-history.vue   | 211 ++++++++++++++++++
 1 file changed, 211 insertions(+)
 create mode 100644 epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue

diff --git a/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue b/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue
new file mode 100644
index 0000000..9f3639d
--- /dev/null
+++ b/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue
@@ -0,0 +1,211 @@
+<template>
+  <div>
+    <el-card shadow="never"
+             class="aui-card--fill">
+
+      <!-- 按钮 -->
+      <div class="btn-group">
+        <el-button type="primary" @click="onAddBtnClick">新增</el-button>
+        <el-button type="primary" @click="onEditBtnClick">修改</el-button>
+      </div>
+
+      <!-- 数据列表 -->
+      <div>
+        <el-table :data="histories" border style="width: 100%">
+          <el-table-column
+              prop="versionNo"
+              label="版本">
+          </el-table-column>
+          <el-table-column label="操作" :width="250">
+            <template slot-scope="scope">
+              <el-button type="primary" size="small" @click="onEditBtnClick(scope.row.id)">编辑</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </div>
+
+      <!-- 分页条-->
+      <el-pagination
+          background
+          layout="prev, pager, next"
+          @current-change="onCurrentPageChanged"
+          :current-page="this.pageArgs.pageNo"
+          :page-size="this.pageArgs.pageSize"
+          :total="this.pageArgs.total">
+      </el-pagination>
+
+      <!--      <Tinymce
+                v-model="createOrUpdateForm.richContent"
+                :width="450"
+                :height="500"
+            />-->
+    </el-card>
+
+    <!-- 新增/修改 -->
+    <el-dialog :visible.sync="this.publishVersionUpgradeShow"
+               v-if="this.publishVersionUpgradeShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="this.operation === 'create' ? '发布新版本' : '修改'">
+      <el-form :model="createOrUpdateForm" ref="createOrUpdateForm">
+        <el-form-item prop="versionNo" label="版本">
+          <el-input v-model="createOrUpdateForm.versionNo">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item prop="richContent" label="内容">
+          <el-input v-model="createOrUpdateForm.richContent">
+          </el-input>
+        </el-form-item>
+        <el-button @click="onSubmitBtnClick" type="primary">提交</el-button>
+        <el-button @click="onCancelBtnClick" type="primary">取消</el-button>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+
+<script>
+
+import Tinymce from '@c/tinymce/index.vue'
+
+export default {
+
+  components: {
+    Tinymce
+  },
+
+  activated() {
+    this.loadVersionUpgradeHistories();
+  },
+
+  data() {
+    return {
+      histories: [],
+      queryForm: {},
+      createOrUpdateForm: {
+        id: null,
+        versionNo: null,
+        richContent: null,
+      },
+      publishVersionUpgradeShow: false,
+      operation: 'create', // create  edit
+      pageArgs: {
+        pageNo: 1,
+        pageSize: 20,
+        total: 0,
+      }
+    };
+  },
+
+  methods: {
+    /**
+     * 加载版本更新历史
+     */
+    loadVersionUpgradeHistories() {
+      debugger
+      this.$http.get(`/sys/sysVersionUpgrade/page?pageNo=${this.pageArgs.pageNo}&pageSize=${this.pageArgs.pageSize}`)
+          .then(({data: result, status: httpStatus}) => {
+            if (result.code === 0) {
+              this.histories = result.data.list
+              this.pageArgs.total = result.data.total
+            } else {
+              this.$message({
+                type: 'error',
+                message: result.msg
+              })
+            }
+          })
+    },
+
+    // 新增按钮点击
+    onAddBtnClick() {
+      this.publishVersionUpgradeShow = true;
+      this.operation = 'create';
+    },
+
+    // 编辑按钮点击
+    onEditBtnClick(id) {
+      this.publishVersionUpgradeShow = true;
+      this.operation = 'edit';
+      this.getDetail(id);
+    },
+
+    onCancelBtnClick() {
+      this.$refs['createOrUpdateForm'].resetFields();
+      this.publishVersionUpgradeShow = false;
+      this.operation = null;
+    },
+
+    /**
+     * 翻页
+     */
+    onCurrentPageChanged(pageNo) {
+      this.pageArgs.pageNo = pageNo
+      this.loadVersionUpgradeHistories()
+    },
+
+    /**
+     * 提交
+     */
+    onSubmitBtnClick() {
+      let url = this.operation === 'create' ? `/sys/sysVersionUpgrade/publish` : '/sys/sysVersionUpgrade/update';
+      this.$http.post(url, this.$data.createOrUpdateForm)
+          .then(({data: rst, status: httpStatus}) => {
+            if (httpStatus !== 200) {
+              this.$message({
+                type: 'error',
+                message: '请求失败'
+              })
+            } else if (rst.code !== 0) {
+              this.$message({
+                type: 'error',
+                message: rst.msg
+              });
+            } else {
+              this.$message({
+                type: 'success',
+                message: '提交成功'
+              });
+
+              this.$refs['createOrUpdateForm'].resetFields();
+              this.publishVersionUpgradeShow = false;
+              this.loadVersionUpgradeHistories();
+            }
+          })
+    },
+
+    /**
+     * 加载详情
+     * @param id
+     */
+    getDetail(id) {
+      this.$http.get(`/sys/sysVersionUpgrade/detail/${id}`)
+          .then(({status: httpStatus, data: epmetRst}) => {
+            debugger
+            if (httpStatus !== 200) {
+              this.$message({
+                type: 'error',
+                message: '请求失败'
+              })
+            } else if (epmetRst.code != 0) {
+              this.$message({
+                type: 'error',
+                message: epmetRst.msg
+              })
+            } else {
+              this.createOrUpdateForm = epmetRst.data;
+            }
+          })
+    }
+  }
+}
+</script>
+
+<style scoped lang="css">
+.tinymce_view {
+  height: 400px;
+  overflow: auto;
+}
+</style>

From cb4d9e03d0dbdcaff6a7c748525039d64deaf830 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 30 Apr 2024 17:15:47 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-oper-web/.env.development               |   5 +-
 .../modules/sys/upgrade-version-history.vue   | 120 +++++++++++++++---
 2 files changed, 104 insertions(+), 21 deletions(-)

diff --git a/epmet-oper-web/.env.development b/epmet-oper-web/.env.development
index ff7625b..bc8d0ec 100644
--- a/epmet-oper-web/.env.development
+++ b/epmet-oper-web/.env.development
@@ -1,8 +1,9 @@
 NODE_ENV=development
 # VUE_APP_API_SERVER =  http://118.190.150.119:41080/api
-VUE_APP_API_SERVER =  http://localhost:8080/api
-# VUE_APP_API_SERVER =  http://192.168.51.36:8080/api
+# VUE_APP_API_SERVER =  http://localhost:8080/api
+VUE_APP_API_SERVER =  http://192.168.1.144/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
+
 VUE_APP_NODE_ENV=dev
 #项目根路径
 VUE_APP_PUBLIC_PATH=epmet-oper
diff --git a/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue b/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue
index 9f3639d..fd5c2a0 100644
--- a/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue
+++ b/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue
@@ -43,8 +43,8 @@
     </el-card>
 
     <!-- 新增/修改 -->
-    <el-dialog :visible.sync="this.publishVersionUpgradeShow"
-               v-if="this.publishVersionUpgradeShow"
+    <el-dialog :visible.sync="publishVersionUpgradeShow"
+               v-if="publishVersionUpgradeShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="this.operation === 'create' ? '发布新版本' : '修改'">
@@ -55,8 +55,25 @@
         </el-form-item>
 
         <el-form-item prop="richContent" label="内容">
-          <el-input v-model="createOrUpdateForm.richContent">
-          </el-input>
+          <!-- <el-input v-model="createOrUpdateForm.richContent"> -->
+        <!-- <Tinymce v-model="createOrUpdateForm.richContent" :height="300" placeholder="在这里输入文字" /> -->
+        
+        <!-- :customerId="customerId" -->
+        <div id="J_quillEditor"></div>
+        <!-- 自定义上传图片功能 (使用element upload组件) -->
+        <el-upload
+          :headers="$getElUploadHeaders()"
+          :action="uploadUrl"
+          :show-file-list="false"
+          :before-upload="uploadBeforeUploadHandle"
+          :on-success="uploadSuccessHandle"
+          style="display: none"
+        >
+          <el-button ref="uploadBtn" type="primary" size="small">{{
+            $t('upload.button')
+          }}</el-button>
+        </el-upload>
+          <!-- </el-input> -->
         </el-form-item>
         <el-button @click="onSubmitBtnClick" type="primary">提交</el-button>
         <el-button @click="onCancelBtnClick" type="primary">取消</el-button>
@@ -67,21 +84,38 @@
 
 
 <script>
-
-import Tinymce from '@c/tinymce/index.vue'
-
+import Cookies from 'js-cookie'
+import 'quill/dist/quill.snow.css'
+import Quill from 'quill'
 export default {
 
-  components: {
-    Tinymce
-  },
+  components: {},
 
   activated() {
     this.loadVersionUpgradeHistories();
   },
-
+  mounted(){
+    
+  },
   data() {
     return {
+      quillEditor: null,
+      quillEditorToolbarOptions: [
+        ['bold', 'italic', 'underline', 'strike'],
+        ['blockquote', 'code-block', 'image'],
+        [{ header: 1 }, { header: 2 }],
+        [{ list: 'ordered' }, { list: 'bullet' }],
+        [{ script: 'sub' }, { script: 'super' }],
+        [{ indent: '-1' }, { indent: '+1' }],
+        [{ direction: 'rtl' }],
+        [{ size: ['small', false, 'large', 'huge'] }],
+        [{ header: [1, 2, 3, 4, 5, 6, false] }],
+        [{ color: [] }, { background: [] }],
+        [{ font: [] }],
+        [{ align: [] }],
+        ['clean']
+      ],
+      uploadUrl: '',
       histories: [],
       queryForm: {},
       createOrUpdateForm: {
@@ -100,11 +134,54 @@ export default {
   },
 
   methods: {
+    // 图片上传前
+    uploadBeforeUploadHandle(file) {
+      if (
+        file.type !== 'image/jpg' &&
+        file.type !== 'image/jpeg' &&
+        file.type !== 'image/png' &&
+        file.type !== 'image/gif'
+      ) {
+        this.$message.error(this.$t('upload.tip', { format: 'jpg、png、gif' }))
+        return false
+      }
+    },
+    // 上传图片成功
+    uploadSuccessHandle(res, file, fileList) {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.quillEditor.insertEmbed(
+        this.quillEditor.getSelection().index,
+        'image',
+        res.data.url
+      )
+    },
+    // 加载富文本编辑器
+    initQuill() {
+      console.log(document.getElementById('J_quillEditor'));
+      this.quillEditor = new Quill('#J_quillEditor', {
+        modules: {
+          toolbar: this.quillEditorToolbarOptions
+        },
+        theme: 'snow'
+      })
+      // 自定义上传图片功能 (使用element upload组件)
+      this.uploadUrl = `${
+        window.SITE_CONFIG['apiURL']
+      }/oss/file/upload?token=${Cookies.get('token')}`
+      this.quillEditor.getModule('toolbar').addHandler('image', () => {
+        this.$refs.uploadBtn.$el.click()
+      })
+      // 监听内容变化，动态赋值
+      this.quillEditor.on('text-change', () => {
+        this.createOrUpdateForm.richContent = this.quillEditor.root.innerHTML
+      })
+    },
     /**
      * 加载版本更新历史
      */
     loadVersionUpgradeHistories() {
-      debugger
       this.$http.get(`/sys/sysVersionUpgrade/page?pageNo=${this.pageArgs.pageNo}&pageSize=${this.pageArgs.pageSize}`)
           .then(({data: result, status: httpStatus}) => {
             if (result.code === 0) {
@@ -118,24 +195,29 @@ export default {
             }
           })
     },
-
     // 新增按钮点击
     onAddBtnClick() {
       this.publishVersionUpgradeShow = true;
       this.operation = 'create';
+      this.$nextTick(()=>{
+        this.initQuill()
+      })
     },
 
     // 编辑按钮点击
-    onEditBtnClick(id) {
+    async onEditBtnClick(id) {
       this.publishVersionUpgradeShow = true;
       this.operation = 'edit';
-      this.getDetail(id);
+      await this.getDetail(id);
+      await this.initQuill();
+
     },
 
     onCancelBtnClick() {
       this.$refs['createOrUpdateForm'].resetFields();
       this.publishVersionUpgradeShow = false;
       this.operation = null;
+      this.quillEditor = null;
     },
 
     /**
@@ -183,7 +265,6 @@ export default {
     getDetail(id) {
       this.$http.get(`/sys/sysVersionUpgrade/detail/${id}`)
           .then(({status: httpStatus, data: epmetRst}) => {
-            debugger
             if (httpStatus !== 200) {
               this.$message({
                 type: 'error',
@@ -196,6 +277,8 @@ export default {
               })
             } else {
               this.createOrUpdateForm = epmetRst.data;
+            this.quillEditor.root.innerHTML = this.createOrUpdateForm.richContent
+
             }
           })
     }
@@ -204,8 +287,7 @@ export default {
 </script>
 
 <style scoped lang="css">
-.tinymce_view {
-  height: 400px;
-  overflow: auto;
+::v-deep .ql-toolbar{
+  margin-top: 36px;
 }
 </style>

From a0423e467a420b360ff48410b35a0b7b6723196c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 30 Apr 2024 17:54:52 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/upgrade-version-history.vue   | 184 ++++++++----------
 1 file changed, 83 insertions(+), 101 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue b/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue
index fd5c2a0..27ae6e9 100644
--- a/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue
+++ b/epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
-    <el-card shadow="never"
-             class="aui-card--fill">
+    <el-card shadow="never" class="aui-card--fill">
 
       <!-- 按钮 -->
       <div class="btn-group">
@@ -12,11 +11,9 @@
       <!-- 数据列表 -->
       <div>
         <el-table :data="histories" border style="width: 100%">
-          <el-table-column
-              prop="versionNo"
-              label="版本">
+          <el-table-column prop="versionNo" label="版本">
           </el-table-column>
-          <el-table-column label="操作" :width="250">
+          <el-table-column label="操作" :width="80">
             <template slot-scope="scope">
               <el-button type="primary" size="small" @click="onEditBtnClick(scope.row.id)">编辑</el-button>
             </template>
@@ -26,13 +23,8 @@
       </div>
 
       <!-- 分页条-->
-      <el-pagination
-          background
-          layout="prev, pager, next"
-          @current-change="onCurrentPageChanged"
-          :current-page="this.pageArgs.pageNo"
-          :page-size="this.pageArgs.pageSize"
-          :total="this.pageArgs.total">
+      <el-pagination background layout="prev, pager, next" @current-change="onCurrentPageChanged"
+        :current-page="this.pageArgs.pageNo" :page-size="this.pageArgs.pageSize" :total="this.pageArgs.total">
       </el-pagination>
 
       <!--      <Tinymce
@@ -43,11 +35,8 @@
     </el-card>
 
     <!-- 新增/修改 -->
-    <el-dialog :visible.sync="publishVersionUpgradeShow"
-               v-if="publishVersionUpgradeShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="this.operation === 'create' ? '发布新版本' : '修改'">
+    <el-dialog :visible.sync="publishVersionUpgradeShow" v-if="publishVersionUpgradeShow" :close-on-click-modal="false"
+      :close-on-press-escape="false" :title="this.operation === 'create' ? '发布新版本' : '修改'">
       <el-form :model="createOrUpdateForm" ref="createOrUpdateForm">
         <el-form-item prop="versionNo" label="版本">
           <el-input v-model="createOrUpdateForm.versionNo">
@@ -56,23 +45,17 @@
 
         <el-form-item prop="richContent" label="内容">
           <!-- <el-input v-model="createOrUpdateForm.richContent"> -->
-        <!-- <Tinymce v-model="createOrUpdateForm.richContent" :height="300" placeholder="在这里输入文字" /> -->
-        
-        <!-- :customerId="customerId" -->
-        <div id="J_quillEditor"></div>
-        <!-- 自定义上传图片功能 (使用element upload组件) -->
-        <el-upload
-          :headers="$getElUploadHeaders()"
-          :action="uploadUrl"
-          :show-file-list="false"
-          :before-upload="uploadBeforeUploadHandle"
-          :on-success="uploadSuccessHandle"
-          style="display: none"
-        >
-          <el-button ref="uploadBtn" type="primary" size="small">{{
-            $t('upload.button')
-          }}</el-button>
-        </el-upload>
+          <!-- <Tinymce v-model="createOrUpdateForm.richContent" :height="300" placeholder="在这里输入文字" /> -->
+
+          <!-- :customerId="customerId" -->
+          <div id="J_quillEditor"></div>
+          <!-- 自定义上传图片功能 (使用element upload组件) -->
+          <el-upload :headers="$getElUploadHeaders()" :action="uploadUrl" :show-file-list="false"
+            :before-upload="uploadBeforeUploadHandle" :on-success="uploadSuccessHandle" style="display: none">
+            <el-button ref="uploadBtn" type="primary" size="small">{{
+              $t('upload.button')
+              }}</el-button>
+          </el-upload>
           <!-- </el-input> -->
         </el-form-item>
         <el-button @click="onSubmitBtnClick" type="primary">提交</el-button>
@@ -91,13 +74,13 @@ export default {
 
   components: {},
 
-  activated() {
+  activated () {
     this.loadVersionUpgradeHistories();
   },
-  mounted(){
-    
+  mounted () {
+
   },
-  data() {
+  data () {
     return {
       quillEditor: null,
       quillEditorToolbarOptions: [
@@ -135,7 +118,7 @@ export default {
 
   methods: {
     // 图片上传前
-    uploadBeforeUploadHandle(file) {
+    uploadBeforeUploadHandle (file) {
       if (
         file.type !== 'image/jpg' &&
         file.type !== 'image/jpeg' &&
@@ -147,7 +130,7 @@ export default {
       }
     },
     // 上传图片成功
-    uploadSuccessHandle(res, file, fileList) {
+    uploadSuccessHandle (res, file, fileList) {
       if (res.code !== 0) {
         return this.$message.error(res.msg)
       }
@@ -158,7 +141,7 @@ export default {
       )
     },
     // 加载富文本编辑器
-    initQuill() {
+    initQuill () {
       console.log(document.getElementById('J_quillEditor'));
       this.quillEditor = new Quill('#J_quillEditor', {
         modules: {
@@ -167,9 +150,8 @@ export default {
         theme: 'snow'
       })
       // 自定义上传图片功能 (使用element upload组件)
-      this.uploadUrl = `${
-        window.SITE_CONFIG['apiURL']
-      }/oss/file/upload?token=${Cookies.get('token')}`
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']
+        }/oss/file/upload?token=${Cookies.get('token')}`
       this.quillEditor.getModule('toolbar').addHandler('image', () => {
         this.$refs.uploadBtn.$el.click()
       })
@@ -181,31 +163,31 @@ export default {
     /**
      * 加载版本更新历史
      */
-    loadVersionUpgradeHistories() {
+    loadVersionUpgradeHistories () {
       this.$http.get(`/sys/sysVersionUpgrade/page?pageNo=${this.pageArgs.pageNo}&pageSize=${this.pageArgs.pageSize}`)
-          .then(({data: result, status: httpStatus}) => {
-            if (result.code === 0) {
-              this.histories = result.data.list
-              this.pageArgs.total = result.data.total
-            } else {
-              this.$message({
-                type: 'error',
-                message: result.msg
-              })
-            }
-          })
+        .then(({ data: result, status: httpStatus }) => {
+          if (result.code === 0) {
+            this.histories = result.data.list
+            this.pageArgs.total = result.data.total
+          } else {
+            this.$message({
+              type: 'error',
+              message: result.msg
+            })
+          }
+        })
     },
     // 新增按钮点击
-    onAddBtnClick() {
+    onAddBtnClick () {
       this.publishVersionUpgradeShow = true;
       this.operation = 'create';
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.initQuill()
       })
     },
 
     // 编辑按钮点击
-    async onEditBtnClick(id) {
+    async onEditBtnClick (id) {
       this.publishVersionUpgradeShow = true;
       this.operation = 'edit';
       await this.getDetail(id);
@@ -213,7 +195,7 @@ export default {
 
     },
 
-    onCancelBtnClick() {
+    onCancelBtnClick () {
       this.$refs['createOrUpdateForm'].resetFields();
       this.publishVersionUpgradeShow = false;
       this.operation = null;
@@ -223,7 +205,7 @@ export default {
     /**
      * 翻页
      */
-    onCurrentPageChanged(pageNo) {
+    onCurrentPageChanged (pageNo) {
       this.pageArgs.pageNo = pageNo
       this.loadVersionUpgradeHistories()
     },
@@ -231,63 +213,63 @@ export default {
     /**
      * 提交
      */
-    onSubmitBtnClick() {
+    onSubmitBtnClick () {
       let url = this.operation === 'create' ? `/sys/sysVersionUpgrade/publish` : '/sys/sysVersionUpgrade/update';
       this.$http.post(url, this.$data.createOrUpdateForm)
-          .then(({data: rst, status: httpStatus}) => {
-            if (httpStatus !== 200) {
-              this.$message({
-                type: 'error',
-                message: '请求失败'
-              })
-            } else if (rst.code !== 0) {
-              this.$message({
-                type: 'error',
-                message: rst.msg
-              });
-            } else {
-              this.$message({
-                type: 'success',
-                message: '提交成功'
-              });
+        .then(({ data: rst, status: httpStatus }) => {
+          if (httpStatus !== 200) {
+            this.$message({
+              type: 'error',
+              message: '请求失败'
+            })
+          } else if (rst.code !== 0) {
+            this.$message({
+              type: 'error',
+              message: rst.msg
+            });
+          } else {
+            this.$message({
+              type: 'success',
+              message: '提交成功'
+            });
 
-              this.$refs['createOrUpdateForm'].resetFields();
-              this.publishVersionUpgradeShow = false;
-              this.loadVersionUpgradeHistories();
-            }
-          })
+            this.$refs['createOrUpdateForm'].resetFields();
+            this.publishVersionUpgradeShow = false;
+            this.loadVersionUpgradeHistories();
+          }
+        })
     },
 
     /**
      * 加载详情
      * @param id
      */
-    getDetail(id) {
+    getDetail (id) {
       this.$http.get(`/sys/sysVersionUpgrade/detail/${id}`)
-          .then(({status: httpStatus, data: epmetRst}) => {
-            if (httpStatus !== 200) {
-              this.$message({
-                type: 'error',
-                message: '请求失败'
-              })
-            } else if (epmetRst.code != 0) {
-              this.$message({
-                type: 'error',
-                message: epmetRst.msg
-              })
-            } else {
-              this.createOrUpdateForm = epmetRst.data;
+        .then(({ status: httpStatus, data: epmetRst }) => {
+          if (httpStatus !== 200) {
+            this.$message({
+              type: 'error',
+              message: '请求失败'
+            })
+          } else if (epmetRst.code != 0) {
+            this.$message({
+              type: 'error',
+              message: epmetRst.msg
+            })
+          } else {
+            this.createOrUpdateForm = epmetRst.data;
             this.quillEditor.root.innerHTML = this.createOrUpdateForm.richContent
 
-            }
-          })
+          }
+        })
     }
   }
 }
 </script>
 
 <style scoped lang="css">
-::v-deep .ql-toolbar{
+::v-deep .ql-toolbar {
   margin-top: 36px;
 }
 </style>

From 1b183592facd8660b746d8d981fb00f0cb82e0b8 Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Wed, 3 Jul 2024 10:00:30 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96,=E8=BF=98=E6=9C=89=E4=BB=A3=E7=A0=81=E6=B2=A1?=
 =?UTF-8?q?=E6=94=BE=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/modules/customer/manage/customer-add-or-update.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue b/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue
index 40a9622..4e701fc 100644
--- a/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue
+++ b/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue
@@ -319,11 +319,6 @@ export default {
             return false;
           }
 
-          if (true) {
-            this.$message.info("成功");
-            return;
-          }
-
           console.log(this.dataForm);
           this.$http["post"]("/oper/crm/customer/initLocally", this.dataForm)
             .then(({ data: res }) => {

From 8109c4c47c66e2e3e644afddb52fb4a2a37abffe Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Fri, 5 Jul 2024 12:38:56 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=94=B5?=
 =?UTF-8?q?=E5=AD=90=E9=97=A8=E7=89=8Curi=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/customer-add-or-update.vue         | 73 +++++++++++--------
 1 file changed, 44 insertions(+), 29 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue b/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue
index 4e701fc..e95a1af 100644
--- a/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue
+++ b/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue
@@ -12,7 +12,7 @@
       @keyup.enter.native="dataFormSubmitHandle()"
       :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'"
     >
-      <el-form-item label="客户名称" prop="paCustomer.customerName">
+      <el-form-item label="客户名称" prop="customerName">
         <el-input
           v-model="dataForm.paCustomer.customerName"
           placeholder="客户名称"
@@ -110,13 +110,19 @@
       <el-form-item label="联系方式" prop="paUser.phone">
         <el-input
           v-model="dataForm.paUser.phone"
-          placeholder="联系方式"
+          placeholder="超级管理员联系方式"
         ></el-input>
       </el-form-item>
-      <el-form-item label="证件号" prop="paUser.idCard">
+      <el-form-item label="超级管理员证件号" prop="paUser.idCard">
         <el-input
           v-model="dataForm.paUser.idCard"
-          placeholder="证件号"
+          placeholder="超级管理员证件号"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="电子门牌uri前缀" prop="houseQrcodePre">
+        <el-input
+          v-model="dataForm.houseQrcodePre"
+          placeholder="电子门牌uri前缀"
         ></el-input>
       </el-form-item>
     </el-form>
@@ -142,6 +148,7 @@ export default {
       visible: false,
       dataForm: {
         id: "",
+        houseQrcodePre: "",
         paAgency: {
           logo: "",
           agencyName: "",
@@ -192,37 +199,28 @@ export default {
       ],
 
       functionList: [],
-    };
-  },
-  components: {
-    CForm,
-    CDialog,
-  },
-  created() {
-    this.queryFunctionList();
-  },
-  computed: {
-    dataRule() {
-      return {
-        logo: [
+
+      // 校验规则
+      dataRule: {
+        "logo": [
           {
             required: false,
             message: this.$t("validate.required"),
             trigger: "blur",
           },
         ],
-        "paCustomer.customerName": [
+        "customerName": [
           {
             required: true,
             message: "客户名称必填",
-            trigger: "blue",
+            trigger: "blur",
           },
         ],
         "paAgency.agencyName": [
             {
                 required: true,
                 message: '根级组织名称必填',
-                trigger: 'blue'
+                trigger: 'blur'
             }
         ],
         "paAgency.level": [
@@ -236,46 +234,63 @@ export default {
             {
                 required: true,
                 message: '组织地区码必填',
-                trigger: 'blue'
+                trigger: 'blur'
             }
         ],
         "paAgency.province": [
             {
                 required: true,
                 message: '组织省份必填',
-                trigger: 'blue'
+                trigger: 'blur'
             }
         ],
         "paUser.realName": [
             {
                 required: true,
                 message: '管理员姓名必填',
-                trigger: 'blue'
+                trigger: 'blur'
             }
         ],
         "paUser.phone": [
             {
                 required: true,
                 message: '管理员电话必填',
-                trigger: 'blue'
+                trigger: 'blur'
             }
         ],
         "paUser.idCard": [
             {
                 required: true,
                 message: '管理员证件号必填',
-                trigger: 'blue'
+                trigger: 'blur'
             }
         ],
         "paAgency.validityTime": [
             {
                 required: true,
-                message: '必填',
-                trigger: 'change'
+                message: '有效期必填',
+                trigger: 'blur'
+            }
+        ],
+        "houseQrcodePre": [
+            {
+                required: true,
+                message: '二维码uri前缀必填',
+                trigger: 'blur'
             }
         ]
-      };
-    },
+      }
+    };
+  },
+  components: {
+    CForm,
+    CDialog,
+  },
+  created() {
+    // this.queryFunctionList();
+  },
+  computed: {
+    
   },
   methods: {
     // 上传logo成功

From 1d6852a5ab8803511ef88ce946364466778dbbb6 Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Fri, 5 Jul 2024 12:47:25 +0800
Subject: [PATCH 7/9] fix

---
 .../views/modules/customer/manage/customer-add-or-update.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue b/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue
index e95a1af..fa7ff93 100644
--- a/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue
+++ b/epmet-oper-web/src/views/modules/customer/manage/customer-add-or-update.vue
@@ -12,7 +12,7 @@
       @keyup.enter.native="dataFormSubmitHandle()"
       :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'"
     >
-      <el-form-item label="客户名称" prop="customerName">
+      <el-form-item label="客户名称" prop="paCustomer.customerName">
         <el-input
           v-model="dataForm.paCustomer.customerName"
           placeholder="客户名称"
@@ -209,7 +209,7 @@ export default {
             trigger: "blur",
           },
         ],
-        "customerName": [
+        "paCustomer.customerName": [
           {
             required: true,
             message: "客户名称必填",

From 9510593c7eff86ada1b9c31141fd2d93bbfb2738 Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Fri, 2 Aug 2024 16:46:15 +0800
Subject: [PATCH 8/9] =?UTF-8?q?pc=E5=B7=A5=E4=BD=9C=E7=AB=AF=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=BB=B4=E6=8A=A4=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customize/menu-customer-add-or-update.vue | 46 ++++++++++++++-----
 .../customer/customize/menuCustomer.vue       | 36 ++++++++++-----
 2 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/epmet-oper-web/src/views/modules/customer/customize/menu-customer-add-or-update.vue b/epmet-oper-web/src/views/modules/customer/customize/menu-customer-add-or-update.vue
index be2a5e0..83e0c50 100644
--- a/epmet-oper-web/src/views/modules/customer/customize/menu-customer-add-or-update.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/menu-customer-add-or-update.vue
@@ -49,10 +49,10 @@ export default {
       iconList: [],
       iconListVisible: false,
       dataForm: {
-        id: '',
+        id: '', // 菜单id
         type: 0,
         name: '',
-        pid: '0',
+        pid: '0', // 菜单pid
         customerId:'',
         parentName: '',
         url: '',
@@ -91,16 +91,38 @@ export default {
 
     },
     // 获取信息
-    getInfo () {
-      this.$http.get(`/gov/access/govMenuCustomerRelation/${this.dataForm.id}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.dataForm = {
-          ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
+    async getInfo () {
+      let {data: epmetRelationResult} = await this.$http.get(`/gov/access/govMenuCustomerRelation/getCustomizedMenuInfo?menuId=${this.dataForm.id}&customerId=${this.dataForm.customerId}`)
+
+      if (epmetRelationResult.code !== 0) {
+        this.$message.error("网络错误")
+        return
+      }
+
+      if (epmetRelationResult.data !== null) {
+        // 如果有该菜单的自定义信息
+        this.dataForm.type = epmetRelationResult.data.type
+        this.dataForm.name = epmetRelationResult.data.name
+        this.dataForm.pid = epmetRelationResult.data.pid
+        this.dataForm.parentName = epmetRelationResult.data.parentName
+        this.dataForm.url = epmetRelationResult.data.url
+        this.dataForm.useFlag = epmetRelationResult.data.useFlag
+        this.dataForm.sort = epmetRelationResult.data.sort
+        this.dataForm.icon = epmetRelationResult.data.icon
+      } else {
+        // 如果没有该菜单的自定义信息，
+        let { data: epmeMenuResult } = await this.$http.get(`/gov/access/menu/${this.dataForm.id}`)
+
+        this.dataForm.type = epmeMenuResult.data.type
+        this.dataForm.name = epmeMenuResult.data.name
+        this.dataForm.pid = epmeMenuResult.data.pid
+        this.dataForm.parentName = epmeMenuResult.data.parentName
+        this.dataForm.url = epmeMenuResult.data.url
+        this.dataForm.useFlag = 1
+        this.dataForm.sort = epmeMenuResult.data.sort
+        this.dataForm.icon = epmeMenuResult.data.icon
+      }
+
     },
     // 图标, 选中
     iconListCurrentChangeHandle (icon) {
diff --git a/epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue b/epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue
index fa4c3e1..31dd98f 100644
--- a/epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue
+++ b/epmet-oper-web/src/views/modules/customer/customize/menuCustomer.vue
@@ -33,6 +33,7 @@
 
 				<el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 				<el-table-column prop="name" :label="$t('menu.name')" header-align="center" min-width="150"></el-table-column>
+                <el-table-column prop="originName" label="原名" header-align="center" min-width="150"></el-table-column>
 				<el-table-column prop="icon" :label="$t('menu.icon')" header-align="center" align="center">
 					<template slot-scope="scope">
 						<svg class="icon-svg" aria-hidden="true"><use :xlink:href="`#${scope.row.icon}`"></use></svg>
@@ -49,7 +50,7 @@
 
 				<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
 					<template slot-scope="scope">
-						<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+						<el-button type="text" size="small" @click="onAddOrUpdateClick(scope.row.id)">{{ $t('update') }}</el-button>
 						<el-button type="text" size="small" v-if="scope.row.useFlag == '0'" @click="open(scope.row.id)">{{ '开启' }}</el-button>
 						<el-button type="text" size="small" v-if="scope.row.useFlag == '1'" @click="close(scope.row.id)">{{ '关闭' }}</el-button>
 					</template>
@@ -298,13 +299,13 @@ export default {
 			});
 		},
 
-		open(id) {
+		open(menuId) {
 			let menuIds = [];
 			this.multipleSelection = [];
 			this.getData(this.dataList);
 
-			if (id != '') {
-				menuIds = [id];
+			if (menuId != '') {
+				menuIds = [menuId];
 			} else {
 				if (this.multipleSelection.length > 0) {
 					menuIds = this.multipleSelection;
@@ -314,8 +315,9 @@ export default {
 			}
 
 			let params = {
-				ids: menuIds,
-				use: '1'
+				menuIds: menuIds,
+				use: '1',
+        customerId: this.customerId
 			};
 			this.$http.post('/gov/access/govMenuCustomerRelation/useUpdate/', params).then(({ data: res }) => {
 				console.log(res);
@@ -325,13 +327,13 @@ export default {
 				}
 			});
 		},
-		close(id) {
+		close(menuId) {
 			let menuIds = [];
 			this.multipleSelection = [];
 			this.getData(this.dataList);
 
-			if (id != '') {
-				menuIds = [id];
+			if (menuId != '') {
+				menuIds = [menuId];
 			} else {
 				if (this.multipleSelection.length > 0) {
 					menuIds = this.multipleSelection;
@@ -340,8 +342,9 @@ export default {
 				}
 			}
 			let params = {
-				ids: menuIds,
-				use: '0'
+				menuIds: menuIds,
+				use: '0',
+        customerId: this.customerId
 			};
 			this.$http.post('/gov/access/govMenuCustomerRelation/useUpdate/', params).then(({ data: res }) => {
 				console.log(res);
@@ -407,7 +410,16 @@ export default {
 		// 取消
 		diaCancel() {
 			this.$emit('cancleBack');
-		}
+		},
+
+    onAddOrUpdateClick(menuId) {
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+            this.$refs.addOrUpdate.dataForm.customerId = this.customerId
+            this.$refs.addOrUpdate.dataForm.id = menuId
+            this.$refs.addOrUpdate.init()
+        })
+    }
 	}
 };
 </script>

From fb2260c318d43319c843aa8cdd977526c12f85e4 Mon Sep 17 00:00:00 2001
From: wxz <wxz@qq.com>
Date: Tue, 24 Sep 2024 18:15:08 +0800
Subject: [PATCH 9/9] =?UTF-8?q?external-app=E7=BB=B4=E6=8A=A4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/js/columns/miniPro/partnerApp.js      |  16 +-
 .../src/views/modules/partner/app/index.vue   | 156 ++++++++++++++++--
 2 files changed, 147 insertions(+), 25 deletions(-)

diff --git a/epmet-oper-web/src/js/columns/miniPro/partnerApp.js b/epmet-oper-web/src/js/columns/miniPro/partnerApp.js
index f3d1056..846e427 100644
--- a/epmet-oper-web/src/js/columns/miniPro/partnerApp.js
+++ b/epmet-oper-web/src/js/columns/miniPro/partnerApp.js
@@ -38,12 +38,12 @@ export default [{
   block: true,
   width: 40
 },
-{
-  key: 'secret',
-  title: '秘钥',
-  display: ['formA', 'formU', 'table', 'model'],
-  fixed: false,
-  block: true,
-  width: 200
-},
+// {
+//   key: 'secret',
+//   title: '秘钥',
+//   display: ['formA', 'formU', 'table', 'model'],
+//   fixed: false,
+//   block: true,
+//   width: 200
+// },
 ]
diff --git a/epmet-oper-web/src/views/modules/partner/app/index.vue b/epmet-oper-web/src/views/modules/partner/app/index.vue
index 4eac9e1..737c16b 100644
--- a/epmet-oper-web/src/views/modules/partner/app/index.vue
+++ b/epmet-oper-web/src/views/modules/partner/app/index.vue
@@ -51,14 +51,41 @@
                :operationWidth="80"
                :operations="operations"
                @editShow="editShow"
-               @copySecret="copySecret"
-               @resetSecret="resetSecret"
+               @showSecrets="showSecrets"
                @del="del">
       </c-table>
     </el-card>
 
     <edit ref="edit"
           @editDiaOK="editDiaOK"></edit>
+
+    <!--密钥查看-->
+    <el-dialog
+        title="密钥查看"
+        :visible.sync="isShowSecretsDlgShow"
+        width="30%">
+      <el-form :model="dataForm"
+               @keyup.enter.native="loadData()">
+        <el-form-item label="对称加密密钥">
+          <el-input
+              type="textarea"
+              :rows="2"
+              placeholder="请输入内容"
+              v-model="secrets.symSecret" readonly>
+          </el-input>
+          <el-button @click="resetSymSecret">重置</el-button>
+        </el-form-item>
+        <el-form-item label="非对称加密密钥">
+          <el-input
+              type="textarea"
+              :rows="5"
+              placeholder="请输入内容"
+              v-model="secrets.asymSecretPublic" readonly>
+          </el-input>
+          <el-button @click="resetAsymSecret">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
@@ -78,6 +105,7 @@ import { requestPost } from "@/js/dai/request";
 import { envIsDev, mockUrlPrefix } from "@/js/dai/config";
 import { Loading } from "element-ui";
 import nextTick from "dai-js/tools/nextTick";
+import params from "@/views/modules/sys/params.vue";
 
 // 当前是否是开发环境
 const isMockEnv = envIsDev && false;
@@ -89,11 +117,19 @@ export default {
 
   data () {
     return {
+      // 当前操作的appId
+      currAppId: null,
+      // 是否显示密钥对话框
+      isShowSecretsDlgShow: false,
+      secrets: {
+        symSecret: null,
+        asymSecretPublic: null
+      },
       tableUrl: requestUrlPrefix + "/commonservice/externalapp/list",
       // 查询条件
       tableParams: {
         customerId: "",
-        customerType: "internal",
+        customerType: "external",
       },
 
       operations: [
@@ -110,30 +146,42 @@ export default {
           },
         },
         {
-          lable: "复制秘钥", // 按钮显示名称
-          size: "mini",
-          style: "margin: 0 6px;",
-          type: "text",
-          slot: "",
-          plain: false,
-          methodName: "copySecret", // 回调方法名称
-          isShow: (row) => {
-            return true;
-          },
-        },
-        {
-          lable: "重置秘钥", // 按钮显示名称
+          lable: "查看秘钥", // 按钮显示名称
           size: "mini",
           style: "margin: 0 6px;",
           type: "text",
           slot: "",
           plain: false,
-          methodName: "resetSecret", // 回调方法名称
+          methodName: "showSecrets", // 回调方法名称
           isShow: (row) => {
             return true;
           },
         },
         // {
+        //   lable: "复制秘钥", // 按钮显示名称
+        //   size: "mini",
+        //   style: "margin: 0 6px;",
+        //   type: "text",
+        //   slot: "",
+        //   plain: false,
+        //   methodName: "copySecret", // 回调方法名称
+        //   isShow: (row) => {
+        //     return true;
+        //   },
+        // },
+        // {
+        //   lable: "重置秘钥", // 按钮显示名称
+        //   size: "mini",
+        //   style: "margin: 0 6px;",
+        //   type: "text",
+        //   slot: "",
+        //   plain: false,
+        //   methodName: "resetSecret", // 回调方法名称
+        //   isShow: (row) => {
+        //     return true;
+        //   },
+        // },
+        // {
         //   lable: "删除", // 按钮显示名称
         //   size: "mini",
         //   style: "margin: 0 6px;",
@@ -280,6 +328,80 @@ export default {
     editDiaOK () {
       this.refresh();
     },
+
+    /**
+     * 显示密钥
+     */
+    showSecrets(row) {
+      // 查询密钥
+      this.currAppId = row.appId
+      let url = `/commonservice/externalapp/getSecrets`;
+      let params = {
+        appId: row.appId
+      }
+      window.app.ajax.get(
+          url,
+          params,
+          (data, msg) => {
+            this.secrets.symSecret = data.symSecret
+            this.secrets.asymSecretPublic = data.asymSecretPublic
+          },
+          (data, msg) => {
+
+          })
+
+      this.isShowSecretsDlgShow = true
+    },
+
+    /**
+     * 重置对称加密密钥
+     */
+    resetSymSecret() {
+      this.$confirm('确认重置?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let url = "/commonservice/externalapp/resetSymSecret";
+        let params = {
+          appId: this.currAppId
+        }
+
+        window.app.ajax.post(url, params,
+            (data, msg) => {
+              this.$message.success('重置成功')
+              this.secrets.symSecret = data;
+            },
+            (msg, data) => {
+              this.$message.info('重置失败')
+            })
+      })
+    },
+
+    /**
+     * 重置非对称加密密钥
+     */
+    resetAsymSecret() {
+      this.$confirm('确认重置?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let url = "/commonservice/externalapp/resetAsymSecrets";
+        let params = {
+          appId: this.currAppId
+        }
+
+        window.app.ajax.post(url, params,
+            (data, msg) => {
+              this.$message.success('重置成功')
+              this.secrets.asymSecretPublic = data.publicKey;
+            },
+            (msg, data) => {
+              this.$message.info('重置失败')
+            })
+      })
+    }
   },
 };
 </script>