提交

package.json

@@ -75,7 +75,7 @@
     "eslint-plugin-vue": "7.2.0",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",
-    "sass": "1.32.13",
+    "node-sass": "4.14.1",
     "sass-loader": "10.1.1",
     "script-ext-html-webpack-plugin": "2.1.5",
     "svg-sprite-loader": "5.1.1",

src/components/FileUpload/index.vue

@@ -261,7 +261,7 @@ ul {
   display: flex;
 }
 
-::v-deep .el-upload-list li {
+/deep/ .el-upload-list li {
   margin-right: 10px;
   width: 150px;
   height: 80px;
@@ -283,7 +283,7 @@ ul {
   right: 5px;
 }
 
-::v-deep .el-upload-list li img {
+/deep/ .el-upload-list li img {
   height: 70px;
   width: 70px;
   object-fit: contain;

src/components/HeaderSearch/index.vue

@@ -169,7 +169,7 @@ export default {
     display: inline-block;
     vertical-align: middle;
 
-    ::v-deep .el-input__inner {
+    /deep/ .el-input__inner {
       border-radius: 0;
       border: 0;
       padding-left: 0;

src/components/ImageUpload/index.vue

@@ -213,16 +213,16 @@ export default {
 </script>
 <style scoped lang="scss">
 // .el-upload--picture-card 控制加号部分
-::v-deep.hide .el-upload--picture-card {
+/deep/.hide .el-upload--picture-card {
   display: none;
 }
 // 去掉动画效果
-::v-deep .el-list-enter-active,
-::v-deep .el-list-leave-active {
+/deep/ .el-list-enter-active,
+/deep/ .el-list-leave-active {
   transition: all 0s;
 }
 
-::v-deep .el-list-enter,
+/deep/ .el-list-enter,
 .el-list-leave-active {
   opacity: 0;
   transform: translateY(0);

src/components/RightToolbar/index.vue

@@ -75,13 +75,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .el-transfer__button {
+/deep/ .el-transfer__button {
   border-radius: 50%;
   padding: 12px;
   display: block;
   margin-left: 0px;
 }
-::v-deep .el-transfer__button:first-child {
+/deep/ .el-transfer__button:first-child {
   margin-bottom: 10px;
 }
 </style>

src/layout/components/TagsView/ScrollPane.vue

@@ -82,7 +82,7 @@ export default {
   position: relative;
   overflow: hidden;
   width: 100%;
-  ::v-deep {
+  /deep/ {
     .el-scrollbar__bar {
       bottom: 0px;
     }

src/views/changfang/index.vue

@@ -883,6 +883,9 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+/deep/ .el-table__fixed-right {
+  height: 100% !important;
+}
 .img_lists {
   width: 120px;
   height: 120px;

src/views/chuzu/index.vue

@@ -2550,21 +2550,26 @@
       submitForm() {
         this.$refs["form"].validate((valid) => {
           if (valid) {
-            this.form.landlordId = this.landlordlistList[0].id
             this.form.leaseFloor = JSON.stringify(this.leaseFloorList);
-            this.form.applicant = this.userinfo.nickName
-            this.form.phonenumber = this.userinfo.phonenumber
             this.form.startDatetime = this.form.daterangeDatetime1[0]
             this.form.endDatetime = this.form.daterangeDatetime1[1]
-            console.log('出租申请', this.form);
-            // debugger
+
             if (this.form.id != null) {
+              console.log('出租申请更新', this.form);
+
+              // debugger
               updateRentalapplylist(this.form).then((response) => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
                 this.getList();
               });
             } else {
+            this.form.landlordId = this.landlordlistList[0].id
+            this.form.applicant = this.userinfo.nickName
+            this.form.phonenumber = this.userinfo.phonenumber
+  
+            console.log('出租申请添加', this.form);
+            // debugger
               addRentalapplylist(this.form).then((response) => {
                 this.$modal.msgSuccess("新增成功");
                 this.open = false;
@@ -3238,6 +3243,10 @@
 
 </script>
 <style lang="scss" scoped>
+/deep/ .el-table__fixed-right {
+  height: 100% !important;
+}
+
   .c-el-form-item {
     margin-bottom: -10px;
   }

src/views/fangdong/index.vue

@@ -150,7 +150,7 @@
         label="土地使用权人"
         align="center"
         prop="landUseRights"
-        width="100"
+        width="150"
       />
       <el-table-column label="类型" align="center" prop="type" width="150">
         <template slot-scope="scope">
@@ -166,7 +166,7 @@
         label="法定代表人"
         align="center"
         prop="legalRepresentative"
-        width="100"
+        width="150"
       />
       <el-table-column
         label="消防等级"
@@ -1497,7 +1497,7 @@ export default {
   margin-top: 10px;
 }
 
-::v-deep.info_images .el-descriptions__body th {
+/deep/.info_images .el-descriptions__body th {
   width: 0px;
 }
 
@@ -1543,15 +1543,15 @@ export default {
   height: 500px;
 }
 
-::v-deep .el-table__fixed-right {
+/deep/ .el-table__fixed-right {
   height: 100% !important;
 }
 
-::v-deep.form_width .el-input-number {
+/deep/.form_width .el-input-number {
   width: 189.38px;
 }
 
-::v-deep.form_width .el-input-number {
+/deep/.form_width .el-input-number {
   width: 189.38px;
 }
 

src/views/hetong/index.vue

@@ -888,6 +888,10 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+/deep/ .el-table__fixed-right {
+  height: 100% !important;
+}
+
   .img_lists {
     width: 120px;
     height: 120px;

src/views/tool/build/IconsDialog.vue

@@ -101,7 +101,7 @@ export default {
   }
 }
 .icon-dialog {
-  ::v-deep .el-dialog {
+  /deep/ .el-dialog {
     border-radius: 8px;
     margin-bottom: 0;
     margin-top: 4vh !important;

src/views/tool/build/RightPanel.vue

@@ -917,7 +917,7 @@ export default {
   .el-date-editor {
     width: 227px;
   }
-  ::v-deep .el-icon-time {
+  /deep/ .el-icon-time {
     display: none;
   }
 }

src/views/zuke/index.vue

@@ -1590,19 +1590,19 @@ export default {
   background-size: 100% 100%;
 }
 
-::v-deep .el-table__fixed-right {
+/deep/ .el-table__fixed-right {
   height: 100% !important;
 }
 
-::v-deep .el-dialog__body .el-input input {
+/deep/ .el-dialog__body .el-input input {
   width: 240px;
 }
 
-::v-deep .el-dialog__body .form_width .el-input-number {
+/deep/ .el-dialog__body .form_width .el-input-number {
   width: 240px;
 }
 
-::v-deep .el-dialog__body .el-textarea {
+/deep/ .el-dialog__body .el-textarea {
   width: 240px !important;
 }
 </style>

vue.config.js

@@ -34,7 +34,10 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:9007`,
+        // 本地
+        // target: `http://localhost:9007`,
+        // 服务器
+        target: `http://39.101.188.84:9007`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",