Merge branch 'master-500-dev-xwx' into 'master-500-dev'

青海系统图片替换



See merge request !964

@@ -373,7 +373,7 @@ layui.define(['sessions', 'form', 'common'], function (exports) {
             async: false,
             async: false,
             success(response) {
             success(response) {
                 let loginSkin = response.skin;
                 let loginSkin = response.skin;
-                let domainName = sessionStorage.getItem('domainName') + "/api-u/sysConf/preview?code=";
+                let domainName = sessionStorage.getItem('domainName') + "/api-web/file/down?code=";
                 if (loginSkin == 'default') {
                 if (loginSkin == 'default') {
                     let srcLogo = domainName + 'default-login-logo';
                     let srcLogo = domainName + 'default-login-logo';
                     let srcBg = domainName + 'default-login-backGround';
                     let srcBg = domainName + 'default-login-backGround';

@@ -15,7 +15,7 @@
         layui.use(['jquery'], function () {
         layui.use(['jquery'], function () {
             var $ = layui.jquery;
             var $ = layui.jquery;
             $(function () {
             $(function () {
-                let domainName = sessionStorage.getItem('domainName') + "/api-u/sysConf/preview?code=";
+                let domainName = sessionStorage.getItem('domainName') + "/api-web/file/down?code=";
                 $('.logo').attr('src', domainName + 'home2-logo')
                 $('.logo').attr('src', domainName + 'home2-logo')
             })
             })
         });
         });

@@ -32,7 +32,7 @@
                 }
                 }
             });
             });
             $(function () {
             $(function () {
-                let domainName = sessionStorage.getItem('domainName') + "/api-u/sysConf/preview?code=";
+                let domainName = sessionStorage.getItem('domainName') + "/api-web/file/down?code=";
                 $('.logo').attr('src', domainName + 'home1-logo')
                 $('.logo').attr('src', domainName + 'home1-logo')
             })
             })
         });
         });

@@ -12,7 +12,7 @@ export default {
         //刷新页面
         //刷新页面
         let hasRefresh = Vue.ref(true);
         let hasRefresh = Vue.ref(true);
         //ip地址
         //ip地址
-        let domainName = Vue.ref(sessionStorage.getItem('domainName') + "/api-u/sysConf/preview?code=");
+        let domainName = Vue.ref(sessionStorage.getItem('domainName') + "/api-web/file/down?code=");
         //imageUrl:登录logo，imageUrlSkin：登录皮肤，imageUrlBg：登录背景，imageUrlIndex：首页logo
         //imageUrl:登录logo，imageUrlSkin：登录皮肤，imageUrlBg：登录背景，imageUrlIndex：首页logo
         let skinData = Vue.ref([
         let skinData = Vue.ref([
             {name: "default", imageUrl: 'default-login-logo', imageUrlBg: 'default-login-backGround'},
             {name: "default", imageUrl: 'default-login-logo', imageUrlBg: 'default-login-backGround'},

@@ -202,6 +202,13 @@ export default {
                 })
                 })
             }
             }
         }
         }
+
+        //重新加载表格数据
+        let loadTableDataList = ({page, limit}) => {
+            search.value.page = page;
+            search.value.limit = limit;
+            getDataList()
+        }
         // 挂载完
         // 挂载完
         Vue.onMounted(() => {
         Vue.onMounted(() => {
             getDataList();
             getDataList();
@@ -228,7 +235,8 @@ export default {
             addFrom,
             addFrom,
             handleUpdate,
             handleUpdate,
             isAdd,
             isAdd,
-            titleName
+            titleName,
+            loadTableDataList
         }
         }
     }
     }
 }
 }

@@ -32,7 +32,7 @@
                 }
                 }
             });
             });
             $(function () {
             $(function () {
-                let domainName = sessionStorage.getItem('domainName') + "/api-u/sysConf/preview?code=";
+                let domainName = sessionStorage.getItem('domainName') + "/api-web/file/down?code=";
                 $('.logo').attr('src', domainName + 'home1-logo')
                 $('.logo').attr('src', domainName + 'home1-logo')
             })
             })
         });
         });