From bee0ae81539db9b56c71278aaf0301f0b61a0099 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 13 Feb 2023 21:48:17 +0800
Subject: [PATCH 1/4] =?UTF-8?q?style=20=E6=95=B0=E6=8D=AE=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../starter/log/DataVersionLogInfo.vue        | 52 ++++++++++---------
 .../starter/log/DataVersionLogList.vue        | 12 +++--
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/views/modules/starter/log/DataVersionLogInfo.vue b/src/views/modules/starter/log/DataVersionLogInfo.vue
index fea7fc4..85d2849 100644
--- a/src/views/modules/starter/log/DataVersionLogInfo.vue
+++ b/src/views/modules/starter/log/DataVersionLogInfo.vue
@@ -1,33 +1,34 @@
 <template>
   <a-modal
     :title="title"
-    :width="modalWidth"
+    :width="960"
     :visible="visible"
     :confirmLoading="confirmLoading"
     :maskClosable="false"
     @cancel="handleCancel"
   >
-    <a-descriptions
-      title=""
-      :column="{md: 1, sm: 1, xs: 1}"
-    >
-      <a-descriptions-item label="数据名称">
-        {{ form.dataName }}
-      </a-descriptions-item>
-      <a-descriptions-item label="数据主键">
-        {{ form.dataId }}
-      </a-descriptions-item>
-      <a-descriptions-item label="数据内容">
-        {{ form.dataContent }}
-      </a-descriptions-item>
-      <a-descriptions-item label="数据版本">
-        {{ form.version }}
-      </a-descriptions-item>
-      <a-descriptions-item label="创建时间">
-        {{ form.createTime }}
-      </a-descriptions-item>
-
-    </a-descriptions>
+    <a-spin :spinning="confirmLoading">
+      <a-descriptions title="" :column="{ md: 2, sm: 1, xs: 1 }">
+        <a-descriptions-item label="表名称">
+          {{ form.tableName }}
+        </a-descriptions-item>
+        <a-descriptions-item label="数据名称">
+          {{ form.dataName }}
+        </a-descriptions-item>
+        <a-descriptions-item label="数据主键">
+          {{ form.dataId }}
+        </a-descriptions-item>
+        <a-descriptions-item label="数据版本">
+          {{ form.version }}
+        </a-descriptions-item>
+        <a-descriptions-item label="数据内容">
+          <json-viewer preview-mode :value="JSON.parse(form.dataContent || '{}')" />
+        </a-descriptions-item>
+        <a-descriptions-item label="变动内容">
+          <json-viewer preview-mode :value="JSON.parse(form.changeContent || '{}')" />
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-spin>
     <template #footer>
       <a-button key="cancel" @click="handleCancel">取消</a-button>
     </template>
@@ -37,10 +38,12 @@
 <script>
 import { FormMixin } from '@/mixins/FormMixin'
 import { dataVersionInfo } from '@/api/starter/log'
+import JsonViewer from 'vue-json-viewer'
 
 export default {
   name: 'DataVersionLogInfo',
   mixins: [ FormMixin ],
+  components: { JsonViewer },
   data () {
     return {
       logBusinessType: 'LogBusinessType',
@@ -48,7 +51,8 @@ export default {
         id: '',
         dataName: '',
         dataId: '',
-        dataContent: '',
+        dataContent: '{}',
+        changeContent: '{}',
         version: '',
         createTime: ''
       }
@@ -66,4 +70,4 @@ export default {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/starter/log/DataVersionLogList.vue b/src/views/modules/starter/log/DataVersionLogList.vue
index 9d97c9a..55bb463 100644
--- a/src/views/modules/starter/log/DataVersionLogList.vue
+++ b/src/views/modules/starter/log/DataVersionLogList.vue
@@ -3,7 +3,7 @@
     <b-query
       v-model="queryParam"
       :fields="fields"
-      :default-item-md="8"
+      :default-item-md="6"
       @query="query"
       @reset="() => queryParam = {}"
     />
@@ -21,12 +21,12 @@
       :data="tableData"
     >
       <vxe-column type="checkbox" width="40"/>
+      <   <vxe-column field="tableName" title="表名称" />
       <vxe-column field="dataName" title="数据名称" />
       <vxe-column field="dataId" title="数据主键" />
-      <vxe-column field="dataContent" title="数据内容" />
       <vxe-column field="version" title="数据版本" />
       <vxe-column field="createTime" title="创建时间" />
-      <vxe-column title="操作" fixed="right" width="120">
+      <vxe-column title="操作" fixed="right" width="60">
         <template v-slot="{row}">
           <span>
             <a href="javascript:" @click="show(row)">查看</a>
@@ -49,7 +49,7 @@
 import { TableMixin } from '@/mixins/TableMixin'
 import { dataVersionPage } from '@/api/starter/log'
 import DataVersionLogInfo from './DataVersionLogInfo'
-import { STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
+import { NUMBER, STRING } from '@/components/Bootx/SuperQuery/superQueryCode'
 
 export default {
   name: 'DataVersionLogList',
@@ -66,7 +66,9 @@ export default {
       },
       fields: [
         { field: 'dataName', type: STRING, name: '数据名称', placeholder: '请输入数据名称' },
-        { field: 'dataId', type: STRING, name: '数据主键', placeholder: '请输入数据主键' }
+        { field: 'tableName', type: STRING, name: '表名称', placeholder: '请输入表名称' },
+        { field: 'dataId', type: STRING, name: '数据主键', placeholder: '请输入数据主键' },
+        { field: 'version', type: NUMBER, name: '数据版本', placeholder: '请输入数据版本' },
       ]
     }
   },
-- 
Gitee


From 4fb4c3f3592f49ac8ce51362e26dbe803cdd4e59 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Mon, 13 Feb 2023 22:38:26 +0800
Subject: [PATCH 2/4] =?UTF-8?q?style=20=E6=96=87=E6=9C=AC=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/starter/log/DataVersionLogInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/starter/log/DataVersionLogInfo.vue b/src/views/modules/starter/log/DataVersionLogInfo.vue
index 85d2849..e922ffd 100644
--- a/src/views/modules/starter/log/DataVersionLogInfo.vue
+++ b/src/views/modules/starter/log/DataVersionLogInfo.vue
@@ -24,7 +24,7 @@
         <a-descriptions-item label="数据内容">
           <json-viewer preview-mode :value="JSON.parse(form.dataContent || '{}')" />
         </a-descriptions-item>
-        <a-descriptions-item label="变动内容">
+        <a-descriptions-item label="变动前内容">
           <json-viewer preview-mode :value="JSON.parse(form.changeContent || '{}')" />
         </a-descriptions-item>
       </a-descriptions>
-- 
Gitee


From d0765513da6f6c14834d6096e5078bd084df5812 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 4 Mar 2023 18:54:39 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat=20=E5=8F=AF=E8=A7=86=E5=8C=96=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/develop/projectInfo.js                | 122 ++++++++
 .../develop/report/ProjectInfoEdit.vue        | 109 ++++++++
 .../develop/report/ProjectInfoList.vue        | 262 ++++++++++++++++++
 3 files changed, 493 insertions(+)
 create mode 100644 src/api/develop/projectInfo.js
 create mode 100644 src/views/modules/develop/report/ProjectInfoEdit.vue
 create mode 100644 src/views/modules/develop/report/ProjectInfoList.vue

diff --git a/src/api/develop/projectInfo.js b/src/api/develop/projectInfo.js
new file mode 100644
index 0000000..47bad9a
--- /dev/null
+++ b/src/api/develop/projectInfo.js
@@ -0,0 +1,122 @@
+
+import { axios } from '@/utils/request'
+
+/**
+ * 分页
+ */
+export function page (params) {
+  return axios({
+    url: '/goview/admin/page',
+    method: 'GET',
+    params: params
+  })
+}
+
+/**
+ * 获取单条
+ */
+export function get (id) {
+  return axios({
+    url: '/goview/admin/findById',
+    method: 'GET',
+    params: { id }
+  })
+}
+
+/**
+ * 获取GoView的地址
+ */
+export function getGoViewUrl () {
+  return axios({
+    url: '/goview/admin/getGoViewUrl',
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加
+ */
+export function add (obj) {
+  return axios({
+    url: '/goview/admin/add',
+    method: 'POST',
+    data: obj
+  })
+}
+
+/**
+ * 更新
+ */
+export function update (obj) {
+  return axios({
+    url: '/goview/admin/update',
+    method: 'POST',
+    data: obj
+  })
+}
+
+/**
+ * 发布
+ */
+export function publish (id) {
+  return axios({
+    url: '/goview/admin/publish',
+    method: 'POST',
+    params: { id }
+  })
+}
+
+/**
+ * 取消发布
+ */
+export function unPublish (id) {
+  return axios({
+    url: '/goview/admin/unPublish',
+    method: 'POST',
+    params: { id }
+  })
+}
+
+/**
+ * 应用编辑中的信息
+ */
+export function enableEditContent (id) {
+  return axios({
+    url: '/goview/admin/enableEditContent',
+    method: 'POST',
+    params: { id }
+  })
+}
+
+/**
+ * 重置编辑中的信息
+ */
+export function resetEditContent (id) {
+  return axios({
+    url: '/goview/admin/resetEditContent',
+    method: 'POST',
+    params: { id }
+  })
+}
+
+/**
+ * 复制
+ */
+export function copy (id) {
+  return axios({
+    url: '/goview/admin/copy',
+    method: 'POST',
+    params: { id }
+  })
+}
+
+/**
+ * 删除
+ */
+export function del (id) {
+  return axios({
+    url: '/goview/admin/delete',
+    params: { id },
+    method: 'DELETE'
+  })
+}
diff --git a/src/views/modules/develop/report/ProjectInfoEdit.vue b/src/views/modules/develop/report/ProjectInfoEdit.vue
new file mode 100644
index 0000000..14e8c13
--- /dev/null
+++ b/src/views/modules/develop/report/ProjectInfoEdit.vue
@@ -0,0 +1,109 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="modalWidth"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    :maskClosable="false"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form-model
+        ref="form"
+        :model="form"
+        :rules="rules"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-model-item label="主键" prop="id" hidden="true" >
+          <a-input v-model="form.id" :disabled="showable"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="项目名称"
+          prop="name"
+        >
+          <a-input v-model="form.name" :disabled="showable" placeholder="请输入项目名称"/>
+        </a-form-model-item>
+        <a-form-model-item
+          label="备注"
+          prop="remark"
+        >
+          <a-textarea v-model="form.remark" :disabled="showable" placeholder="请输入备注"/>
+        </a-form-model-item>
+      </a-form-model>
+    </a-spin>
+    <template #footer>
+      <a-button key="cancel" @click="handleCancel">取消</a-button>
+      <a-button v-if="!showable" key="forward" :loading="confirmLoading" type="primary" @click="handleOk">保存</a-button>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+import { FormMixin } from '@/mixins/FormMixin'
+import { get, add, update } from '@/api/develop/projectInfo'
+export default {
+  name: 'ProjectInfoEdit',
+  mixins: [FormMixin],
+  data () {
+    return {
+      form: {
+        id: null,
+        name: null,
+        remark: null
+      },
+      rules: {
+        name: [{ required: true, message: '请输入大屏的名称' }]
+      }
+    }
+  },
+  methods: {
+    /**
+     * 编辑
+     */
+    edit (id, type) {
+      if (['edit', 'show'].includes(type)) {
+        this.confirmLoading = true
+        get(id).then(res => {
+          this.form = res.data
+          this.confirmLoading = false
+        })
+      } else {
+        this.confirmLoading = false
+      }
+    },
+    /**
+     * 提交
+     */
+    handleOk () {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          this.confirmLoading = true
+          if (this.type === 'add') {
+            await add(this.form)
+          } else if (this.type === 'edit') {
+            await update(this.form)
+          }
+          this.confirmLoading = false
+          this.$emit('ok')
+          this.visible = false
+        } else {
+          return false
+        }
+      })
+    },
+    /**
+     * 重置表单
+     */
+    resetForm () {
+      this.$nextTick(() => {
+        this.$refs.form.resetFields()
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/develop/report/ProjectInfoList.vue b/src/views/modules/develop/report/ProjectInfoList.vue
new file mode 100644
index 0000000..2bf1f23
--- /dev/null
+++ b/src/views/modules/develop/report/ProjectInfoList.vue
@@ -0,0 +1,262 @@
+<template>
+  <a-card :bordered="false">
+    <b-query
+      v-model="queryParam"
+      :fields="fields"
+      :default-item-md="8"
+      @query="query"
+      @reset="() => queryParam = {}"
+    />
+    <vxe-toolbar
+      custom
+      zoom
+      :refresh="{query: init}"
+    >
+      <template v-slot:buttons>
+        <a-button type="primary" icon="plus" @click="add">新建</a-button>
+      </template>
+    </vxe-toolbar>
+    <vxe-table
+      row-id="id"
+      :loading="loading"
+      :data="tableData"
+    >
+      <vxe-column type="seq" width="60" />
+      <vxe-column field="id" title="大屏代码" />
+      <vxe-column field="name" title="项目名称" />
+      <vxe-column field="state" title="发布状态">
+        <template #default="{ row }">
+          <a-tag v-if="row.state === 1" color="green">已发布</a-tag>
+          <a-tag v-else color="red">未发布</a-tag>
+        </template>
+      </vxe-column>
+      <vxe-column field="edit" title="编辑状态">
+        <template #default="{ row }">
+          <a-tag v-if="row.edit" color="red">编辑中</a-tag>
+          <a-tag v-else color="green">未编辑</a-tag>
+        </template>
+      </vxe-column>
+      <vxe-column field="remark" title="备注" />
+      <vxe-column field="createTime" title="创建时间" />
+      <vxe-column fixed="right" width="220" :showOverflow="false" title="操作">
+        <template v-slot="{row}">
+          <span>
+            <a href="javascript:" @click="edit(row)">编辑</a>
+          </span>
+          <a-divider type="vertical" />
+          <span>
+            <a href="javascript:" @click="design(row)">设计</a>
+          </span>
+          <a-divider type="vertical" />
+          <span>
+            <a href="javascript:" @click="preview(row)">预览</a>
+          </span>
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">
+              更多 <a-icon type="down" />
+            </a>
+            <template #overlay>
+              <a-menu>
+                <a-menu-item>
+                  <a href="javascript:" @click="copyInfo(row)">复制</a>
+                </a-menu-item>
+                <a-menu-item v-if="row.edit">
+                  <a href="javascript:" @click="enableEdit(row)">应用编辑</a>
+                </a-menu-item>
+                <a-menu-item v-if="row.edit">
+                  <a href="javascript:" @click="resetEdit(row)">重置编辑</a>
+                </a-menu-item>
+                <a-menu-item v-if="row.state === -1">
+                  <a href="javascript:" @click="publishInfo(row)">发布</a>
+                </a-menu-item>
+                <a-menu-item v-if="row.state === 1">
+                  <a href="javascript:" @click="unPublishInfo(row)">取消发布</a>
+                </a-menu-item>
+                <a-menu-item>
+                  <a href="javascript:" style="color: red" :disabled="row.state === 1" @click="remove(row)">删除</a>
+                </a-menu-item>
+              </a-menu>
+            </template>
+          </a-dropdown>
+        </template>
+      </vxe-column>
+    </vxe-table>
+    <vxe-pager
+      size="medium"
+      :loading="loading"
+      :current-page="pagination.current"
+      :page-size="pagination.size"
+      :total="pagination.total"
+      @page-change="handleTableChange"/>
+    <project-info-edit
+      ref="projectInfoEdit"
+      @ok="handleOk"/>
+  </a-card>
+</template>
+
+<script>
+import {
+  page,
+  del,
+  getGoViewUrl,
+  copy,
+  publish,
+  unPublish,
+  enableEditContent,
+  resetEditContent
+} from '@/api/develop/projectInfo'
+import ProjectInfoEdit from './ProjectInfoEdit'
+import { TableMixin } from '@/mixins/TableMixin'
+export default {
+  name: 'ProjectInfoList',
+  components: {
+    ProjectInfoEdit
+  },
+  mixins: [TableMixin],
+  data () {
+    return {
+      goViewUrl: '',
+      fields: [
+        { field: 'projectId', name: '大屏代码', placeholder: '请输入大屏代码' },
+        { field: 'name', name: '项目名称', placeholder: '请输入项目名称' }
+      ]
+    }
+  },
+  methods: {
+    // 初始化GoView地址
+    initGoViewUrl () {
+      getGoViewUrl().then(({ data }) => {
+        this.goViewUrl = data
+      })
+    },
+    init () {
+      this.loading = true
+      page({
+        ...this.queryParam,
+        ...this.pages
+      }).then(res => {
+        this.pageQueryResHandel(res, this)
+      })
+    },
+    add () {
+      this.$refs.projectInfoEdit.init('', 'add')
+    },
+    edit (record) {
+      this.$refs.projectInfoEdit.init(record.id, 'edit')
+    },
+    // 预览
+    preview (record) {
+      open(`${this.goViewUrl}/#/chart/preview/${record.id}`, '_blank')
+    },
+    // 设计
+    design (record) {
+      open(`${this.goViewUrl}/#/chart/home/${record.id}`, '_blank')
+    },
+    // 复制
+    copyInfo (record) {
+      this.$confirm({
+        title: '复制',
+        content: '是否复制大屏?',
+        okText: '是',
+        cancelText: '否',
+        onOk: () => {
+          this.loading = true
+          copy(record.id).then(_ => {
+            this.$message.info('复制成功')
+            this.init()
+          })
+        }
+      })
+    },
+    // 发布
+    publishInfo (record) {
+      this.$confirm({
+        title: '发布',
+        content: '是否发布大屏?',
+        okText: '是',
+        cancelText: '否',
+        onOk: () => {
+          this.loading = true
+          publish(record.id).then(_ => {
+            this.$message.info('发布成功')
+            this.init()
+          })
+        }
+      })
+    },
+    // 取消发布
+    unPublishInfo (record) {
+      this.$confirm({
+        title: '取消发布',
+        content: '是否取消发布大屏?',
+        okText: '是',
+        cancelText: '否',
+        onOk: () => {
+          this.loading = true
+          unPublish(record.id).then(_ => {
+            this.$message.info('取消发布成功')
+            this.init()
+          })
+        }
+      })
+    },
+    // 应用编辑中的信息
+    enableEdit (record) {
+      this.$confirm({
+        title: '应用编辑数据',
+        content: '是否应用编辑中的信息，确定后发布的数据将会更新?',
+        okText: '是',
+        cancelText: '否',
+        onOk: () => {
+          this.loading = true
+          enableEditContent(record.id).then(_ => {
+            this.$message.info('更新成功')
+            this.init()
+          })
+        }
+      })
+    },
+    // 重置编辑中的信息
+    resetEdit (record) {
+      this.$confirm({
+        title: '重置编辑',
+        content: '是否重置编辑中的信息，确定后编辑的内容将会恢复为当前已发布的内容',
+        okText: '是',
+        cancelText: '否',
+        onOk: () => {
+          this.loading = true
+          resetEditContent(record.id).then(_ => {
+            this.$message.info('重置成功')
+            this.init()
+          })
+        }
+      })
+    },
+    // 删除
+    remove (record) {
+      this.$confirm({
+        title: '警告',
+        content: '是否删除大屏?',
+        okText: '是',
+        okType: 'danger',
+        cancelText: '否',
+        onOk: () => {
+          del(record.id).then(_ => {
+            this.$message.info('删除成功')
+            this.init()
+          })
+        }
+      })
+    }
+  },
+  created () {
+    this.initGoViewUrl()
+    this.init()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
-- 
Gitee


From b4ea0cadb851e2b8218322f5263f73aad56d3ab1 Mon Sep 17 00:00:00 2001
From: xxm <xxm1995@outlook.com>
Date: Sat, 4 Mar 2023 21:24:49 +0800
Subject: [PATCH 4/4] =?UTF-8?q?style=20=E5=8F=AF=E8=A7=86=E5=8C=96?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=AE=A1=E7=90=86=E7=BB=86=E8=8A=82=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/develop/report/ProjectInfoList.vue | 12 ++++++------
 src/views/modules/system/client/ClientList.vue       |  2 +-
 src/views/modules/system/client/LoginTypeList.vue    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/develop/report/ProjectInfoList.vue b/src/views/modules/develop/report/ProjectInfoList.vue
index 2bf1f23..8c3fdfa 100644
--- a/src/views/modules/develop/report/ProjectInfoList.vue
+++ b/src/views/modules/develop/report/ProjectInfoList.vue
@@ -62,7 +62,7 @@
                   <a href="javascript:" @click="copyInfo(row)">复制</a>
                 </a-menu-item>
                 <a-menu-item v-if="row.edit">
-                  <a href="javascript:" @click="enableEdit(row)">应用编辑</a>
+                  <a href="javascript:" @click="enableEdit(row)">保存编辑</a>
                 </a-menu-item>
                 <a-menu-item v-if="row.edit">
                   <a href="javascript:" @click="resetEdit(row)">重置编辑</a>
@@ -73,8 +73,8 @@
                 <a-menu-item v-if="row.state === 1">
                   <a href="javascript:" @click="unPublishInfo(row)">取消发布</a>
                 </a-menu-item>
-                <a-menu-item>
-                  <a href="javascript:" style="color: red" :disabled="row.state === 1" @click="remove(row)">删除</a>
+                <a-menu-item :disabled="row.state === 1">
+                  <a href="javascript:" :style="{color: row.state === 1?'rgba(0, 0, 0, 0.25)':'red'}" :disabled="row.state === 1" @click="remove(row)">删除</a>
                 </a-menu-item>
               </a-menu>
             </template>
@@ -204,8 +204,8 @@ export default {
     // 应用编辑中的信息
     enableEdit (record) {
       this.$confirm({
-        title: '应用编辑数据',
-        content: '是否应用编辑中的信息，确定后发布的数据将会更新?',
+        title: '保存编辑',
+        content: '是否保存编辑中的信息，保存后发布的数据将会更新',
         okText: '是',
         cancelText: '否',
         onOk: () => {
@@ -221,7 +221,7 @@ export default {
     resetEdit (record) {
       this.$confirm({
         title: '重置编辑',
-        content: '是否重置编辑中的信息，确定后编辑的内容将会恢复为当前已发布的内容',
+        content: '是否重置编辑中的信息，确定后编辑的内容将会恢复为之前保存的内容',
         okText: '是',
         cancelText: '否',
         onOk: () => {
diff --git a/src/views/modules/system/client/ClientList.vue b/src/views/modules/system/client/ClientList.vue
index 2bdd180..1eb86d0 100644
--- a/src/views/modules/system/client/ClientList.vue
+++ b/src/views/modules/system/client/ClientList.vue
@@ -54,7 +54,7 @@
             @confirm="remove(row)"
             okText="是"
             cancelText="否">
-            <a href="javascript:" :disabled="row.system" :style="{color: row.system?'grey':'red'}">删除</a>
+            <a href="javascript:" :disabled="row.system" :style="{color: row.system?'rgba(0, 0, 0, 0.25)':'red'}">删除</a>
           </a-popconfirm>
         </template>
       </vxe-column>
diff --git a/src/views/modules/system/client/LoginTypeList.vue b/src/views/modules/system/client/LoginTypeList.vue
index 4237361..9168b95 100644
--- a/src/views/modules/system/client/LoginTypeList.vue
+++ b/src/views/modules/system/client/LoginTypeList.vue
@@ -61,7 +61,7 @@
             @confirm="remove(row)"
             okText="是"
             cancelText="否">
-            <a href="javascript:" :disabled="row.system" :style="{color: row.system?'grey':'red'}">删除</a>
+            <a href="javascript:" :disabled="row.system" :style="{color: row.system?'rgba(0, 0, 0, 0.25)':'red'}">删除</a>
           </a-popconfirm>
         </template>
       </vxe-column>
-- 
Gitee