Merge remote-tracking branch 'origin/master'

danger-manage-web/src/api/system/setting.js

 import request from '@/utils/request'
 
-// 查询setting列表
+// 查询系统参数配置列表
 export function listSetting(query) {
   return request({
-    url: '/system/inspection/list',
+    url: '/system/setting/list',
     method: 'get',
     params: query
   })
 }
 
-// 查询setting详细
-export function getSetting(nfcId) {
+// 查询系统参数配置详细
+export function getSetting(systemId) {
   return request({
-    url: '/system/inspection/' + nfcId,
+    url: '/system/setting/' + systemId,
     method: 'get'
   })
 }
 
-// 新增setting
+// 新增系统参数配置
 export function addSetting(data) {
   return request({
-    url: '/system/inspection',
+    url: '/system/setting',
     method: 'post',
     data: data
   })
 }
 
-// 修改setting
+// 修改系统参数配置
 export function updateSetting(data) {
   return request({
-    url: '/system/inspection',
+    url: '/system/setting',
     method: 'put',
     data: data
   })
 }
 
-// 删除setting
-export function delSetting(nfcId) {
+// 删除系统参数配置
+export function delSetting(systemId) {
   return request({
-    url: '/system/inspection/' + nfcId,
+    url: '/system/setting/' + systemId,
     method: 'delete'
   })
 }
 
-// 导出setting
+// 导出系统参数配置
 export function exportSetting(query) {
   return request({
-    url: '/system/inspection/export',
+    url: '/system/setting/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出系统参数配置
+export function refreshSystemSetting(query) {
+  return request({
+    url: '/system/setting/refreshSystemSetting',
     method: 'get',
     params: query
   })

danger-manage-web/src/api/system/tnfcSetting.js

+import request from '@/utils/request'
+
+// 查询setting列表
+export function listSetting(query) {
+  return request({
+    url: '/system/inspection/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询setting详细
+export function getSetting(nfcId) {
+  return request({
+    url: '/system/inspection/' + nfcId,
+    method: 'get'
+  })
+}
+
+// 新增setting
+export function addSetting(data) {
+  return request({
+    url: '/system/inspection',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改setting
+export function updateSetting(data) {
+  return request({
+    url: '/system/inspection',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除setting
+export function delSetting(nfcId) {
+  return request({
+    url: '/system/inspection/' + nfcId,
+    method: 'delete'
+  })
+}
+
+// 导出setting
+export function exportSetting(query) {
+  return request({
+    url: '/system/inspection/export',
+    method: 'get',
+    params: query
+  })
+}

danger-manage-web/src/views/system/tNfcSetting/index.vue

@@ -292,7 +292,7 @@
 </template>
 
 <script>
-import { listSetting, getSetting, delSetting, addSetting, updateSetting, exportSetting } from "@/api/system/setting";
+import { listSetting, getSetting, delSetting, addSetting, updateSetting, exportSetting } from "@/api/system/tnfcSetting";
 
 export default {
   name: "Setting",