Merge branch 'kk_mes'

pages/basicData/roleManagent/index.vue

@@ -291,7 +291,7 @@ export default {
       service
         .delete(`${systemUrl}/MyRole/Delete?id=${this.keyid}`)
         .then((response) => {
-          if (response.data.success) {
+          if (response.success) {
             that.$Message.success('删除成功')
             that.loaddata()
           }
@@ -322,7 +322,7 @@ export default {
                 JSON.stringify(this.formValidate1)
               )
               .then((response) => {
-                if (response.data.success) {
+                if (response.success) {
                   that.$Message.success('保存成功')
                   that.loaddata()
                 }
@@ -337,7 +337,7 @@ export default {
                 JSON.stringify(this.formValidate1)
               )
               .then((response) => {
-                if (response.data.success) {
+                if (response.success) {
                   this.$Message.success('保存成功')
                   that.loaddata()
                 }

pages/basicData/systemlog/index.vue

@@ -18,9 +18,9 @@
           <Input v-model="model2" placeholder="用户账户/姓名" style="width: 240px"></Input>
           <Button type="primary" @click="search">查询</Button>
         </div>
-        <div style="float:right" class="paddingbtn">
+        <!-- <div style="float:right" class="paddingbtn">
           <Button type="primary" @click="export2Excel" style="margin-left:6px">导出</Button>
-        </div>
+        </div> -->
       </div>
       <div class="mt10">
         <tb :tbPro="tbPro" ref="table"></tb>
@@ -183,8 +183,8 @@ export default {
         })
         .then((response) => {
           //console.log(response)
-          this.total = response.data.result.totalCount
-          this.tbPro.data = response.data.result.items
+          this.total = response.result.totalCount
+          this.tbPro.data = response.result.items
           this.tbPro.loading=false
         })
     },
@@ -196,7 +196,8 @@ export default {
       this.pageSize = val
       this.lodata()
     },
-    // export2Excel() {
+    export2Excel() {
+
     //   require.ensure([], () => {
     //     const { export_json_to_excel } = require('@/vendor/Export2Excel')
     //     const tHeader = [
@@ -246,7 +247,7 @@ export default {
     //         export_json_to_excel(tHeader, data, '系统日志')
     //       })
     //   })
-    // },
+    },
     formatJson(filterVal, jsonData) {
       return jsonData.map((v) => filterVal.map((j) => v[j]))
     }