lcl 8 månader sedan
förälder
incheckning
57e4004217

+ 2 - 2
src/views/api/apiGroup/components/add/index.vue

@@ -55,8 +55,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.apiadd.method,
-        url: UrlList.kxsConfigServer.apiadd.url,
+        method: UrlList.kxsConfigServer.apiGroupadd.method,
+        url: UrlList.kxsConfigServer.apiGroupadd.url,
         params: UpdateForm.value
       });
       if (status === 1) {

+ 3 - 3
src/views/api/apiGroup/components/update/index.vue

@@ -56,8 +56,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.apiupdate.method,
-        url: UrlList.kxsConfigServer.apiupdate.url,
+        method: UrlList.kxsConfigServer.apiGroupupdate.method,
+        url: UrlList.kxsConfigServer.apiGroupupdate.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -112,7 +112,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpdateVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.apiquery.method, url: UrlList.kxsConfigServer.apiquery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.apiGroupquery.method, url: UrlList.kxsConfigServer.apiGroupquery.url, params: { id: props.formData.id }});
   if (status === 1) {
     UpdateForm.value = data;
 

+ 28 - 3
src/views/api/apiGroup/hook.tsx

@@ -41,6 +41,31 @@ export function useApiGroup() {
       prop: "groupName",
       minWidth: 200
     },
+    {
+      label: "版本号",
+      prop: "groupVersion",
+      minWidth: 200
+    },
+    {
+      label: "ID",
+      prop: "id",
+      minWidth: 200
+    },
+    {
+      label: "类型",
+      prop: "groupKind",
+      minWidth: 200
+    },
+    {
+      label: "名称",
+      prop: "groupName",
+      minWidth: 200
+    },
+    {
+      label: "ID",
+      prop: "id",
+      minWidth: 200
+    },
 
     {
       label: "操作",
@@ -81,8 +106,8 @@ export function useApiGroup() {
         loading.value = true;
         // 调用接口(需动态生成接口)
         const { status, msg, data }: any = await http.Request({
-          method: UrlList.kxsConfigServer.apilist.method,
-          url: UrlList.kxsConfigServer.apilist.url,
+          method: UrlList.kxsConfigServer.apiGrouplist.method,
+          url: UrlList.kxsConfigServer.apiGrouplist.url,
           params: {
             ...form,
             pageSize: pagination.pageSize,
@@ -117,7 +142,7 @@ export function useApiGroup() {
         type: "warning"
       }
     ).then(async () => {
-      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.apidelete.method, url: UrlList.kxsConfigServer.apidelete.url, params: row.id });
+      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.apiGroupdelete.method, url: UrlList.kxsConfigServer.apiGroupdelete.url, params: row.id });
       if (status === 1) {
         ElMessage({
           message: "删除成功",

+ 2 - 2
src/views/api/apiInfo/components/add/index.vue

@@ -58,8 +58,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.apiadd.method,
-        url: UrlList.kxsConfigServer.apiadd.url,
+        method: UrlList.kxsConfigServer.apiInfoadd.method,
+        url: UrlList.kxsConfigServer.apiInfoadd.url,
         params: UpdateForm.value
       });
       if (status === 1) {

+ 3 - 3
src/views/api/apiInfo/components/setRouter/index.vue

@@ -52,8 +52,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.apisetRouter.method,
-        url: UrlList.kxsConfigServer.apisetRouter.url,
+        method: UrlList.kxsConfigServer.apiInfosetRouter.method,
+        url: UrlList.kxsConfigServer.apiInfosetRouter.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -107,7 +107,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditSetRouterVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.apiquery.method, url: UrlList.kxsConfigServer.apiquery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.apiInfoquery.method, url: UrlList.kxsConfigServer.apiInfoquery.url, params: { id: props.formData.id }});
   if (status === 1) {
     UpdateForm.value = data;
 

+ 3 - 3
src/views/api/apiInfo/components/setVersion/index.vue

@@ -50,8 +50,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.apisetVersion.method,
-        url: UrlList.kxsConfigServer.apisetVersion.url,
+        method: UrlList.kxsConfigServer.apiInfosetVersion.method,
+        url: UrlList.kxsConfigServer.apiInfosetVersion.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -94,7 +94,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditSetVersionVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.apiquery.method, url: UrlList.kxsConfigServer.apiquery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.apiInfoquery.method, url: UrlList.kxsConfigServer.apiInfoquery.url, params: { id: props.formData.id }});
   if (status === 1) {
     UpdateForm.value = data;
 

+ 3 - 3
src/views/api/apiInfo/components/update/index.vue

@@ -59,8 +59,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.apiupdate.method,
-        url: UrlList.kxsConfigServer.apiupdate.url,
+        method: UrlList.kxsConfigServer.apiInfoupdate.method,
+        url: UrlList.kxsConfigServer.apiInfoupdate.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -131,7 +131,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpdateVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.apiquery.method, url: UrlList.kxsConfigServer.apiquery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.apiInfoquery.method, url: UrlList.kxsConfigServer.apiInfoquery.url, params: { id: props.formData.id }});
   if (status === 1) {
     UpdateForm.value = data;
 

+ 28 - 3
src/views/api/apiInfo/hook.tsx

@@ -58,6 +58,31 @@ export function useApiInfo() {
       prop: "apiName",
       minWidth: 200
     },
+    {
+      label: "接口关键字",
+      prop: "apiKey",
+      minWidth: 200
+    },
+    {
+      label: "接口主机头",
+      prop: "apiHost",
+      minWidth: 200
+    },
+    {
+      label: "接口端口号",
+      prop: "apiPort",
+      minWidth: 200
+    },
+    {
+      label: "接口路由",
+      prop: "apiRouter",
+      minWidth: 200
+    },
+    {
+      label: "ID",
+      prop: "id",
+      minWidth: 200
+    },
 
     {
       label: "操作",
@@ -98,8 +123,8 @@ export function useApiInfo() {
         loading.value = true;
         // 调用接口(需动态生成接口)
         const { status, msg, data }: any = await http.Request({
-          method: UrlList.kxsConfigServer.apilist.method,
-          url: UrlList.kxsConfigServer.apilist.url,
+          method: UrlList.kxsConfigServer.apiInfolist.method,
+          url: UrlList.kxsConfigServer.apiInfolist.url,
           params: {
             ...form,
             pageSize: pagination.pageSize,
@@ -143,7 +168,7 @@ export function useApiInfo() {
         type: "warning"
       }
     ).then(async () => {
-      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.apidelete.method, url: UrlList.kxsConfigServer.apidelete.url, params: row.id });
+      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.apiInfodelete.method, url: UrlList.kxsConfigServer.apiInfodelete.url, params: row.id });
       if (status === 1) {
         ElMessage({
           message: "删除成功",

+ 2 - 2
src/views/app/appBottomNavs/components/add/index.vue

@@ -67,8 +67,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.appadd.method,
-        url: UrlList.kxsConfigServer.appadd.url,
+        method: UrlList.kxsConfigServer.appBottomNavsadd.method,
+        url: UrlList.kxsConfigServer.appBottomNavsadd.url,
         params: UpdateForm.value
       });
       if (status === 1) {

+ 3 - 3
src/views/app/appBottomNavs/components/update/index.vue

@@ -68,8 +68,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.appupdate.method,
-        url: UrlList.kxsConfigServer.appupdate.url,
+        method: UrlList.kxsConfigServer.appBottomNavsupdate.method,
+        url: UrlList.kxsConfigServer.appBottomNavsupdate.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -170,7 +170,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpdateVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.appquery.method, url: UrlList.kxsConfigServer.appquery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.appBottomNavsquery.method, url: UrlList.kxsConfigServer.appBottomNavsquery.url, params: { id: props.formData.id }});
   if (status === 1) {
     UpdateForm.value = data;
 

+ 50 - 5
src/views/app/appBottomNavs/hook.tsx

@@ -37,8 +37,53 @@ export function useAppBottomNavs() {
       hide: ({ checkList }) => !checkList.includes("序号列")
     },
         {
-      label: "分类",
-      prop: "kind",
+      label: "标题",
+      prop: "title",
+      minWidth: 200
+    },
+    {
+      label: "选中图标",
+      prop: "selectIcon",
+      minWidth: 200
+    },
+    {
+      label: "未选中图标",
+      prop: "normalIcon",
+      minWidth: 200
+    },
+    {
+      label: "选中文字颜色",
+      prop: "selectTextColor",
+      minWidth: 200
+    },
+    {
+      label: "未选中文字颜色",
+      prop: "normalTextColor",
+      minWidth: 200
+    },
+    {
+      label: "关联页面文件",
+      prop: "pageName",
+      minWidth: 200
+    },
+    {
+      label: "空页面提示信息",
+      prop: "noPageHint",
+      minWidth: 200
+    },
+    {
+      label: "背景色",
+      prop: "backgroudColor",
+      minWidth: 200
+    },
+    {
+      label: "按钮样式",
+      prop: "style",
+      minWidth: 200
+    },
+    {
+      label: "ID",
+      prop: "id",
       minWidth: 200
     },
 
@@ -81,8 +126,8 @@ export function useAppBottomNavs() {
         loading.value = true;
         // 调用接口(需动态生成接口)
         const { status, msg, data }: any = await http.Request({
-          method: UrlList.kxsConfigServer.applist.method,
-          url: UrlList.kxsConfigServer.applist.url,
+          method: UrlList.kxsConfigServer.appBottomNavslist.method,
+          url: UrlList.kxsConfigServer.appBottomNavslist.url,
           params: {
             ...form,
             pageSize: pagination.pageSize,
@@ -117,7 +162,7 @@ export function useAppBottomNavs() {
         type: "warning"
       }
     ).then(async () => {
-      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.appdelete.method, url: UrlList.kxsConfigServer.appdelete.url, params: row.id });
+      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.appBottomNavsdelete.method, url: UrlList.kxsConfigServer.appBottomNavsdelete.url, params: row.id });
       if (status === 1) {
         ElMessage({
           message: "删除成功",

+ 12 - 10
src/views/app/appVersion/components/add/index.vue

@@ -42,6 +42,8 @@ const ruleFormRef = ref()
 // 传参选项数据
 // 终端类型选项数据
 const terminalKindOptionList = [
+  { label: 'ios', id: 'ios' },
+  { label: 'android', id: 'android' },
 ]
 
 // 选项卡参数(默认值为列表某项的id)
@@ -58,8 +60,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.appadd.method,
-        url: UrlList.kxsConfigServer.appadd.url,
+        method: UrlList.kxsConfigServer.appVersionadd.method,
+        url: UrlList.kxsConfigServer.appVersionadd.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -69,13 +71,13 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-                terminalKind: "", //终端类型
-      versionNum: "", //版本号
-      title: "", //标题
-      info: "", //更新信息
-      confirmText: "", //确定按钮文字
-      cancelText: "", //取消按钮文字
-      downloadUrl: "", //更新地址
+          terminalKind: "", //终端类型
+          versionNum: "", //版本号
+          title: "", //标题
+          info: "", //更新信息
+          confirmText: "", //确定按钮文字
+          cancelText: "", //取消按钮文字
+          downloadUrl: "", //更新地址
 
         };
         // 关闭新增弹窗;
@@ -109,7 +111,7 @@ const closeFn: any = inject("closeAddVisible");
 const closeVisible = () => {
   // 清空表单项;
   UpdateForm.value = {
-        terminalKind: "", //终端类型
+    terminalKind: "", //终端类型
     versionNum: "", //版本号
     title: "", //标题
     info: "", //更新信息

+ 3 - 3
src/views/app/appVersion/components/update/index.vue

@@ -59,8 +59,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.appupdate.method,
-        url: UrlList.kxsConfigServer.appupdate.url,
+        method: UrlList.kxsConfigServer.appVersionupdate.method,
+        url: UrlList.kxsConfigServer.appVersionupdate.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -109,7 +109,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpdateVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.appquery.method, url: UrlList.kxsConfigServer.appquery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.appVersionquery.method, url: UrlList.kxsConfigServer.appVersionquery.url, params: { id: props.formData.id }});
   if (status === 1) {
     UpdateForm.value = data;
 

+ 35 - 5
src/views/app/appVersion/hook.tsx

@@ -37,8 +37,38 @@ export function useAppVersion() {
       hide: ({ checkList }) => !checkList.includes("序号列")
     },
         {
-      label: "分类",
-      prop: "kind",
+      label: "终端类型",
+      prop: "terminalKind",
+      minWidth: 200
+    },
+    {
+      label: "版本号",
+      prop: "versionNum",
+      minWidth: 200
+    },
+    {
+      label: "标题",
+      prop: "title",
+      minWidth: 200
+    },
+    {
+      label: "确定按钮文字",
+      prop: "confirmText",
+      minWidth: 200
+    },
+    {
+      label: "取消按钮文字",
+      prop: "cancelText",
+      minWidth: 200
+    },
+    {
+      label: "更新地址",
+      prop: "downloadUrl",
+      minWidth: 200
+    },
+    {
+      label: "ID",
+      prop: "id",
       minWidth: 200
     },
 
@@ -81,8 +111,8 @@ export function useAppVersion() {
         loading.value = true;
         // 调用接口(需动态生成接口)
         const { status, msg, data }: any = await http.Request({
-          method: UrlList.kxsConfigServer.applist.method,
-          url: UrlList.kxsConfigServer.applist.url,
+          method: UrlList.kxsConfigServer.appVersionlist.method,
+          url: UrlList.kxsConfigServer.appVersionlist.url,
           params: {
             ...form,
             pageSize: pagination.pageSize,
@@ -117,7 +147,7 @@ export function useAppVersion() {
         type: "warning"
       }
     ).then(async () => {
-      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.appdelete.method, url: UrlList.kxsConfigServer.appdelete.url, params: row.id });
+      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.appVersiondelete.method, url: UrlList.kxsConfigServer.appVersiondelete.url, params: row.id });
       if (status === 1) {
         ElMessage({
           message: "删除成功",

+ 2 - 2
src/views/app/fileUpdateInfo/components/add/index.vue

@@ -51,8 +51,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.appadd.method,
-        url: UrlList.kxsConfigServer.appadd.url,
+        method: UrlList.kxsConfigServer.fileUpdateInfoadd.method,
+        url: UrlList.kxsConfigServer.fileUpdateInfoadd.url,
         params: UpdateForm.value
       });
       if (status === 1) {

+ 4 - 4
src/views/app/fileUpdateInfo/components/upVersion/index.vue

@@ -50,8 +50,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.appupVersion.method,
-        url: UrlList.kxsConfigServer.appupVersion.url,
+        method: UrlList.kxsConfigServer.fileUpdateInfoupVersion.method,
+        url: UrlList.kxsConfigServer.fileUpdateInfoupVersion.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -61,7 +61,7 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-                versionNum: "", //更新版本
+          versionNum: "", //更新版本
 
         };
         // 关闭修改弹窗;
@@ -94,7 +94,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpVersionVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.appupdateFile.method, url: UrlList.kxsConfigServer.appupdateFile.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.fileUpdateInfoquery.method, url: UrlList.kxsConfigServer.fileUpdateInfoquery.url, params: { id: props.formData.id } });
   if (status === 1) {
     UpdateForm.value = data;
 

+ 4 - 4
src/views/app/fileUpdateInfo/components/update/index.vue

@@ -49,8 +49,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.app.method,
-        url: UrlList.kxsConfigServer.app.url,
+        method: UrlList.kxsConfigServer.fileUpdateInfoupdate.method,
+        url: UrlList.kxsConfigServer.fileUpdateInfoupdate.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -60,7 +60,7 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-          
+
         };
         // 关闭修改弹窗;
         closeVisible();
@@ -92,7 +92,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.appupdateFile.method, url: UrlList.kxsConfigServer.appupdateFile.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.fileUpdateInfoquery.method, url: UrlList.kxsConfigServer.fileUpdateInfoquery.url, params: { id: props.formData.id } });
   if (status === 1) {
     UpdateForm.value = data;
 

+ 60 - 11
src/views/app/fileUpdateInfo/hook.tsx

@@ -8,10 +8,10 @@ export function useFileUpdateInfo() {
   onMounted(async () => {
     UrlList = await getGroupUrl(["kxsConfigServer"]);
     onSearch(ruleFormRef.value);
-  
+
   });
   let form = reactive({
-  kind:"", //分类
+    kind: "", //分类
 
   });
   const dataList = ref([]);
@@ -36,9 +36,24 @@ export function useFileUpdateInfo() {
       width: 70,
       hide: ({ checkList }) => !checkList.includes("序号列")
     },
-        {
-      label: "分类",
-      prop: "kind",
+    {
+      label: "ID",
+      prop: "id",
+      minWidth: 200
+    },
+    {
+      label: "更新版本",
+      prop: "versionNum",
+      minWidth: 200
+    },
+    {
+      label: "路径",
+      prop: "path",
+      minWidth: 200
+    },
+    {
+      label: "文件名",
+      prop: "fileName",
       minWidth: 200
     },
 
@@ -81,8 +96,8 @@ export function useFileUpdateInfo() {
         loading.value = true;
         // 调用接口(需动态生成接口)
         const { status, msg, data }: any = await http.Request({
-          method: UrlList.kxsConfigServer.applist.method,
-          url: UrlList.kxsConfigServer.applist.url,
+          method: UrlList.kxsConfigServer.fileUpdateInfolist.method,
+          url: UrlList.kxsConfigServer.fileUpdateInfolist.url,
           params: {
             ...form,
             pageSize: pagination.pageSize,
@@ -106,7 +121,7 @@ export function useFileUpdateInfo() {
 
 
 
-    // 删除
+  // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该资源文件更新信息? `,
@@ -117,7 +132,7 @@ export function useFileUpdateInfo() {
         type: "warning"
       }
     ).then(async () => {
-      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.appdelete.method, url: UrlList.kxsConfigServer.appdelete.url, params: row.id });
+      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.fileUpdateInfodelete.method, url: UrlList.kxsConfigServer.fileUpdateInfodelete.url, params: row.id });
       if (status === 1) {
         ElMessage({
           message: "删除成功",
@@ -126,20 +141,53 @@ export function useFileUpdateInfo() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
+      };
+    })
+  }
+
+  function handleSycn() {
+    if (form.kind == "") {
+      ElMessageBox.alert("请筛选分类", "提示", {
         confirmButtonText: "关闭",
         type: "warning"
       });
+      return;
+    }
+    ElMessageBox.confirm(
+      `是否同步资源文件? `,
+      "提示",
+      {
+        confirmButtonText: "同步",
+        cancelButtonText: "取消",
+        type: "warning"
+      }
+    ).then(async () => {
+      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.fileUpdateInfoupdateFile.method, url: UrlList.kxsConfigServer.fileUpdateInfoupdateFile.url, params: { kind: form.kind } });
+      if (status === 1) {
+        ElMessage({
+          message: "同步成功",
+          type: "success"
+        });
+        onSearch(ruleFormRef.value);
+      } else {
+        ElMessageBox.alert(msg, "提示", {
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
       };
     })
   }
 
-    // 新增
+  // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-    // 修改
+  // 修改
   const editUpdateVisible = ref(false);
   const editUpdateFormData = ref({});
   function handleUpdate(row) {
@@ -175,6 +223,7 @@ export function useFileUpdateInfo() {
     editUpdateFormData,
     handleDelete,
     handleUpVersion,
+    handleSycn,
     editUpVersionVisible,
     editUpVersionFormData,
 

+ 3 - 1
src/views/app/fileUpdateInfo/index.vue

@@ -36,6 +36,7 @@ const {
   editUpdateFormData,
   handleDelete,
   handleUpVersion,
+  handleSycn,
   editUpVersionVisible,
   editUpVersionFormData,
 
@@ -89,6 +90,7 @@ provide('closeEditUpVersionVisible', closeEditUpVersionVisible)
     PureTableBar(title="资源文件更新信息", @refresh="onSearch(ruleFormRef)" )
       template(#buttons)
         el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleAdd()" v-if="hasAuth(['add'])") 新增
+        el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleSycn()" v-if="hasAuth(['updateFile'])") 同步文件
 
       template(v-slot="{ size, checkList }")
         pure-table( 
@@ -138,7 +140,7 @@ provide('closeEditUpVersionVisible', closeEditUpVersionVisible)
                       size="small"
                       @click="handleUpVersion(row)"
                       :icon="useRenderIcon(EditPen)"
-                      v-if="hasAuth(['upVersion'])"
+                      v-if="hasAuth(['version'])"
                     ) 更新版本号
 
     Add(:addVisible="addVisible")

+ 23 - 23
src/views/app/pageUpdateInfo/components/add/index.vue

@@ -67,8 +67,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.appadd.method,
-        url: UrlList.kxsConfigServer.appadd.url,
+        method: UrlList.kxsConfigServer.pageUpdateInfoadd.method,
+        url: UrlList.kxsConfigServer.pageUpdateInfoadd.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -78,25 +78,25 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-                moduleVersion: "", //模板更新版本
-      modulePath: "", //模板路径
-      backgroudColor: "", //背景色
-      textColor: "", //前景色
-      statusBarStyle: "", //苹果状态栏
-      showTitle: "", //是否显示头部
-      title: "", //顶部标题
-      showScrollBar: "", //是否显示滚动条
-      skidFlag: "", //是否侧滑返回
-      leftBtn1: "", //左侧按钮1
-      leftBtn2: "", //左侧按钮2
-      rightBtn1: "", //右侧按钮1
-      rightBtn2: "", //右侧按钮2
-      leftAction1: "", //左侧按钮1点击事件
-      leftAction2: "", //左侧按钮2点击事件
-      rightAction1: "", //右侧按钮1点击事件
-      rightAction2: "", //右侧按钮2点击事件
-      gotoPages: "", //下级页面
-      mustUpdate: "", //是否强制更新
+          moduleVersion: "", //模板更新版本
+          modulePath: "", //模板路径
+          backgroudColor: "", //背景色
+          textColor: "", //前景色
+          statusBarStyle: "", //苹果状态栏
+          showTitle: "", //是否显示头部
+          title: "", //顶部标题
+          showScrollBar: "", //是否显示滚动条
+          skidFlag: "", //是否侧滑返回
+          leftBtn1: "", //左侧按钮1
+          leftBtn2: "", //左侧按钮2
+          rightBtn1: "", //右侧按钮1
+          rightBtn2: "", //右侧按钮2
+          leftAction1: "", //左侧按钮1点击事件
+          leftAction2: "", //左侧按钮2点击事件
+          rightAction1: "", //右侧按钮1点击事件
+          rightAction2: "", //右侧按钮2点击事件
+          gotoPages: "", //下级页面
+          mustUpdate: "", //是否强制更新
 
         };
         // 关闭新增弹窗;
@@ -136,11 +136,11 @@ const rules = reactive({
 
 })
 // 关闭弹窗回调函数
-const closeFn: any = inject("closeAddVisible");
+const closeFn: any = inject("addVisible");
 const closeVisible = () => {
   // 清空表单项;
   UpdateForm.value = {
-        moduleVersion: "", //模板更新版本
+    moduleVersion: "", //模板更新版本
     modulePath: "", //模板路径
     backgroudColor: "", //背景色
     textColor: "", //前景色

+ 6 - 6
src/views/app/pageUpdateInfo/components/upVersion/index.vue

@@ -50,8 +50,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.appupVersion.method,
-        url: UrlList.kxsConfigServer.appupVersion.url,
+        method: UrlList.kxsConfigServer.pageUpdateInfoupVersion.method,
+        url: UrlList.kxsConfigServer.pageUpdateInfoupVersion.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -61,7 +61,7 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-                moduleVersion: "", //模板更新版本
+          moduleVersion: "", //模板更新版本
 
         };
         // 关闭修改弹窗;
@@ -95,10 +95,10 @@ const rules = reactive({
 
 })
 // 关闭弹窗回调函数
-const closeFn: any = inject('closeEditUpVersionVisible');
+const closeFn: any = inject('editUpVersionVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.appupdateTemplate.method, url: UrlList.kxsConfigServer.appupdateTemplate.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.pageUpdateInfoquery.method, url: UrlList.kxsConfigServer.pageUpdateInfoquery.url, params: { id: props.formData.id } });
   if (status === 1) {
     UpdateForm.value = data;
 
@@ -119,7 +119,7 @@ const isFullscreen = ref(false)
 
 <template lang="pug">
 .main
-  el-dialog(v-model='props.editVisible' draggable width="50%" :fullscreen="isFullscreen" title="修改" @close="closeUpVersionVisible" @open="openVisible")
+  el-dialog(v-model='props.editVisible' draggable width="50%" :fullscreen="isFullscreen" title="修改" @close="editUpVersionVisible" @open="openVisible")
     el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
       el-form-item(label='模板更新版本' prop="moduleVersion")
         el-input-number(v-model='UpdateForm.moduleVersion' :min="1" :max="1000"

+ 6 - 6
src/views/app/pageUpdateInfo/components/update/index.vue

@@ -49,8 +49,8 @@ const submit = async (formEl) => {
 
       // 需动态生成接口
       const { status, msg }: any = await http.Request({
-        method: UrlList.kxsConfigServer.app.method,
-        url: UrlList.kxsConfigServer.app.url,
+        method: UrlList.kxsConfigServer.pageUpdateInfo.method,
+        url: UrlList.kxsConfigServer.pageUpdateInfo.url,
         params: UpdateForm.value
       });
       if (status === 1) {
@@ -60,7 +60,7 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-          
+
         };
         // 关闭修改弹窗;
         closeVisible();
@@ -89,10 +89,10 @@ const rules = reactive({
 
 })
 // 关闭弹窗回调函数
-const closeFn: any = inject('closeEditVisible');
+const closeFn: any = inject('editUpdateVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.appupdateTemplate.method, url: UrlList.kxsConfigServer.appupdateTemplate.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.kxsConfigServer.pageUpdateInfoquery.method, url: UrlList.kxsConfigServer.pageUpdateInfoquery.url, params: { id: props.formData.id } });
   if (status === 1) {
     UpdateForm.value = data;
 
@@ -112,7 +112,7 @@ const isFullscreen = ref(false)
 
 <template lang="pug">
 .main
-  el-dialog(v-model='props.editVisible' draggable width="50%" :fullscreen="isFullscreen" title="修改" @close="closeVisible" @open="openVisible")
+  el-dialog(v-model='props.editVisible' draggable width="50%" :fullscreen="isFullscreen" title="修改" @close="editUpdateVisible" @open="openVisible")
 
     .flex.justify-end
       el-button(

+ 60 - 11
src/views/app/pageUpdateInfo/hook.tsx

@@ -8,10 +8,10 @@ export function usePageUpdateInfo() {
   onMounted(async () => {
     UrlList = await getGroupUrl(["kxsConfigServer"]);
     onSearch(ruleFormRef.value);
-  
+
   });
   let form = reactive({
-  kind:"", //分类
+    kind: "", //分类
 
   });
   const dataList = ref([]);
@@ -36,9 +36,24 @@ export function usePageUpdateInfo() {
       width: 70,
       hide: ({ checkList }) => !checkList.includes("序号列")
     },
-        {
-      label: "分类",
-      prop: "kind",
+    {
+      label: "ID",
+      prop: "id",
+      minWidth: 200
+    },
+    {
+      label: "模板更新版本",
+      prop: "moduleVersion",
+      minWidth: 200
+    },
+    {
+      label: "模板路径",
+      prop: "modulePath",
+      minWidth: 200
+    },
+    {
+      label: "顶部标题",
+      prop: "title",
       minWidth: 200
     },
 
@@ -81,8 +96,8 @@ export function usePageUpdateInfo() {
         loading.value = true;
         // 调用接口(需动态生成接口)
         const { status, msg, data }: any = await http.Request({
-          method: UrlList.kxsConfigServer.applist.method,
-          url: UrlList.kxsConfigServer.applist.url,
+          method: UrlList.kxsConfigServer.pageUpdateInfolist.method,
+          url: UrlList.kxsConfigServer.pageUpdateInfolist.url,
           params: {
             ...form,
             pageSize: pagination.pageSize,
@@ -106,7 +121,7 @@ export function usePageUpdateInfo() {
 
 
 
-    // 删除
+  // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该页面模板更新信息? `,
@@ -117,7 +132,7 @@ export function usePageUpdateInfo() {
         type: "warning"
       }
     ).then(async () => {
-      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.appdelete.method, url: UrlList.kxsConfigServer.appdelete.url, params: row.id });
+      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.pageUpdateInfodelete.method, url: UrlList.kxsConfigServer.pageUpdateInfodelete.url, params: row.id });
       if (status === 1) {
         ElMessage({
           message: "删除成功",
@@ -126,20 +141,53 @@ export function usePageUpdateInfo() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
+      };
+    })
+  }
+
+  function handleSycn() {
+    if (form.kind == "") {
+      ElMessageBox.alert("请筛选分类", "提示", {
         confirmButtonText: "关闭",
         type: "warning"
       });
+      return;
+    }
+    ElMessageBox.confirm(
+      `是否同步页面模板? `,
+      "提示",
+      {
+        confirmButtonText: "同步",
+        cancelButtonText: "取消",
+        type: "warning"
+      }
+    ).then(async () => {
+      const { status, msg }: any = await http.Request({ method: UrlList.kxsConfigServer.pageUpdateInfoupdateTemplate.method, url: UrlList.kxsConfigServer.pageUpdateInfoupdateTemplate.url, params: { kind: form.kind } });
+      if (status === 1) {
+        ElMessage({
+          message: "同步成功",
+          type: "success"
+        });
+        onSearch(ruleFormRef.value);
+      } else {
+        ElMessageBox.alert(msg, "提示", {
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
       };
     })
   }
 
-    // 新增
+  // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-    // 修改
+  // 修改
   const editUpdateVisible = ref(false);
   const editUpdateFormData = ref({});
   function handleUpdate(row) {
@@ -175,6 +223,7 @@ export function usePageUpdateInfo() {
     editUpdateFormData,
     handleDelete,
     handleUpVersion,
+    handleSycn,
     editUpVersionVisible,
     editUpVersionFormData,
 

+ 3 - 1
src/views/app/pageUpdateInfo/index.vue

@@ -36,6 +36,7 @@ const {
   editUpdateFormData,
   handleDelete,
   handleUpVersion,
+  handleSycn,
   editUpVersionVisible,
   editUpVersionFormData,
 
@@ -89,6 +90,7 @@ provide('closeEditUpVersionVisible', closeEditUpVersionVisible)
     PureTableBar(title="页面模板更新信息", @refresh="onSearch(ruleFormRef)" )
       template(#buttons)
         el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleAdd()" v-if="hasAuth(['add'])") 新增
+        el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleSycn()" v-if="hasAuth(['updateTemplate'])") 同步文件
 
       template(v-slot="{ size, checkList }")
         pure-table( 
@@ -138,7 +140,7 @@ provide('closeEditUpVersionVisible', closeEditUpVersionVisible)
                       size="small"
                       @click="handleUpVersion(row)"
                       :icon="useRenderIcon(EditPen)"
-                      v-if="hasAuth(['upVersion'])"
+                      v-if="hasAuth(['version'])"
                     ) 更新版本号码
 
     Add(:addVisible="addVisible")