e před 5 měsíci
rodič
revize
114cc24e00

+ 6 - 6
vue2.0/vue项目/vue-admin-template-master/src/api/address.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取地址
 export function showAddresses() {
   return request({
-    url: '/showAddresses',
+    url: '/addressController/getAddress/1/1',
     method: 'get'
   })
 }
@@ -11,17 +11,17 @@ export function showAddresses() {
 // 添加地址
 export function insertOneAddress(data) {
   return request({
-    url: '/insertOneAddress',
+    url: '/addressController/saveOrUpdateAddress',
     method: 'post',
     data
   })
 }
 
 // 删除地址
-export function delOneAddress(params) {
+export function delOneAddress(data) {
   return request({
-    url: '/delOneAddress',
-    method: 'get',
-    params
+    url: '/addressController/deleteAddress',
+    method: 'delete',
+    data
   })
 }

+ 11 - 11
vue2.0/vue项目/vue-admin-template-master/src/api/message.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 信息列表
 export function showMessage() {
   return request({
-    url: '/showMessage',
+    url: '/messageController/getMessage/1/1',
     method: 'get'
   })
 }
@@ -11,16 +11,16 @@ export function showMessage() {
 // 删除信息
 export function delOneMessage(data) {
   return request({
-    url: '/delOneMessage',
-    method: 'get',
-    params: data
+    url: '/messageController/deleteMessage',
+    method: 'delete',
+    data
   })
 }
 
 // 修改信息
 export function updateMessage(data) {
   return request({
-    url: '/updateMessage',
+    url: '/messageController/saveOrUpdateMessage',
     method: 'post',
     data
   })
@@ -29,7 +29,7 @@ export function updateMessage(data) {
 // 添加信息
 export function insertAllMessage(data) {
   return request({
-    url: '/insertAllMessage',
+    url: '/messageController/saveOrUpdateMessage',
     method: 'post',
     data
   })
@@ -38,17 +38,17 @@ export function insertAllMessage(data) {
 // 根据ID获取信息
 export function showOneMessage(data) {
   return request({
-    url: '/showOneMessage',
+    url: '/messageController/getMessage/1/1',
     method: 'get',
     params: data
   })
 }
 
 // 根据地址筛选信息
-export function searchaddressid(data) {
+export function searchaddressid(params) {
   return request({
-    url: '/searchaddressid',
-    method: 'post',
-    data
+    url: '/messageController/getMessage/1/1',
+    method: 'get',
+    params
   })
 }

+ 2 - 2
vue2.0/vue项目/vue-admin-template-master/src/views/address/addAddress.vue

@@ -55,12 +55,12 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           insertOneAddress({
-            address: this.ruleForm.address,
+            addressname: this.ruleForm.address,
             longitude: this.ruleForm.longitude,
             latitude: this.ruleForm.latitude,
           })
             .then((res) => {
-              if (res.code == 101) {
+              if (res.code == 200) {
                 this.$message({
                   message: res.message,
                   type: "success",

+ 4 - 6
vue2.0/vue项目/vue-admin-template-master/src/views/address/list.vue

@@ -31,8 +31,8 @@ export default {
     init() {
       showAddresses()
         .then((res) => {
-          if (res.code == 101) {
-            this.tableData = res.data;
+          if (res.code == 200) {
+            this.tableData = res.data.records;
           }
         })
         .catch((err) => {
@@ -42,11 +42,9 @@ export default {
     handleDelete(row) {
       let _id = row.addressid;
       console.log(_id);
-      delOneAddress({
-        addressid: _id,
-      })
+      delOneAddress([_id])
         .then((res) => {
-          if (res.code == 101) {
+          if (res.code == 200) {
             this.$message({
               message: res.message,
               type: "success",

+ 1 - 1
vue2.0/vue项目/vue-admin-template-master/src/views/level/addLevel.vue

@@ -50,7 +50,7 @@ import {insertOneLevel} from '@/api/level.js';
             insertOneLevel({
               levelname:this.newForm.levelname
             }).then(res => {
-              if(res.code == 101) {
+              if(res.code == 200) {
                 this.$message({
                   message: res.message,
                   type: 'success'

+ 0 - 1
vue2.0/vue项目/vue-admin-template-master/src/views/level/levelList.vue

@@ -46,7 +46,6 @@ export default {
     },
     deleteRow(item) {
       const newId = item.jrid
-      console.log(newId, '222')
       delOneLevel([newId])
         .then((res) => {
           // if (res.code == 101) {

+ 78 - 72
vue2.0/vue项目/vue-admin-template-master/src/views/message/addList.vue

@@ -34,12 +34,16 @@
         <el-input v-model="ruleForm.tel" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="submitForm('ruleForm')" v-if="open"
-          >修改</el-button
-        >
-        <el-button type="primary" @click="submitForm('ruleForm')" v-else
-          >提交</el-button
-        >
+        <el-button
+          v-if="open"
+          type="primary"
+          @click="submitForm('ruleForm')"
+        >修改</el-button>
+        <el-button
+          v-else
+          type="primary"
+          @click="submitForm('ruleForm')"
+        >提交</el-button>
         <el-button @click="resetForm('ruleForm')">重置</el-button>
       </el-form-item>
     </el-form>
@@ -47,83 +51,85 @@
 </template>
 
 <script>
-import { showAddresses } from "@/api/address.js";
-import { showLevel } from "@/api/level.js";
+import { showAddresses } from '@/api/address.js'
+import { showLevel } from '@/api/level.js'
 import {
   insertAllMessage,
   showOneMessage,
-  updateMessage,
-} from "@/api/message.js";
+  updateMessage
+} from '@/api/message.js'
 export default {
   data() {
     return {
       ruleForm: {
-        uname: "",
-        addressid: "",
-        levelid: "",
-        tel: "",
-        arr1: "",
+        uname: '',
+        addressid: '',
+        levelid: '',
+        tel: '',
+        arr1: ''
       },
       addressList: [],
       levelList: [],
       rules: {
-        uname: [{ required: true, message: "请输入用户名称", trigger: "blur" }],
+        uname: [{ required: true, message: '请输入用户名称', trigger: 'blur' }],
         addressid: [
-          { required: true, message: "请选择地址名称", trigger: "change" },
+          { required: true, message: '请选择地址名称', trigger: 'change' }
         ],
-        tel: [{ required: true, message: "请输入电话号码", trigger: "blur" }],
+        tel: [{ required: true, message: '请输入电话号码', trigger: 'blur' }],
         levelid: [
-          { required: true, message: "请选择等级名称", trigger: "change" },
-        ],
+          { required: true, message: '请选择等级名称', trigger: 'change' }
+        ]
       },
-      id: "",
-      open: false,
-    };
+      id: '',
+      open: false
+    }
   },
   created() {
-    this.id = this.$route.query.ids;
+    this.id = this.$route.query.ids
+    console.log(this.id,'id')
     if (this.id) {
-      this.open = true;
+      this.open = true
       showOneMessage({
-        id: this.id,
+        id: this.id
       })
         .then((res) => {
-          if (res.code == 101) {
-            this.ruleForm.uname = res.data[0].jrname;
-            this.ruleForm.addressid = res.data[0].jraddressesid;
-            this.ruleForm.tel = res.data[0].jrtel;
-            this.ruleForm.levelid = res.data[0].jrlevel;
+          console.log(res,'res')
+          if (res.code == 200) {
+            this.ruleForm.uname = res.data.records[0].jrname
+            this.ruleForm.addressid = res.data.records[0].jraddressesid
+            this.ruleForm.tel = res.data.records[0].jrtel
+            this.ruleForm.levelid = res.data.records[0].jrlevel
           }
         })
         .catch((err) => {
-          console.log(err);
-        });
+          console.log(err)
+        })
     } else {
-      this.open = false;
+      this.open = false
     }
-    this.getAddress();
-    this.getLevel();
+    this.getAddress()
+    this.getLevel()
   },
   methods: {
     // 获取所有地址
     getAddress() {
       showAddresses()
         .then((res) => {
-          this.addressList = res.data;
+          this.addressList = res.data.records
         })
         .catch((err) => {
-          console.log(err);
-        });
+          console.log(err)
+        })
     },
     // 获取所有等级
     getLevel() {
       showLevel()
         .then((res) => {
-          this.levelList = res.data;
+          this.levelList = res.data.records
         })
         .catch((err) => {
-          console.log(err);
-        });
+          console.log(err)
+        })
     },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
@@ -131,58 +137,58 @@ export default {
           if (this.open) {
             // 修改
             updateMessage({
-              id: this.id,
-              uname: this.ruleForm.uname,
-              addressid: this.ruleForm.addressid,
-              levelid: this.ruleForm.levelid,
-              tel: this.ruleForm.tel,
+              jrid: this.id,
+              jrname: this.ruleForm.uname,
+              jraddressesid: this.ruleForm.addressid,
+              jrlevel: this.ruleForm.levelid,
+              jrtel: this.ruleForm.tel
             })
               .then((res) => {
-                if (res.code == 101) {
+                if (res.code == 200) {
                   this.$message({
                     message: res.message,
-                    type: "success",
-                  });
-                  this.resetForm("ruleForm");
-                  this.$router.push("./messageList");
+                    type: 'success'
+                  })
+                  this.resetForm('ruleForm')
+                  this.$router.push('./messageList')
                 }
               })
               .catch((err) => {
-                console.log(err, "失败");
-              });
+                console.log(err, '失败')
+              })
           } else {
             // 添加
             insertAllMessage({
-              uname: this.ruleForm.uname,
-              addressid: this.ruleForm.addressid,
-              levelid: this.ruleForm.levelid,
-              tel: this.ruleForm.tel,
+              jrname: this.ruleForm.uname,
+              jraddressesid: this.ruleForm.addressid,
+              jrlevel: this.ruleForm.levelid,
+              jrtel: this.ruleForm.tel
             })
               .then((res) => {
-                if (res.code == 101) {
+                if (res.code == 200) {
                   this.$message({
                     message: res.message,
-                    type: "success",
-                  });
-                  this.resetForm("ruleForm");
-                  this.$router.push("./messageList");
+                    type: 'success'
+                  })
+                  this.resetForm('ruleForm')
+                  this.$router.push('./messageList')
                 }
               })
               .catch((err) => {
-                console.log(err);
-              });
+                console.log(err)
+              })
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
+      })
     },
     resetForm(formName) {
-      this.$refs[formName].resetFields();
-    },
-  },
-};
+      this.$refs[formName].resetFields()
+    }
+  }
+}
 </script>
 
 <style scoped>

+ 56 - 13
vue2.0/vue项目/vue-admin-template-master/src/views/message/list.vue

@@ -18,8 +18,8 @@
       <el-table-column type="index" width="50" />
       <el-table-column property="jrname" label="姓名" width="230" />
       <el-table-column property="jrtel" label="电话号" width="230" />
-      <el-table-column property="jrlevel" label="等级ID" width="230" />
-      <el-table-column property="levelname" label="等级名称" width="230" />
+      <el-table-column property="jrid" label="等级ID" width="230" />
+      <el-table-column property="levelName" label="等级名称" width="230" />
       <el-table-column property="addressname" label="地址名称" width="230" />
       <el-table-column label="操作" width="200" fixed="right">
         <template slot-scope="scope">
@@ -40,6 +40,7 @@
 
 <script>
 import { showMessage, delOneMessage, searchaddressid } from '@/api/message.js'
+import { showLevel } from '@/api/level.js'
 import { showAddresses } from '@/api/address.js'
 export default {
   data() {
@@ -49,29 +50,73 @@ export default {
         addressid: ''
       },
       addressList: [],
+      levelList: []
     }
   },
   created() {
-    this.init()
-    this.getAddress()
+    this.getLevel()
   },
   methods: {
     // 初始化列表
     init() {
       showMessage()
         .then((res) => {
-          if (res.code == 101) {
-            this.tableData = res.data
+          if (res.code == 200) {
+            this.tableData = res.data.records
+            this.address()
+            this.level()
+            // this.tableData.forEach((item) => {
+            //   for (var i = 0; i < this.addressList.length; i++) {
+            //     if (item.jraddressesid == this.addressList[i].addressid) {
+            //       this.tableData[i].addressname = this.addressList[i].addressname
+            //     }
+            //   }
+            //   for (var x = 0; x < this.levelList.length; x++) {
+            //     console.log(this.levelList,'xxxx')
+            //     console.log(this.levelList[x].jrid,'jrid')
+            //     console.log(item.jrlevel,'item.jrlevel')
+            //     if (item.jrlevel === this.levelList[x].jrid) {
+            //       console.log("走进来",item)
+            //       this.tableData[x].levelname = this.levelList[x].levelname
+            //     }
+            //   }
+            // })
           }
         })
         .catch((err) => {
           console.log(err)
         })
     },
+    address() {
+      this.tableData.forEach((item) => {
+        for (var i = 0; i < this.addressList.length; i++) {
+          if (item.jraddressesid == this.addressList[i].addressid) {
+            this.tableData[i].addressname = this.addressList[i].addressname
+          }
+        }
+      })
+    },
+    level() {
+      this.tableData.forEach((item) => {
+        for (var x = 0; x < this.levelList.length; x++) {
+          if (item.jrlevel === this.levelList[x].jrid) {
+            console.log('走进来', item)
+            this.tableData[x].levelName = this.levelList[x]?.levelname
+          }
+        }
+      })
+    },
     // 获取地址
     getAddress() {
       showAddresses().then(res => {
-        this.addressList = res.data
+        this.addressList = res.data.records
+        this.init()
+      }).catch((err) => { console.log(err) })
+    },
+    getLevel() {
+      showLevel().then(res => {
+        this.levelList = res.data.records
+        this.getAddress()
       }).catch((err) => { console.log(err) })
     },
     // 编辑
@@ -87,11 +132,9 @@ export default {
     // 删除
     handleDelete(row) {
       console.log(row.jrid)
-      delOneMessage({
-        id: row.jrid
-      }).then(res => {
+      delOneMessage([row.jrid]).then(res => {
         console.log(res, '成功')
-        if (res.code == 101) {
+        if (res.code == 200) {
           this.$message({
             message: res.message,
             type: 'success'
@@ -107,8 +150,8 @@ export default {
       searchaddressid({
         searchid: this.form.addressid
       }).then(res => {
-        if (res.code == 101) {
-          this.tableData = res.data
+        if (res.code == 200) {
+          this.tableData = res.data.records
           this.addressList.forEach((item) => {
             if (item.addressid == this.form.addressid) {
               for (var i = 0; i < this.tableData.length; i++) {