1. 优化

src/views/tourism/scenicAreaManagement/contentManagement/detailsBox/attractionInfoDetails copy 3.vue

@@ -1,196 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="open"
-    width="800px"
-    append-to-body
-    :close-on-click-modal="false"
-    @close="cancel"
-  >
-    <div class="form-dialog-box"
-    v-loading="loading"
-    element-loading-text="拼命加载数据中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
-      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
-      <el-button @click="cancel">关闭</el-button>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/merchant/merchantSysuser/', // 详情地址
-      },
-      form: {
-        id: undefined,
-      },
-      rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
-    };
-  },
-  methods: {
-    async initData(title , model,row){
-      this.title = title
-      this.open = true
-      this.loading = true
-      this.model = model
-      this.formStatus = 0
-      if(model=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    async getTableDeatilsFun(row) {
-      const id = row.id
-      this.loading = true
-      try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
-        if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
-          this.formStatus = 1
-        }else {
-          this.$message.error('获取详情失败!!!');
-          this.formStatus = 2
-          this.loading = false
-          this.open = false;
-        }
-        this.loading = false
-      } catch (error) {
-        console.error('获取详情失败!!!!',error)
-        this.formStatus = 2
-        this.loading = false
-        this.open = false;
-      }
-    },
-    /**
-     * 关闭弹框
-     * @date 2023-11-22
-     * @returns {any}
-     */
-    cancel() {
-      this.open = false;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-dialog-box {
-  padding: 0 30px;
-  padding: 0 30px;
-  min-height: 50vh;
-  max-height: 65vh;
-  overflow-y: auto;
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-.el-table{
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-
-.area-container {
-  min-height: 400px;
-}
-
-::v-deep .area-wrap-city.el-cascader {
-  line-height: normal;
-  .el-input {
-    cursor: pointer;
-    width: 100% !important;
-    height: 28px !important;
-    .el-input__inner {
-      display: none !important;
-    }
-    span.el-input__suffix {
-      position: inherit !important;
-      i.el-input__icon {
-        line-height: inherit;
-        margin-left: 5px;
-      }
-    }
-
-    .el-input__wrapper {
-      box-shadow: none;
-      input {
-        display: none;
-      }
-    }
-  }
-
-  .el-cascader__tags {
-    display: none;
-  }
-}
-
-.area-city-popper {
-  .el-cascader-panel {
-    .el-scrollbar.el-cascader-menu {
-      .el-cascader-menu__wrap.el-scrollbar__wrap {
-        height: 315px;
-      }
-    }
-  }
-}
-</style>
-<style>
-.custom-class-box {
-  z-index: 999999 !important;
-}
-</style>

src/views/tourism/scenicAreaManagement/contentManagement/detailsBox/attractionInfoDetails.vue

@@ -1,196 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="open"
-    width="800px"
-    append-to-body
-    :close-on-click-modal="false"
-    @close="cancel"
-  >
-    <div class="form-dialog-box"
-    v-loading="loading"
-    element-loading-text="拼命加载数据中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
-      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
-      <el-button @click="cancel">关闭</el-button>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/merchant/merchantSysuser/', // 详情地址
-      },
-      form: {
-        id: undefined,
-      },
-      rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
-    };
-  },
-  methods: {
-    async initData(title , model,row){
-      this.title = title
-      this.open = true
-      this.loading = true
-      this.model = model
-      this.formStatus = 0
-      if(model=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    async getTableDeatilsFun(row) {
-      const id = row.id
-      this.loading = true
-      try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
-        if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
-          this.formStatus = 1
-        }else {
-          this.$message.error('获取详情失败!!!');
-          this.formStatus = 2
-          this.loading = false
-          this.open = false;
-        }
-        this.loading = false
-      } catch (error) {
-        console.error('获取详情失败!!!!',error)
-        this.formStatus = 2
-        this.loading = false
-        this.open = false;
-      }
-    },
-    /**
-     * 关闭弹框
-     * @date 2023-11-22
-     * @returns {any}
-     */
-    cancel() {
-      this.open = false;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-dialog-box {
-  padding: 0 30px;
-  padding: 0 30px;
-  min-height: 50vh;
-  max-height: 65vh;
-  overflow-y: auto;
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-.el-table{
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-
-.area-container {
-  min-height: 400px;
-}
-
-::v-deep .area-wrap-city.el-cascader {
-  line-height: normal;
-  .el-input {
-    cursor: pointer;
-    width: 100% !important;
-    height: 28px !important;
-    .el-input__inner {
-      display: none !important;
-    }
-    span.el-input__suffix {
-      position: inherit !important;
-      i.el-input__icon {
-        line-height: inherit;
-        margin-left: 5px;
-      }
-    }
-
-    .el-input__wrapper {
-      box-shadow: none;
-      input {
-        display: none;
-      }
-    }
-  }
-
-  .el-cascader__tags {
-    display: none;
-  }
-}
-
-.area-city-popper {
-  .el-cascader-panel {
-    .el-scrollbar.el-cascader-menu {
-      .el-cascader-menu__wrap.el-scrollbar__wrap {
-        height: 315px;
-      }
-    }
-  }
-}
-</style>
-<style>
-.custom-class-box {
-  z-index: 999999 !important;
-}
-</style>

src/views/tourism/scenicAreaManagement/contentManagement/detailsBox/navigationManagementDetails.vue

@@ -1,196 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="open"
-    width="800px"
-    append-to-body
-    :close-on-click-modal="false"
-    @close="cancel"
-  >
-    <div class="form-dialog-box"
-    v-loading="loading"
-    element-loading-text="拼命加载数据中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
-      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
-      <el-button @click="cancel">关闭</el-button>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/merchant/merchantSysuser/', // 详情地址
-      },
-      form: {
-        id: undefined,
-      },
-      rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
-    };
-  },
-  methods: {
-    async initData(title , model,row){
-      this.title = title
-      this.open = true
-      this.loading = true
-      this.model = model
-      this.formStatus = 0
-      if(model=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    async getTableDeatilsFun(row) {
-      const id = row.id
-      this.loading = true
-      try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
-        if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
-          this.formStatus = 1
-        }else {
-          this.$message.error('获取详情失败!!!');
-          this.formStatus = 2
-          this.loading = false
-          this.open = false;
-        }
-        this.loading = false
-      } catch (error) {
-        console.error('获取详情失败!!!!',error)
-        this.formStatus = 2
-        this.loading = false
-        this.open = false;
-      }
-    },
-    /**
-     * 关闭弹框
-     * @date 2023-11-22
-     * @returns {any}
-     */
-    cancel() {
-      this.open = false;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-dialog-box {
-  padding: 0 30px;
-  padding: 0 30px;
-  min-height: 50vh;
-  max-height: 65vh;
-  overflow-y: auto;
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-.el-table{
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-
-.area-container {
-  min-height: 400px;
-}
-
-::v-deep .area-wrap-city.el-cascader {
-  line-height: normal;
-  .el-input {
-    cursor: pointer;
-    width: 100% !important;
-    height: 28px !important;
-    .el-input__inner {
-      display: none !important;
-    }
-    span.el-input__suffix {
-      position: inherit !important;
-      i.el-input__icon {
-        line-height: inherit;
-        margin-left: 5px;
-      }
-    }
-
-    .el-input__wrapper {
-      box-shadow: none;
-      input {
-        display: none;
-      }
-    }
-  }
-
-  .el-cascader__tags {
-    display: none;
-  }
-}
-
-.area-city-popper {
-  .el-cascader-panel {
-    .el-scrollbar.el-cascader-menu {
-      .el-cascader-menu__wrap.el-scrollbar__wrap {
-        height: 315px;
-      }
-    }
-  }
-}
-</style>
-<style>
-.custom-class-box {
-  z-index: 999999 !important;
-}
-</style>

src/views/tourism/scenicAreaManagement/contentManagement/formBox/attractionInfoForm.vue

@@ -9,7 +9,7 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)">
       <el-form :model="form" ref="form" :rules="rules" label-width="120px">
@@ -21,7 +21,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -48,6 +48,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/merchantSysuser', // 新增地址
@@ -66,6 +67,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.model = model
       this.formStatus = 0
@@ -116,6 +118,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             updateTableApi(

src/views/tourism/scenicAreaManagement/contentManagement/formBox/attractionInfoManagementForm.vue

@@ -9,7 +9,7 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)">
       <el-form :model="form" ref="form" :rules="rules" label-width="120px">
@@ -73,7 +73,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -110,6 +110,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/merchantPoints/insertOrUpdate', // 新增地址
@@ -155,6 +156,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.model = model
       this.formStatus = 0
@@ -213,6 +215,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             addTableApi(

src/views/tourism/scenicAreaManagement/contentManagement/formBox/carouselAdvertisForm.vue

@@ -9,7 +9,7 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)">
       <el-form :model="form" ref="form" :rules="rules" label-width="130px">
@@ -74,7 +74,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -108,6 +108,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/advList/insertOrUpdate', // 新增地址
@@ -157,6 +158,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.actionUrlLoading = false
       this.model = model
@@ -214,6 +216,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             addTableApi(

src/views/tourism/scenicAreaManagement/contentManagement/formBox/eventNotificationsForm.vue

@@ -9,7 +9,7 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)">
       <el-form :model="form" ref="form" :rules="rules" label-width="120px">
@@ -56,7 +56,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -93,6 +93,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/notice/insertOrUpdate', // 新增地址
@@ -137,6 +138,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.model = model
       this.formStatus = 0
@@ -193,6 +195,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             addTableApi(

src/views/tourism/scenicAreaManagement/contentManagement/formBox/noticeManagementForm.vue

@@ -9,7 +9,7 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)">
       <el-form :model="form" ref="form" :rules="rules" label-width="130px">
@@ -41,7 +41,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -75,6 +75,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/agreementInfo/insertOrUpdate', // 新增地址
@@ -118,6 +119,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.model = model
       this.formStatus = 0
@@ -174,6 +176,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             addTableApi(

src/views/tourism/scenicAreaManagement/contentManagement/formBox/questionsForm.vue

@@ -9,7 +9,7 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)">
       <el-form :model="form" ref="form" :rules="rules" label-width="130px">
@@ -34,7 +34,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -68,6 +68,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/system/question/insertOrUpdate', // 新增地址
@@ -111,6 +112,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.model = model
       this.formStatus = 0
@@ -119,7 +121,7 @@ export default {
         this.formStatus = 1
       }else if(model=='EDIT') { // 新增
         let obj = {
-          ...res.data
+          ...row
         }
         this.$set(this,'form',obj)
         this.formStatus = 1
@@ -141,7 +143,7 @@ export default {
         let res = await getTableDeatilsByIdApi(this.configUrl.details,{id})
         if(res.code == 200) {
           let obj = {
-          ...row
+          ...res.data
         }
           this.$set(this,'form',JSON.parse(JSON.stringify(obj)))
           this.formStatus = 1
@@ -167,6 +169,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             addTableApi(

src/views/tourism/scenicAreaManagement/contentManagement/formBox/tourismStrategyForm.vue

@@ -9,7 +9,7 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)">
       <el-form :model="form" ref="form" :rules="rules" label-width="130px">
@@ -67,7 +67,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -101,6 +101,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/merchantIntroduction/insertOrUpdate', // 新增地址
@@ -148,6 +149,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.actionUrlLoading = false
       this.model = model
@@ -205,6 +207,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             addTableApi(

src/views/tourism/scenicAreaManagement/navigationManagement/detailsBox/attractionInfoDetails copy 2.vue

@@ -1,196 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="open"
-    width="800px"
-    append-to-body
-    :close-on-click-modal="false"
-    @close="cancel"
-  >
-    <div class="form-dialog-box"
-    v-loading="loading"
-    element-loading-text="拼命加载数据中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
-      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
-      <el-button @click="cancel">关闭</el-button>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/merchant/merchantSysuser/', // 详情地址
-      },
-      form: {
-        id: undefined,
-      },
-      rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
-    };
-  },
-  methods: {
-    async initData(title , model,row){
-      this.title = title
-      this.open = true
-      this.loading = true
-      this.model = model
-      this.formStatus = 0
-      if(model=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    async getTableDeatilsFun(row) {
-      const id = row.id
-      this.loading = true
-      try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
-        if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
-          this.formStatus = 1
-        }else {
-          this.$message.error('获取详情失败!!!');
-          this.formStatus = 2
-          this.loading = false
-          this.open = false;
-        }
-        this.loading = false
-      } catch (error) {
-        console.error('获取详情失败!!!!',error)
-        this.formStatus = 2
-        this.loading = false
-        this.open = false;
-      }
-    },
-    /**
-     * 关闭弹框
-     * @date 2023-11-22
-     * @returns {any}
-     */
-    cancel() {
-      this.open = false;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-dialog-box {
-  padding: 0 30px;
-  padding: 0 30px;
-  min-height: 50vh;
-  max-height: 65vh;
-  overflow-y: auto;
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-.el-table{
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-
-.area-container {
-  min-height: 400px;
-}
-
-::v-deep .area-wrap-city.el-cascader {
-  line-height: normal;
-  .el-input {
-    cursor: pointer;
-    width: 100% !important;
-    height: 28px !important;
-    .el-input__inner {
-      display: none !important;
-    }
-    span.el-input__suffix {
-      position: inherit !important;
-      i.el-input__icon {
-        line-height: inherit;
-        margin-left: 5px;
-      }
-    }
-
-    .el-input__wrapper {
-      box-shadow: none;
-      input {
-        display: none;
-      }
-    }
-  }
-
-  .el-cascader__tags {
-    display: none;
-  }
-}
-
-.area-city-popper {
-  .el-cascader-panel {
-    .el-scrollbar.el-cascader-menu {
-      .el-cascader-menu__wrap.el-scrollbar__wrap {
-        height: 315px;
-      }
-    }
-  }
-}
-</style>
-<style>
-.custom-class-box {
-  z-index: 999999 !important;
-}
-</style>

src/views/tourism/scenicAreaManagement/navigationManagement/detailsBox/attractionInfoDetails copy 3.vue

@@ -1,196 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="open"
-    width="800px"
-    append-to-body
-    :close-on-click-modal="false"
-    @close="cancel"
-  >
-    <div class="form-dialog-box"
-    v-loading="loading"
-    element-loading-text="拼命加载数据中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
-      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
-      <el-button @click="cancel">关闭</el-button>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/merchant/merchantSysuser/', // 详情地址
-      },
-      form: {
-        id: undefined,
-      },
-      rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
-    };
-  },
-  methods: {
-    async initData(title , model,row){
-      this.title = title
-      this.open = true
-      this.loading = true
-      this.model = model
-      this.formStatus = 0
-      if(model=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    async getTableDeatilsFun(row) {
-      const id = row.id
-      this.loading = true
-      try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
-        if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
-          this.formStatus = 1
-        }else {
-          this.$message.error('获取详情失败!!!');
-          this.formStatus = 2
-          this.loading = false
-          this.open = false;
-        }
-        this.loading = false
-      } catch (error) {
-        console.error('获取详情失败!!!!',error)
-        this.formStatus = 2
-        this.loading = false
-        this.open = false;
-      }
-    },
-    /**
-     * 关闭弹框
-     * @date 2023-11-22
-     * @returns {any}
-     */
-    cancel() {
-      this.open = false;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-dialog-box {
-  padding: 0 30px;
-  padding: 0 30px;
-  min-height: 50vh;
-  max-height: 65vh;
-  overflow-y: auto;
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-.el-table{
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-
-.area-container {
-  min-height: 400px;
-}
-
-::v-deep .area-wrap-city.el-cascader {
-  line-height: normal;
-  .el-input {
-    cursor: pointer;
-    width: 100% !important;
-    height: 28px !important;
-    .el-input__inner {
-      display: none !important;
-    }
-    span.el-input__suffix {
-      position: inherit !important;
-      i.el-input__icon {
-        line-height: inherit;
-        margin-left: 5px;
-      }
-    }
-
-    .el-input__wrapper {
-      box-shadow: none;
-      input {
-        display: none;
-      }
-    }
-  }
-
-  .el-cascader__tags {
-    display: none;
-  }
-}
-
-.area-city-popper {
-  .el-cascader-panel {
-    .el-scrollbar.el-cascader-menu {
-      .el-cascader-menu__wrap.el-scrollbar__wrap {
-        height: 315px;
-      }
-    }
-  }
-}
-</style>
-<style>
-.custom-class-box {
-  z-index: 999999 !important;
-}
-</style>

src/views/tourism/scenicAreaManagement/navigationManagement/detailsBox/attractionInfoDetails.vue

@@ -1,196 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="open"
-    width="800px"
-    append-to-body
-    :close-on-click-modal="false"
-    @close="cancel"
-  >
-    <div class="form-dialog-box"
-    v-loading="loading"
-    element-loading-text="拼命加载数据中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
-      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
-      <el-button @click="cancel">关闭</el-button>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/merchant/merchantSysuser/', // 详情地址
-      },
-      form: {
-        id: undefined,
-      },
-      rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
-    };
-  },
-  methods: {
-    async initData(title , model,row){
-      this.title = title
-      this.open = true
-      this.loading = true
-      this.model = model
-      this.formStatus = 0
-      if(model=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    async getTableDeatilsFun(row) {
-      const id = row.id
-      this.loading = true
-      try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
-        if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
-          this.formStatus = 1
-        }else {
-          this.$message.error('获取详情失败!!!');
-          this.formStatus = 2
-          this.loading = false
-          this.open = false;
-        }
-        this.loading = false
-      } catch (error) {
-        console.error('获取详情失败!!!!',error)
-        this.formStatus = 2
-        this.loading = false
-        this.open = false;
-      }
-    },
-    /**
-     * 关闭弹框
-     * @date 2023-11-22
-     * @returns {any}
-     */
-    cancel() {
-      this.open = false;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-dialog-box {
-  padding: 0 30px;
-  padding: 0 30px;
-  min-height: 50vh;
-  max-height: 65vh;
-  overflow-y: auto;
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-.el-table{
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-
-.area-container {
-  min-height: 400px;
-}
-
-::v-deep .area-wrap-city.el-cascader {
-  line-height: normal;
-  .el-input {
-    cursor: pointer;
-    width: 100% !important;
-    height: 28px !important;
-    .el-input__inner {
-      display: none !important;
-    }
-    span.el-input__suffix {
-      position: inherit !important;
-      i.el-input__icon {
-        line-height: inherit;
-        margin-left: 5px;
-      }
-    }
-
-    .el-input__wrapper {
-      box-shadow: none;
-      input {
-        display: none;
-      }
-    }
-  }
-
-  .el-cascader__tags {
-    display: none;
-  }
-}
-
-.area-city-popper {
-  .el-cascader-panel {
-    .el-scrollbar.el-cascader-menu {
-      .el-cascader-menu__wrap.el-scrollbar__wrap {
-        height: 315px;
-      }
-    }
-  }
-}
-</style>
-<style>
-.custom-class-box {
-  z-index: 999999 !important;
-}
-</style>

src/views/tourism/scenicAreaManagement/navigationManagement/detailsBox/navigationManagementDetails.vue

@@ -1,196 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="open"
-    width="800px"
-    append-to-body
-    :close-on-click-modal="false"
-    @close="cancel"
-  >
-    <div class="form-dialog-box"
-    v-loading="loading"
-    element-loading-text="拼命加载数据中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
-      <el-form :model="form" ref="form" :rules="rules" label-width="120px">
-        
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer" v-if="formStatus==1">
-      <el-button @click="cancel">关闭</el-button>
-    </span>
-    <!-- 添加或修改对话框 End -->
-  </el-dialog>
-</template>
-
-<script>
-import { 
-  getTableDeatilsApi,
-  updateTableApi,
-  addTableApi
- } from '@/api/CURD'
-export default {
-  name: "addAndEdit",
-  dicts: [],
-  data() {
-    return {
-      title: "我是谁",
-      model: "", // DEATILS: 详情模式   DEATILSInit : 详情模式（需要请求详情）
-      open: false,
-      loading: false,
-      formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
-      configUrl: {
-        details: '/merchant/merchantSysuser/', // 详情地址
-      },
-      form: {
-        id: undefined,
-      },
-      rules: {
-        xxx: [{ required: true, message: "请输入xxx", trigger: ["change","blur"] }]
-      }
-    };
-  },
-  methods: {
-    async initData(title , model,row){
-      this.title = title
-      this.open = true
-      this.loading = true
-      this.model = model
-      this.formStatus = 0
-      if(model=='DEATILS') { // 新增
-        this.$set(this,'form',row)
-        this.formStatus = 1
-      }else if(model=='DEATILSInit') { // 新增
-        await this.getTableDeatilsFun(row)
-      }
-      this.loading = false
-    },
-    /** 获取详情 */
-    async getTableDeatilsFun(row) {
-      const id = row.id
-      this.loading = true
-      try {
-        let res = await getTableDeatilsApi(this.configUrl.details,id)
-        if(res.code == 200) {
-          this.$set(this,'form',JSON.parse(JSON.stringify(res.data)))
-          this.formStatus = 1
-        }else {
-          this.$message.error('获取详情失败!!!');
-          this.formStatus = 2
-          this.loading = false
-          this.open = false;
-        }
-        this.loading = false
-      } catch (error) {
-        console.error('获取详情失败!!!!',error)
-        this.formStatus = 2
-        this.loading = false
-        this.open = false;
-      }
-    },
-    /**
-     * 关闭弹框
-     * @date 2023-11-22
-     * @returns {any}
-     */
-    cancel() {
-      this.open = false;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-dialog-box {
-  padding: 0 30px;
-  padding: 0 30px;
-  min-height: 50vh;
-  max-height: 65vh;
-  overflow-y: auto;
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-.el-table{
-  .upload-btn {
-    width: 100px;
-    height: 100px;
-    background-color: #fbfdff;
-    border: dashed 1px #c0ccda;
-    border-radius: 5px;
-    i {
-      font-size: 30px;
-      margin-top: 20px;
-    }
-    &-text {
-      margin-top: -10px;
-    }
-  }
-  .avatar {
-    cursor: pointer;
-  }
-}
-
-.area-container {
-  min-height: 400px;
-}
-
-::v-deep .area-wrap-city.el-cascader {
-  line-height: normal;
-  .el-input {
-    cursor: pointer;
-    width: 100% !important;
-    height: 28px !important;
-    .el-input__inner {
-      display: none !important;
-    }
-    span.el-input__suffix {
-      position: inherit !important;
-      i.el-input__icon {
-        line-height: inherit;
-        margin-left: 5px;
-      }
-    }
-
-    .el-input__wrapper {
-      box-shadow: none;
-      input {
-        display: none;
-      }
-    }
-  }
-
-  .el-cascader__tags {
-    display: none;
-  }
-}
-
-.area-city-popper {
-  .el-cascader-panel {
-    .el-scrollbar.el-cascader-menu {
-      .el-cascader-menu__wrap.el-scrollbar__wrap {
-        height: 315px;
-      }
-    }
-  }
-}
-</style>
-<style>
-.custom-class-box {
-  z-index: 999999 !important;
-}
-</style>

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/pointTypeForm.vue

@@ -9,7 +9,7 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)">
       <el-form :model="form" ref="form" :rules="rules" label-width="130px">
@@ -51,7 +51,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -80,6 +80,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/merchantMapMarkType/insertOrUpdate', // 新增地址
@@ -126,6 +127,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.actionUrlLoading = false
       this.model = model
@@ -183,6 +185,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             addTableApi(

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/scenicGuideForm.vue

@@ -9,7 +9,7 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)">
       <el-form :model="form" ref="form" :rules="rules" label-width="120px">
@@ -47,7 +47,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -162,6 +162,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           this.loadingText = "提交数据中..."
           if (this.model != 'ADD') {

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/scenicGuideImageForm.vue

@@ -9,7 +9,7 @@
   >
     <div class="form-dialog-box"
     v-loading="loading"
-    element-loading-text="拼命加载数据中"
+    :element-loading-text="loadingText"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)">
       <el-form :model="form" ref="form" :rules="rules" label-width="130px">
@@ -83,7 +83,7 @@
       <el-button
         type="primary"
         @click="submitForm"
-        v-loading="loading"
+        :loading="loading"
         element-loading-text="提交中..."
         element-loading-spinner="el-icon-loading"
         element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -117,6 +117,7 @@ export default {
       model: "", // EDIT: 编辑模式 ADD : 新增模式  EDITInit : 编辑模式（需要请求详情）
       open: false,
       loading: false,
+      loadingText: "拼命加载数据中...",
       formStatus: null, // 0/null : 加载中 1 : 获取详情成功 2  : 获取详情失败 
       configUrl: {
         add: '/merchant/merchantMap/save', // 新增地址
@@ -144,6 +145,7 @@ export default {
     async initData(title , model,row){
       this.title = title
       this.open = true
+      this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.actionUrlLoading = false
       this.model = model
@@ -201,6 +203,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.loadingText = "提交数据中..."
           this.loading = true
           if (this.model != 'ADD') {
             addTableApi(

src/views/tourism/scenicAreaManagement/navigationManagement/scenicGuide.vue

@@ -52,7 +52,7 @@
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column label="类型" align="center" key="openDate" prop="openDate" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="类型" align="center" key="typeName" prop="typeName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="可用状态" align="center" key="status" v-if="columns[2].visible">
             <template slot-scope="scope">
               <switchBox