From 512b3db63043aa0095f890e340bb04aee09f931f Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Sat, 9 Oct 2021 09:59:40 +0800
Subject: [PATCH 1/3] init

---
 vue.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 519e85d..5cfc56f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,8 +3,8 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://pigx-gateway'
-const url = 'http://39.97.167.65:9999' //测试
-// const url = 'http://192.168.31.160:9999' //长龙
+// const url = 'http://39.97.167.65:9999' //测试
+const url = 'http://192.168.31.160:9999' //长龙
 // const url = 'http://192.168.31.128:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 

From 16a65c7a1f646ed1f5b7592fe3a88105efb0bff7 Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Sat, 9 Oct 2021 10:42:29 +0800
Subject: [PATCH 2/3] init

---
 src/views/Equipment/equipmentDetailList.vue       |  8 +++++++-
 src/views/Equipment/equipmentOnlineRecordList.vue |  8 +++++++-
 src/views/admin/user/index.vue                    | 11 +++++++----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue
index 1a280e2..3f0c1ef 100644
--- a/src/views/Equipment/equipmentDetailList.vue
+++ b/src/views/Equipment/equipmentDetailList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="box-center">
     <div class="titlebox">
       <div
         style="
@@ -1245,6 +1245,12 @@ export default {
 </script>
 
 <style lang='less' scoped>
+.box-center {
+  width: 100%;
+  padding: 15px;
+  min-width: 1200px;
+  padding-bottom: 100px;
+}
 .toptimeqhuan {
   width: 230px;
   height: 40px;
diff --git a/src/views/Equipment/equipmentOnlineRecordList.vue b/src/views/Equipment/equipmentOnlineRecordList.vue
index 8508109..add08d3 100644
--- a/src/views/Equipment/equipmentOnlineRecordList.vue
+++ b/src/views/Equipment/equipmentOnlineRecordList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="box-center">
     <div class="toptab">
       <div
         @click="tapclickyab(0)"
@@ -482,6 +482,12 @@ export default {
 </script>
 
 <style  scoped >
+.box-center {
+  width: 100%;
+  padding: 15px;
+  min-width: 1200px;
+  padding-bottom: 100px;
+}
 .toptab {
   width: 100%;
   display: flex;
diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue
index 72e7e63..8ded47f 100644
--- a/src/views/admin/user/index.vue
+++ b/src/views/admin/user/index.vue
@@ -426,8 +426,8 @@
           </div>
           <div class="right" >
             <div v-for="(item,index) in firstList" :key="item.id">
-              <div style="display:flex;">
-                <div>{{item.name}}</div>
+              <div style="display:flex; margin:5px;">
+                <div style=" line-height: 32px;  margin-right: 10px;">{{item.name}}</div>
                 <el-select v-model="item.cityIds" clearable multiple placeholder="默认为全部" style="width:400px;">
                         <el-option
                               v-for="item1 in item.cityAreaList"
@@ -782,6 +782,7 @@
       },
       // 删除区域
       delArea(idx,flag){
+        console.log(flag,idx);
         // 第一个删除
         if(flag==0){
           // 先获取删除数组的内容，将其内容放到第三个数组里面
@@ -796,10 +797,12 @@
           // 删除数组的指定项
           this.firstList.splice(idx,1)
         }else{
-           let obj=this.thirdList[idx]
+           let obj=this.fourthList[idx]
            this.secondList.push(obj)
+          //  console.log(this.fourthList);
            // 删除数组的指定项
-          this.thirdList.splice(idx,1)
+          this.fourthList.splice(idx,1)
+          // console.log(this.fourthList);
         }
       },
       // 点击添加时的操作

From 2f1195b055a013e0e208b5567ee5018dac7bf16e Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Mon, 11 Oct 2021 10:42:39 +0800
Subject: [PATCH 3/3] init

---
 src/views/Customer/SalesStage.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/Customer/SalesStage.vue b/src/views/Customer/SalesStage.vue
index 8cf0efe..a0f9ced 100644
--- a/src/views/Customer/SalesStage.vue
+++ b/src/views/Customer/SalesStage.vue
@@ -67,7 +67,7 @@
           <el-input v-model="ruleForm.stageName"></el-input>
         </el-form-item>
         <el-form-item label="顺序：" prop="sort">
-          <el-input v-model="ruleForm.sort"></el-input>
+          <el-input v-model="ruleForm.sort" onkeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)));"></el-input>
         </el-form-item>
         <el-form-item label="备注：">
           <el-input v-model="ruleForm.remarks"></el-input>
@@ -146,7 +146,7 @@ export default {
       });
     },
     //删除
-    toinifodelete(item) {
+    toinifodelete(row) {
       this.$confirm("此操作将永久删除, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -204,18 +204,18 @@ export default {
               if (res.code == 0) {
                 this.dialogVisible = false;
                 this.$message.success("编辑成功");
-                this.zkhousePage();
+                this.findbypage();
               }
             });
           } else {
             // 添加
             console.log("添加");
-            this.$api.api.lifeTrackDefineAdd(this.ruleForm).then((res) => {
+            this.$api.api.lifeTrackDefineAdd({houseId:this.houseId,...this.ruleForm,}).then((res) => {
               console.log(res);
               if (res.code == 0) {
                 this.dialogVisible = false;
                 this.$message.success("新增成功");
-                this.zkhousePage();
+                this.findbypage();
               }
             });
           }