From e3f49adba47498466684325b8a897de585738c55 Mon Sep 17 00:00:00 2001
From: shikeying <pxzsky@163.com>
Date: 星期一, 17 四月 2023 09:15:56 +0800
Subject: [PATCH] 参数配置功能,使用table组件

---
 src/permission.js                      |    2 
 src/views/system/config/index.vue      |  342 +++++++++++-------------------------------
 src/views/user/login.vue               |    2 
 src/views/system/config/edit.vue       |  110 +++++++++++++
 src/components/RuoYi/DictData/index.js |    1 
 src/utils/dict/Dict.js                 |    4 
 src/views/components/myButtonV2.vue    |    2 
 src/views/components/myButton.vue      |    2 
 8 files changed, 208 insertions(+), 257 deletions(-)

diff --git a/src/components/RuoYi/DictData/index.js b/src/components/RuoYi/DictData/index.js
index e27755c..1301f00 100644
--- a/src/components/RuoYi/DictData/index.js
+++ b/src/components/RuoYi/DictData/index.js
@@ -31,6 +31,7 @@
           } else {
             return new Promise((resolve, reject) => {
               getDicts(dictMeta.type).then(res => {
+                // console.log("----------------------");
                 // console.log(dictMeta);
                 // console.log("dictMeta.type = " + dictMeta.type);
                 store.dispatch('dict/setDict', { key: dictMeta.type, value: res.data })
diff --git a/src/permission.js b/src/permission.js
index dea79f4..fc4deb3 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -21,7 +21,7 @@
       next({ path: '/' })
       NProgress.done()
     } else {
-      console.log(store.getters.roles);
+      // console.log(store.getters.roles);
       if (store.getters.roles.length === 0) {
         isRelogin.show = true
         // 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅
diff --git a/src/utils/dict/Dict.js b/src/utils/dict/Dict.js
index 104bd6e..5231b0e 100644
--- a/src/utils/dict/Dict.js
+++ b/src/utils/dict/Dict.js
@@ -18,6 +18,8 @@
     this.owner = null
     this.label = {}
     this.type = {}
+    // 2023-04-15锛屾坊鍔犲瓧鍏稿紩鐢╧ey
+    // this.key = ''
   }
 
   init(options) {
@@ -34,6 +36,8 @@
       const type = dictMeta.type
       Vue.set(this.label, type, {})
       Vue.set(this.type, type, [])
+      // Vue.set(this.key, type, [])
+
       if (dictMeta.lazy) {
         return
       }
diff --git a/src/views/components/myButton.vue b/src/views/components/myButton.vue
index 96a694d..806dab8 100644
--- a/src/views/components/myButton.vue
+++ b/src/views/components/myButton.vue
@@ -120,7 +120,7 @@
         myIcon: 'el-icon-download',
         mySize: 'small'
       })
-    } else if (name == '鎵归噺鍒犻櫎') {
+    } else if (name == '鎵归噺鍒犻櫎' || name.includes('鍒锋柊')) {
       this.setDefault({
         myType: 'danger',
         myIcon: 'el-icon-delete',
diff --git a/src/views/components/myButtonV2.vue b/src/views/components/myButtonV2.vue
index 788b4c6..c79b995 100644
--- a/src/views/components/myButtonV2.vue
+++ b/src/views/components/myButtonV2.vue
@@ -49,7 +49,7 @@
   data() {
     return {
       filter: {// 鎼滅储鏉′笂鐨勬寜閽悕绉伴泦鍚�
-        size: 'small',
+        size: 'mini',
         plain: false,
         other: {
           '鎼滅储': {
diff --git a/src/views/system/config/edit.vue b/src/views/system/config/edit.vue
new file mode 100644
index 0000000..9cca070
--- /dev/null
+++ b/src/views/system/config/edit.vue
@@ -0,0 +1,110 @@
+<template>
+  <win :title="setting.title" width="800px" @close="close">
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px" class="demo-ruleForm" label-position="right">
+      <el-form-item label="鍙傛暟鍚嶇О" prop="config_name">
+        <el-input v-model="form.config_name" placeholder="璇疯緭鍏ュ弬鏁板悕绉�"  maxlength="60"/>
+      </el-form-item>
+      <el-form-item label="KEY" prop="config_key">
+        <el-input v-model="form.config_key" placeholder="璇疯緭鍏ュ弬鏁伴敭鍚�" />
+      </el-form-item>
+      <el-form-item label="VALUE" prop="config_value">
+        <el-input v-model="form.config_value" placeholder="璇疯緭鍏ュ弬鏁伴敭鍊�" />
+      </el-form-item>
+      <el-form-item label="绯荤粺鍐呯疆" prop="config_type">
+        <el-radio-group v-model="form.config_type">
+          <el-radio
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.value"
+          >{{dict.label}}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="澶囨敞" prop="remark">
+        <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <my-button-v2 name="鍏抽棴" site="form" @click="close" />
+      <my-button-v2 name="淇濆瓨" site="form" @click="save" />
+    </div>
+  </win>
+</template>
+
+<script>
+  import win from '@/views/components/win'
+  import myButtonV2 from '@/views/components/myButtonV2'
+  import {getConfig, updateConfig} from "@/api/system/config";
+
+export default {
+  components: { win, myButtonV2 },
+  dicts: ['sys_yes_no'],
+  props: {
+    // setting 涓』鑷冲皯鍖呭惈鎺у埗dialog鏄剧ず鎴栭殣钘忕殑灞炴��,鍏朵綑灞炴�у彲鎷撳睍
+    // 灏嗘坊鍔�/淇敼鐨勫ぇ閲忔暟鎹強閫昏緫浠庡垪琛ㄩ〉闈腑鍒嗙鍑烘潵,閬垮厤鍒楄〃椤甸潰浠g爜杩囧,瀹℃煡鍥伴毦
+    // 鑻ユ椤甸潰椤诲洖浼犳暟鎹嚦鐖堕〉闈�,鍙湪寮曠敤缁勪欢鏃舵坊鍔犱簨浠�,鏈〉闈娇鐢╰his.$emit('浜嬩欢鍚�',鍙傛暟1,鍙傛暟2...)鍥炰紶鏁版嵁
+    setting: {
+      type: Object,
+      default: () => {
+      }
+    }
+  },
+  data(){
+    return {
+      // 琛ㄥ崟鍙傛暟
+      form: {
+        config_id: undefined,
+        config_name: undefined,
+        config_key: undefined,
+        config_value: '',
+        config_type: 'N',
+        remark: undefined
+      },
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        config_name: [
+          { required: true, message: "鍙傛暟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        config_key: [
+          { required: true, message: "鍙傛暟閿悕涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        config_value: [
+          { required: true, message: "鍙傛暟閿�间笉鑳戒负绌�", trigger: "blur" }
+        ]
+      },
+    }
+  },
+
+  created() {
+    this.showData();
+  },
+
+  methods: {
+    save(){
+      this.$refs.form.validate(validate => {
+        if(validate){
+          updateConfig(this.form).then(response => {
+            // this.$modal.msgSuccess("淇敼鎴愬姛");
+            // this.open = false;
+            // this.getList();
+            this.$message.success('淇濆瓨鎴愬姛锛�')
+            this.$emit('search')
+            this.close()
+          });
+        }
+      });
+    },
+    showData(){
+      getConfig(this.setting.id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        // this.title = "淇敼鍙傛暟";
+      });
+    },
+
+    close() {
+      this.$emit('close')
+    },
+
+  }
+}
+</script>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 07646b4..d09a315 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -1,199 +1,75 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="鍙傛暟鍚嶇О" prop="configName">
-        <el-input
-          v-model="queryParams.configName"
-          placeholder="璇疯緭鍏ュ弬鏁板悕绉�"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="鍙傛暟閿悕" prop="configKey">
-        <el-input
-          v-model="queryParams.configKey"
-          placeholder="璇疯緭鍏ュ弬鏁� KEY"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="绯荤粺鍐呯疆" prop="configType">
-        <el-select v-model="queryParams.configType" placeholder="绯荤粺鍐呯疆" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_yes_no"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="鍒涘缓鏃堕棿">-->
-<!--        <el-date-picker-->
-<!--          v-model="dateRange"-->
-<!--          style="width: 240px"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          type="daterange"-->
-<!--          range-separator="-"-->
-<!--          start-placeholder="寮�濮嬫棩鏈�"-->
-<!--          end-placeholder="缁撴潫鏃ユ湡"-->
-<!--        ></el-date-picker>-->
-<!--      </el-form-item>-->
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
-      </el-form-item>
-    </el-form>
+  <div class="app-main">
+    <div class="base-container">
+      <el-card shadow="never" class="box-card">
+        <!--鎼滅储鏉′欢-->
+        <div class="filter-container">
+          <el-form :inline="true" :model="filterFrom" size="small">
+            <el-form-item label="鍙傛暟鍚嶇О">
+              <el-input v-model="filterFrom.configName" placeholder="璇疯緭鍏�'鍙傛暟鍚嶇О'" clearable />
+            </el-form-item>
+            <el-form-item label="鍙傛暟鏍囪瘑">
+              <el-input v-model="filterFrom.configKey" placeholder="璇疯緭鍏�'鍙傛暟KEY'" clearable />
+            </el-form-item>
+<!--            <el-form-item label="鍙戣捣鏃堕棿">-->
+<!--              <el-date-picker v-model="filterFrom.startTime" type="date" placeholder="閫夋嫨寮�濮嬫棩鏈�" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 177px" />-->
+<!--              - <el-date-picker v-model="filterFrom.finishTime" style="width: 177px" type="date" placeholder="閫夋嫨缁撴潫鏃ユ湡" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />-->
+<!--            </el-form-item>-->
+            <el-form-item label="绯荤粺鍐呯疆">
+              <el-select v-model="filterFrom.configType" placeholder="绯荤粺鍐呯疆" clearable>
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <my-button-v2 site="filter" name="鎼滅储" @click="search(1)" />
+              <my-button-v2 site="filter" name="閲嶇疆" @click="reset()" />
+            </el-form-item>
+          </el-form>
+        </div>
+      </el-card>
+      <!--鍒楄〃-->
+      <my-table-v3 ref="myTable" :filter="filterFrom" :table="table" />
+      <!--娣诲姞/缂栬緫寮圭獥-->
+      <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show=false" @search="search" />
+    </div>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:config:add']"
-        >鏂板</el-button>
-      </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['system:config:edit']"-->
-<!--        >淇敼</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['system:config:remove']"-->
-<!--        >鍒犻櫎</el-button>-->
-<!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:config:export']"
-        >瀵煎嚭</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-refresh"
-          size="mini"
-          @click="handleRefreshCache"
-          v-hasPermi="['system:config:remove']"
-        >鍒锋柊缂撳瓨</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <!--鍒楄〃-->
-    <my-table-v3 ref="myTable" :filter="filterFrom" :table="table" />
-
-    <!-- 娣诲姞鎴栦慨鏀瑰弬鏁伴厤缃璇濇 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="鍙傛暟鍚嶇О" prop="config_name">
-          <el-input v-model="form.config_name" placeholder="璇疯緭鍏ュ弬鏁板悕绉�" />
-        </el-form-item>
-        <el-form-item label="KEY" prop="config_key">
-          <el-input v-model="form.config_key" placeholder="璇疯緭鍏ュ弬鏁伴敭鍚�" />
-        </el-form-item>
-        <el-form-item label="VALUE" prop="config_value">
-          <el-input v-model="form.config_value" placeholder="璇疯緭鍏ュ弬鏁伴敭鍊�" />
-        </el-form-item>
-        <el-form-item label="绯荤粺鍐呯疆" prop="config_type">
-          <el-radio-group v-model="form.config_type">
-            <el-radio
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="澶囨敞" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
-        <el-button @click="cancel">鍙� 娑�</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-  import {addConfig, delConfig, getConfig, listConfig, refreshCache, updateConfig} from "@/api/system/config";
+  import {listConfig, refreshCache} from "@/api/system/config";
   import myTableV3 from '@/views/components/myTableV3';
+  import myButtonV2 from '@/views/components/myButtonV2'
+  import edit from './edit'
 
   export default {
-  components: {myTableV3},
+  components: {myTableV3, myButtonV2, edit},
   name: "Config",
   dicts: ['sys_yes_no'],
   data() {
     return {
-      // 閬僵灞�
-      loading: true,
       // 閫変腑鏁扮粍
       ids: [],
       // 闈炲崟涓鐢�
       single: true,
       // 闈炲涓鐢�
       multiple: true,
-      // 鏄剧ず鎼滅储鏉′欢
-      showSearch: true,
-      // 鎬绘潯鏁�
-      total: 0,
-      // 鍙傛暟琛ㄦ牸鏁版嵁
-      configList: [],
-      // 寮瑰嚭灞傛爣棰�
-      title: "",
-      // 鏄惁鏄剧ず寮瑰嚭灞�
-      open: false,
       // 鏃ユ湡鑼冨洿
       dateRange: [],
-      // 鏌ヨ鍙傛暟
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        configName: undefined,
-        configKey: undefined,
-        configType: undefined
-      },
       // 琛ㄥ崟鍙傛暟
-      form: {},
+      // form: {},
       // 琛ㄥ崟鏍¢獙
-      rules: {
-        config_name: [
-          { required: true, message: "鍙傛暟鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
-        ],
-        config_key: [
-          { required: true, message: "鍙傛暟閿悕涓嶈兘涓虹┖", trigger: "blur" }
-        ],
-        config_value: [
-          { required: true, message: "鍙傛暟閿�间笉鑳戒负绌�", trigger: "blur" }
-        ]
-      },
 
       /** 鎼滅储鏉′欢*/
       filterFrom: {
-        title: null
+        configName: null,
+        configKey: null,
+        configType: null
       },
 
       table: {
@@ -204,12 +80,27 @@
         // 宸ュ叿鏉�
         tools: {
           columnsCtrl: {// 鍒楁帶鍒舵寜閽�
-            show: false
+            show: true
           },
           generalExport: {// 閫氱敤瀵煎嚭鎸夐挳
             show: false
           },
           custom: [ // 鑷畾涔夊伐鍏锋潯鎸夐挳
+            {
+              name: '鍒锋柊缂撳瓨',
+              checkPermission: 'system:config:remove',
+              myType: 'danger',
+              mySize: 'mini',
+              click: ()=> {
+                this.handleRefreshCache();
+              }
+            },
+            {
+              name: '瀵煎嚭鍙傛暟',
+              click: ()=> {
+
+              }
+            }
           ]
         },
         columns: [
@@ -226,7 +117,7 @@
                   title = '鍚�'
                   break
               }
-              return { value: title }
+              return { value: title, type: 'primary' }
             }
           },
           { title: '鍒涘缓鏃堕棿', field: 'create_time', align: 'left', width: 170 },
@@ -256,12 +147,20 @@
             total: 0
           }
         }
+      },
+
+      // 娣诲姞&缂栬緫绐楀彛
+      editSetting: {
+        id: null,
+        title: '',
+        show: false
       }
     };
   },
 
   created() {
     // this.getList();
+    // console.log(dict);
   },
   methods: {
     // 鏌ヨtable鍒楄〃
@@ -272,44 +171,14 @@
         this.$refs.myTable.search()
       }
     },
-
-    /** 鏌ヨ鍙傛暟鍒楄〃 */
-    getList() {
-      this.loading = true;
-      listConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.configList = response.data;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    // 鍙栨秷鎸夐挳
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     // 琛ㄥ崟閲嶇疆
     reset() {
-      this.form = {
-        config_id: undefined,
-        config_name: undefined,
-        config_key: undefined,
-        config_value: undefined,
-        config_type: "Y",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 鎼滅储鎸夐挳鎿嶄綔 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 閲嶇疆鎸夐挳鎿嶄綔 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.filterFrom = {
+        configName: null,
+        configKey: null,
+        configType: null
+      }
+      this.search(1)
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
@@ -325,43 +194,9 @@
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
-      this.reset();
-      const configId = row.config_id || this.ids
-      getConfig(configId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "淇敼鍙傛暟";
-      });
-    },
-    /** 鎻愪氦鎸夐挳 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.config_id != undefined) {
-            updateConfig(this.form).then(response => {
-              this.$modal.msgSuccess("淇敼鎴愬姛");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addConfig(this.form).then(response => {
-              this.$modal.msgSuccess("鏂板鎴愬姛");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete(row) {
-      const configIds = row.config_id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鍙傛暟缂栧彿涓�"' + configIds + '"鐨勬暟鎹」锛�').then(function() {
-          return delConfig(configIds);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-        }).catch(() => {});
+      this.editSetting.id = row.config_id
+      this.editSetting.title = "缂栬緫鍙傛暟"
+      this.editSetting.show = true
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
@@ -371,14 +206,15 @@
     },
     /** 鍒锋柊缂撳瓨鎸夐挳鎿嶄綔 */
     handleRefreshCache() {
-      refreshCache().then(() => {
-        this.$modal.msgSuccess("鍒锋柊鎴愬姛");
-      });
-    },
-
-    /** 鏄剧ず閰嶇疆璇︽儏 */
-    showDetail(row){
-
+      this.$confirm('纭鍒锋柊缂撳瓨锛�', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(()=> {
+        refreshCache().then(() => {
+          this.$modal.msgSuccess("鍒锋柊鎴愬姛");
+        });
+      })
     }
   }
 };
diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index c3cd50c..f36717b 100644
--- a/src/views/user/login.vue
+++ b/src/views/user/login.vue
@@ -94,7 +94,7 @@
         code:'',
         uuid: '',
         loginType: 'user_pass',  // 鐢ㄦ埛鍚嶃�佸瘑鐮佹柟寮忕櫥褰�
-        verifyType: 'slide'//  'code': 楠岃瘉鐮�  'slide':婊戝潡  'jigsaw':鎷煎浘
+        verifyType: 'jigsaw'//  'code': 楠岃瘉鐮�  'slide':婊戝潡  'jigsaw':鎷煎浘
         // rememberMe: false,
       },
       loginRules: {

--
Gitblit v1.9.1