数据日志，结果反馈与部分全局修改

src/api/datalog.js

@@ -0,0 +1,17 @@
+import {
+    post,
+} from '../utils/request'
+
+// 数据日志
+const getDataLog = (params) => {
+    return post(systemConfig.oauthServiceUrl + '/record/getRecordBySuccess', params);
+}
+// 结果反馈
+const getFeedback = (params) => {
+    return post(systemConfig.oauthServiceUrl + '/record/getRecordBytypeAll', params);
+}
+
+export default {
+    getDataLog,
+    getFeedback
+}

src/components/Currency/DataTable/MetadataListContainer.vue

@@ -246,7 +246,7 @@ export default {
             });
           } else {
             // 提示接口访问失败
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
             that.tableData = [];
             that.dataTotal = 0;
             that.tableLoading = false;

src/components/Currency/DataTable/MetadataListContainer/FileImport.vue

@@ -97,7 +97,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column align="right">
+          <el-table-column :align="$elDatePickerAlign">
             <template slot="header">
               <el-button size="mini" @click="addAdvancedOptionsRow()">
                 <i class="el-icon-plus"></i>
@@ -299,7 +299,7 @@ export default {
               message: "文件上传成功！",
             });
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {
@@ -324,7 +324,7 @@ export default {
               message: "文件上传成功！",
             });
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {
@@ -349,7 +349,7 @@ export default {
               message: "文件上传成功！",
             });
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {

src/components/Currency/DataTable/MetadataListContainer/MetadataList.vue

@@ -268,7 +268,7 @@ export default {
             });
             that.updateData();
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {
@@ -295,7 +295,7 @@ export default {
             that.formData = result.content;
             that.isShowAddSingleDataDialog = true;
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {

src/components/Currency/DataTable/MetadataListContainer/SingleData.vue

@@ -128,7 +128,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column align="right" v-if="edit">
+          <el-table-column :align="$elDatePickerAlign" v-if="edit">
             <template slot="header">
               <el-button size="mini" @click="addAdvancedOptionsRow()">
                 <i class="el-icon-plus"></i>
@@ -382,7 +382,7 @@ export default {
             if (that.updateData) that.updateData();
             that.dialogBeforeClose();
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {
@@ -417,7 +417,7 @@ export default {
             if (that.updateData) that.updateData();
             that.dialogBeforeClose();
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {

src/components/DataAccess/DataLog.vue

@@ -1,13 +1,196 @@
 <template>
-  
+<div class="log_container">
+        <el-container>
+            <el-header>
+                <el-row>
+                    <el-col :span="12">
+                        <div class="title"> </div>
+                    </el-col>
+                    <el-col :span="24">
+                        <div>
+                            <el-date-picker
+                                v-model="datatime"
+                                type="datetimerange"
+                                :picker-options="pickerOptions"
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                                :align="$elDatePickerAlign"
+                            ></el-date-picker>
+                            <el-button type="primary" @click="search">查询</el-button>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-header>
+            <el-main>
+                <ListContainer
+                    v-bind="{
+                        listField: listField,
+                        listData: logList,
+                        noDataTip: '暂无数据',
+                        total: total,
+                        pageSize: pageSize,
+                        currentPage: page,
+                        searchData: getDataLog,
+                    }"
+                ></ListContainer>
+            </el-main>
+            <!-- <el-footer>
+                <div>
+                    <el-pagination
+                        background
+                        layout="prev, pager, next"
+                        :page-size="pageSize"
+                        :total="total"
+                        @current-change="currentPageChange"
+                    ></el-pagination>
+                </div>
+            </el-footer>-->
+        </el-container>
+    </div>
 </template>
 
 <script>
+import api from "@/api/datalog"
 export default {
+    components: { 
+        ListContainer: () => import("@/components/Currency/ListContainer.vue")
+    },
+    data() {
+        return {
+            pickerOptions: {
+                shortcuts: [{
+                    text: '最近一周',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近一个月',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近三个月',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }]
+            },
+            datatime: [new Date(new Date().getTime() - 7 * 24 * 60 * 60 * 1000), new Date()],
+            page: 1,
+            pageSize: 20,
+            total: 0,
+            logList: [],
+            listField: [
+                {
+                    name: 'code',
+                    alias: '响应值',
+                    span: 3
+                },
+                {
+                    name: 'message',
+                    alias: '响应值描述',
+                    span: 3
+                },
+                {
+                    name: 'content',
+                    alias: '日志数据',
+                    span: 15
+                },
+                {
+                    name: 'Count',
+                    alias: '数据条数',
+                    span: 3
+                }
+            ]
+        }
+    },
+    created() {
+        this.page = 1;
+        this.getDataLog(this.page);
+    },
+    methods: {
+        getDataLog(page) {
+            let that = this;
+            let requestData = new FormData;
+            requestData.append("page",page - 1);
+            requestData.append("pageSize",this.pageSize);
+            // let obj = {
+            //     page: page - 1 + '',
+            //     pageSize: this.pageSize + ''
+            // }
+            // if (this.datatime != null) {
+            //     obj.startDate = this.datatime[0].getTime()
+            //     obj.endDate = this.datatime[1].getTime()
+            // }
+            if (this.datatime != null) {
+                requestData.append("startDate",this.datatime[0].getTime());
+                requestData.append("endDate",this.datatime[1].getTime());
+            }
+            api.getDataLog(requestData).then((result) => {
+                if (result.code == 200) {
+                    that.total = result.total;
+                    that.logList = result.content == -1 || result.content == "" ? [] : result.content;
+                } else {
+                    this.$checkRequestCode(result)
+                }
+            }).catch((err) => {
+                that.$message({
+                    type: "error",
+                    message: err
+                })
+            });
+        },
+        search() {
+            this.page = 1;
+            this.getDataLog(this.page)
+        }
+    }
 
 }
 </script>
-
 <style lang="less" scoped>
+.log_container {
+    width: calc(100% - 20px);
+    height: 100%;
+    margin-left:20px;
+    .el-container {
+        width: 100%;
+        height: 100%;
+        .el-header {
+            background-color: #ffffff;
+            border-radius: 4px;
+            .el-row {
+                padding: 10px 0px;
+                .el-col:nth-child(2) {
+                    > div {
+                        float: right;
+                    }
+                }
+            }
+            .title {
+                line-height: 40px;
+                font-size: 20px;
+            }
 
+            .el-date-editor {
+                margin-right: 20px;
+            }
+        }
+        .el-main {
+            border-radius: 4px;
+            margin-top: 20px;
+            background-color: #ffffff;
+        }
+    }
+}
 </style>

src/components/DataAccess/Feedback.vue

@@ -0,0 +1,206 @@
+<template>
+    <div class="log_container">
+        <el-container>
+            <el-header>
+                <el-row>
+                    <el-col :span="12">
+                        <div class="title"> </div>
+                    </el-col>
+                    <el-col :span="24">
+                        <div>
+                            <el-date-picker
+                                v-model="datatime"
+                                type="datetimerange"
+                                :picker-options="pickerOptions"
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期"
+                                :align="$elDatePickerAlign"
+                            ></el-date-picker>
+                            <el-button type="primary" @click="search">查询</el-button>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-header>
+            <el-main>
+                <ListContainer
+                    v-bind="{
+                        listField: listField,
+                        listData: logList,
+                        noDataTip: '暂无数据',
+                        total: total,
+                        pageSize: pageSize,
+                        currentPage: page,
+                        searchData: getFeedback,
+                    }"
+                ></ListContainer>
+            </el-main>
+            <!-- <el-footer>
+                <div>
+                    <el-pagination
+                        background
+                        layout="prev, pager, next"
+                        :page-size="pageSize"
+                        :total="total"
+                        @current-change="currentPageChange"
+                    ></el-pagination>
+                </div>
+            </el-footer>-->
+        </el-container>
+    </div>
+</template>
+
+<script>
+import api from "@/api/datalog"
+export default {
+    components: { 
+        ListContainer: () => import("@/components/Currency/ListContainer.vue")
+    },
+    data() {
+        return {
+            pickerOptions: {
+                shortcuts: [{
+                    text: '最近一周',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近一个月',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }, {
+                    text: '最近三个月',
+                    onClick(picker) {
+                        const end = new Date();
+                        const start = new Date();
+                        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                        picker.$emit('pick', [start, end]);
+                    }
+                }]
+            },
+            datatime: [new Date(new Date().getTime() - 7 * 24 * 60 * 60 * 1000), new Date()],
+            page: 1,
+            pageSize: 20,
+            total: 0,
+            logList: [],
+            listField: [
+                {
+                    name: 'id',
+                    alias: 'id',
+                    span: 2
+                },
+                {
+                    name: 'userName',
+                    alias: '用户',
+                    span: 3
+                },
+                {
+                    name: 'loginIp',
+                    alias: 'IP',
+                    span: 3
+                },
+                {
+                    name: 'createTime',
+                    alias: '时间',
+                    span: 5
+                },
+                {
+                    name: 'dataState',
+                    alias: '状态',
+                    span: 2
+                },
+                {
+                    name: 'remarks',
+                    alias: '结果反馈',
+                    span: 7
+                }
+            ]
+        }
+    },
+    created() {
+        this.page = 1;
+        this.getFeedback(this.page);
+    },
+    methods: {
+        getFeedback(page) {
+            let that = this;
+            let requestData = new FormData;
+            requestData.append("page",page - 1);
+            requestData.append("pageSize",this.pageSize);
+            // let obj = {
+            //     page: page - 1,
+            //     pageSize: this.pageSize
+            // }
+            // if (this.datatime != null) {
+            //     obj.startDate = this.datatime[0].getTime()
+            //     obj.endDate = this.datatime[1].getTime()
+            // }
+            if (this.datatime != null) {
+                requestData.append("startDate",this.datatime[0].getTime());
+                requestData.append("endDate",this.datatime[1].getTime());
+            }
+            api.getFeedback(requestData).then((result) => {
+                if (result.code == 200) {
+                    that.total = result.total;
+                    that.logList = result.content == -1 || result.content == "" ? [] : result.content;
+                } else {
+                    this.$checkRequestCode(result)
+                }
+            }).catch((err) => {
+                that.$message({
+                    type: "error",
+                    message: err
+                })
+            });
+        },
+        search() {
+            this.page = 1;
+            this.getFeedback(this.page)
+        }
+    }
+}
+</script>
+
+<style lang="less" scoped>
+.log_container {
+    width: calc(100% - 20px);
+    height: 100%;
+    margin-left:20px;
+    .el-container {
+        width: 100%;
+        height: 100%;
+        .el-header {
+            background-color: #ffffff;
+            border-radius: 4px;
+            .el-row {
+                padding: 10px 0px;
+                .el-col:nth-child(2) {
+                    > div {
+                        float: right;
+                    }
+                }
+            }
+            .title {
+                line-height: 40px;
+                font-size: 20px;
+            }
+
+            .el-date-editor {
+                margin-right: 20px;
+            }
+        }
+        .el-main {
+            border-radius: 4px;
+            margin-top: 20px;
+            background-color: #ffffff;
+        }
+    }
+}
+</style>

src/components/DataAccess/ResultFeedback.vue

@@ -1,14 +0,0 @@
-<template>
-  
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style lang="less" scoped>
-
-</style>
- 

src/components/DataLayer/LayerDetail.vue

@@ -369,7 +369,7 @@ export default {
             that.dialogBeforeClose();
           } else {
             loading.close();
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {
@@ -402,7 +402,7 @@ export default {
             that.updateData();
             that.dialogBeforeClose();
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {

src/components/DataLayer/LayerManagement.vue

@@ -146,7 +146,7 @@ export default {
             that.edit = false;
             that.isShowAddModelDetailDialog = true;
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {
@@ -172,7 +172,7 @@ export default {
             that.edit = true;
             that.isShowAddModelDetailDialog = true;
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {
@@ -200,7 +200,7 @@ export default {
               if (response.code == 200) {
                 that.$message({ type: "success", message: "删除成功!" });
               } else {
-                checkRequestCode(result);
+                this.$checkRequestCode(result);
               }
               that.getMenu();
             })

src/components/DataServices/ServiceMonitoring.vue

@@ -15,7 +15,7 @@
                                 range-separator="至"
                                 start-placeholder="开始日期"
                                 end-placeholder="结束日期"
-                                align="right"
+                                :align="$elDatePickerAlign"
                             ></el-date-picker>
                             <el-button type="primary" @click="search">查询</el-button>
                         </div>
@@ -134,7 +134,7 @@ export default {
                     that.total = result.total;
                     that.logList = result.content == -1 || result.content == "" ? [] : result.content;
                 } else {
-                    checkRequestCode(result)
+                    this.$checkRequestCode(result)
                 }
             }).catch((err) => {
                 that.$message({

src/components/SystemManagement/AuthorityManagement.vue

@@ -114,7 +114,7 @@ export default {
               })
             );
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {

src/components/SystemManagement/UserManagement.vue

@@ -167,7 +167,7 @@ export default {
               })
             );
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {
@@ -188,7 +188,7 @@ export default {
             if (result.code == 200) {
               resolve(result.content);
             } else {
-              checkRequestCode(result);
+              this.$checkRequestCode(result);
               reject();
             }
           })
@@ -225,7 +225,7 @@ export default {
               });
               resolve(result.content);
             } else {
-              checkRequestCode(result);
+              this.$checkRequestCode(result);
               reject();
             }
           })

src/main.js

@@ -12,6 +12,39 @@ import VueStorage from 'vue-ls'
 Vue.use(VueStorage)
 
 Vue.config.productionTip = false;
+Vue.prototype.$elDatePickerAlign = "right";
+let requestCode = systemConfig.requestCode;
+Vue.prototype.$checkRequestCode = (result) => {
+  return new Promise((resolve, reject) => {
+    if (result.code == 212) {
+      let obj = this.getParams();
+      let autologin1 = obj.autologin;
+      let autologin2 = localStorage.getItem("autologin");
+      if (
+        autologin1 == 1 ||
+        autologin2 != null ||
+        autologin2 != undefined
+      ) {
+        this.loginFunc();
+      } else {
+        this.$store.commit("setToken", "");
+        this.$store.commit("setUserState", false);
+      }
+    } else {
+      let code = requestCode[result.code];
+      if (code == 206 || code == 207 || code == 208) {
+        this.$router.push({
+          path: "/error",
+        });
+      } else {
+        ElementUI.Message({
+          type: "warning",
+          message: requestCode[result.code],
+        });
+      }
+    }
+  });
+}
 
 // 时间格式化
 Vue.prototype.dateFormat = function (value, fmt) {

src/views/DataAccess.vue

@@ -15,6 +15,8 @@
             index: Number(showIndex),
           }"
         ></DataTable>
+        <DataLog v-if="showIndex == '3'"></DataLog>
+        <Feedback v-if="showIndex == '4'"></Feedback>
       </el-main>
     </el-container>
   </div>
@@ -38,8 +40,9 @@ export default {
     Aside: () => import("@/components/Currency/Aside.vue"),
     DataTable: () => import("@/components/Currency/DataTable/DataTable.vue"),
     DataLog: () => import("@/components/DataAccess/DataLog.vue"),
-    ResultFeedback: () => import("@/components/DataAccess/ResultFeedback.vue"),
+    Feedback: () => import("@/components/DataAccess/Feedback.vue")
   },
+    
   created() {
     let that = this;
     this.menuList =

src/views/Home.vue

@@ -161,7 +161,6 @@ export default {
   },
   beforeCreate() {
     window.loginFunc = this.loginFunc;
-    window.checkRequestCode = this.checkRequestCode;
     window.getMenu = this.getMenu;
     window.getIcon = this.getIcon;
   },
@@ -217,6 +216,7 @@ export default {
       // 页面刷新
       location.reload();
     },
+
     // 权限筛选
     permissionFiltering(permissionArr) {
       let list = JSON.parse(
@@ -300,7 +300,7 @@ export default {
           if (result.code == 200) {
             that.$store.commit("setLayerList", result.content);
           } else {
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {
@@ -320,7 +320,7 @@ export default {
             that.$store.commit("setIconList", result.content);
           } else {
             result.message = "标注图片获取失败，请重试！";
-            checkRequestCode(result);
+            this.$checkRequestCode(result);
           }
         })
         .catch((err) => {

zjyzt_gis_master_web_ui.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>