e 6 months ago
parent
commit
5bce2ce84b

+ 10 - 4
JS高级/14.数据类型判断.html

@@ -8,7 +8,13 @@
 <body>
     <script>
         var a = '123';
-        console.log(typeof a);
+        console.log(typeof null);
+        if(null===undefined) {
+            console.log(1)
+        }else {
+            console.log(2)
+        }
+        // 0.1+0.2!=0.3
         /**
          * 1.typeof 类型判断
          * 2.instanceof
@@ -18,9 +24,9 @@
        var fn1 = function() {
         console.log("这是一个函数");
        }
-       console.log(fn1 instanceof Array);
-       console.log(Object.prototype.toString.call('true'));
-       var num = '111';
+       console.log(fn1 instanceof Function);
+       console.log(Object.prototype.toString.call(true));
+       var num = 10;
        console.log(num.constructor);
     </script>
 </body>

+ 8 - 8
JS高级/20.proxy.html

@@ -25,16 +25,16 @@
                 console.log(prototype,'代理值');
                 return target;
             },
-            set(target,key,prototype) {
-                console.log(target,'原对象')
-                console.log(key,'修改的属性');
-                console.log(prototype,'新对象');
-                //执行代理中的内容
-                return target[key] = 'AAA';
-            }
+            // set(target,key,prototype) {
+            //     console.log(target,'原对象')
+            //     console.log(key,'修改的属性');
+            //     console.log(prototype,'新对象');
+            //     //执行代理中的内容
+            //     return target[key] = 'AAA';
+            // }
         })
         vase.name = 'LiLi';
-        console.log(vase.set);
+        console.log(vase.hi);
         // console.log(vase.get.name);
         // console.log(vase.set);
     </script>

+ 1 - 0
JS高级/23.继承1.0.html

@@ -28,6 +28,7 @@
       /**
        * 因为两个实例使用的是同一个原型,所以一个修改另一个也会发生改变
       */
+    
       a2.arr.push(10);
       a1.name += 10; //a1.name = a1.name + 10
       a2.name += 20;

+ 4 - 2
JS高级/24.继承2.0.html

@@ -26,8 +26,9 @@
           Father.call(this);
        }
        let newChild = new Child();
+       console.log(newChild,'哈哈')
        newChild.fn1();
-       console.log(newChild);
+      //  console.log(newChild);
        let a1 = new Child();
        let a2 = new Child();
        a1.name += 10;
@@ -35,12 +36,13 @@
        a2.arr.push(10);
        console.log(a1,'a1');
        console.log(a2,'a2');
+
        /**
         * 构造函数继承可以解决原型链继承的同时修改引用数据类型的缺点
         * 可以使用父级构造函数上的属性和方法
         * 不可以使用父级原型上的属性和方法 
        */
-       console.log(newChild.getColor());
+      //  console.log(newChild.getColor());
 
        
 

+ 1 - 1
JS高级/31.浅拷贝.html

@@ -21,7 +21,7 @@
 
        var obj2 = obj1;
 
-       obj2.name = 'zjr';
+       obj2.name = '哈哈哈';
 
        console.log(obj1,'obj1');
        console.log(obj2,'obj2');

+ 10 - 10
JS高级/32.深拷贝.html

@@ -13,14 +13,14 @@
        * concat、slice、Array.from(),数组结构 一维数组
        * Object.assign、对象解构
        */
-      //   var arr1 = [1, 2, 3, 4];
-      //   var arr2 = [...arr1];
-      //   var arr2 = Array.from(arr1);
-      //   var arr2 = arr1.slice();
-      //   var arr2 = arr1.concat();
-      //   arr2[0] = 12;
-      //   console.log(arr1, "arr1");
-      //   console.log(arr2, "arr2");
+        // var arr1 = [1, 2, 3, 4];
+        // var arr2 = [...arr1];
+        // var arr2 = Array.from(arr1);
+        // var arr2 = arr1.slice();
+        // var arr2 = arr1.concat();
+        // arr2[0] = 12;
+        // console.log(arr1, "arr1");
+        // console.log(arr2, "arr2");
 
       var obj1 = {
         name: "xhs",
@@ -30,8 +30,8 @@
         },
       };
 
-    //   var obj2 = Object.assign({},obj1);
-    var obj2 = {...obj1};
+      var obj2 = Object.assign({},obj1);
+    // var obj2 = {...obj1};
       obj2.name = 'xhm';
       console.log(obj1,'obj1');
       console.log(obj2,'obj2');

+ 1 - 1
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: '/addressController/getAddress/1/1',
+    url: '/addressController/getAddress',
     method: 'get'
   })
 }

+ 1 - 1
vue2.0/vue项目/vue-admin-template-master/src/api/level.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取等级
 export function showLevel() {
   return request({
-    url: '/levelController/getLevel/1/2',
+    url: '/levelController/getLevel',
     method: 'get'
   })
 }

+ 3 - 3
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: '/messageController/getMessage/1/1',
+    url: '/messageController/getMessage',
     method: 'get'
   })
 }
@@ -38,7 +38,7 @@ export function insertAllMessage(data) {
 // 根据ID获取信息
 export function showOneMessage(data) {
   return request({
-    url: '/messageController/getMessage/1/1',
+    url: '/messageController/getMessageById',
     method: 'get',
     params: data
   })
@@ -47,7 +47,7 @@ export function showOneMessage(data) {
 // 根据地址筛选信息
 export function searchaddressid(params) {
   return request({
-    url: '/messageController/getMessage/1/1',
+    url: '/messageController/getMessageByAddrId',
     method: 'get',
     params
   })

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

@@ -51,7 +51,6 @@ export default {
   },
   methods: {
     submitForm(formName) {
-      console.log(this.ruleForm);
       this.$refs[formName].validate((valid) => {
         if (valid) {
           insertOneAddress({

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

@@ -37,7 +37,6 @@ export default {
         .then((res) => {
           if (res.code == 200) {
             this.tableData = res.data.records;
-            console.log(this.tableData,'table')
           }
         })
         .catch((err) => {

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

@@ -86,19 +86,17 @@ export default {
   },
   created() {
     this.id = this.$route.query.ids
-    console.log(this.id,'id')
     if (this.id) {
       this.open = true
       showOneMessage({
-        id: this.id
+        jrid: this.id
       })
         .then((res) => {
-          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
+            this.ruleForm.uname = res.data.jrname
+            this.ruleForm.addressid = res.data.jraddressesid
+            this.ruleForm.tel = res.data.jrtel
+            this.ruleForm.levelid = res.data.jrlevel
           }
         })
         .catch((err) => {

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

@@ -16,11 +16,11 @@
     </el-form>
     <el-table :data="tableData" style="width: 100%" height="550">
       <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="jrid" label="等级ID" width="230" />
-      <el-table-column property="levelName" label="等级名称" width="230" />
-      <el-table-column property="addressname" label="地址名称" width="230" />
+      <el-table-column prop="jrname" label="姓名" width="230" />
+      <el-table-column prop="jrtel" label="电话号" width="230" />
+      <el-table-column prop="jrid" label="等级ID" width="230" />
+      <el-table-column prop="levelname" label="等级名称" width="230" />
+      <el-table-column prop="addressname" label="地址名称" width="230" />
       <el-table-column label="操作" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
@@ -65,22 +65,6 @@ export default {
             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) => {
@@ -88,23 +72,22 @@ export default {
         })
     },
     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
+      for(let i in this.tableData) {
+        for (var x = 0; x < this.addressList.length; x++) {
+          if (this.tableData[i].jraddressesid == this.addressList[x].addressid) {
+            this.tableData[i].addressname = this.addressList[x].addressname
           }
         }
-      })
+      }
     },
     level() {
-      this.tableData.forEach((item) => {
+      for(let i in this.tableData) {
         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
+          if (this.tableData[i].jrlevel == this.levelList[x].jrid) {
+            this.tableData[i].levelname = this.levelList[x]?.levelname
           }
         }
-      })
+      }
     },
     // 获取地址
     getAddress() {
@@ -127,13 +110,10 @@ export default {
           ids: row.jrid
         }
       })
-      console.log(row)
     },
     // 删除
     handleDelete(row) {
-      console.log(row.jrid)
       delOneMessage([row.jrid]).then(res => {
-        console.log(res, '成功')
         if (res.code == 200) {
           this.$message({
             message: res.message,
@@ -148,18 +128,12 @@ export default {
     // 搜索
     onSubmit() {
       searchaddressid({
-        searchid: this.form.addressid
+        jraddressesid: this.form.addressid
       }).then(res => {
         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++) {
-                this.tableData[i].addressname = item.addressname
-                this.tableData[i].levelname = '暂无信息'
-              }
-            }
-          })
+          this.tableData = res.data
+            this.address()
+            this.level()
         }
       }).catch(err => {
         console.log(err)