Merge branch 'dev-磐石烟台1107' into dev

src/views/modules/base/epidemic/natFocus/natFocusList.vue

@@ -559,7 +559,7 @@ export default {
   async mounted () {
     //磐石街道：1580460084738760705
     this.customerId = localStorage.getItem("customerId");
-    this.isPanshi = true
+    this.isPanshi = false
     this.reasonTitle = '关注原因'
     if (this.customerId === '1580460084738760705') {
       this.isPanshi = true

src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue

@@ -501,7 +501,7 @@ export default {
   async mounted () {
     //磐石街道：1580460084738760705
     this.customerId = localStorage.getItem("customerId");
-    this.isPanshi = true
+    this.isPanshi = false
     this.reasonTitle = '关注原因'
     if (this.customerId === '1580460084738760705') {
       this.isPanshi = true

src/views/modules/base/epidemic/natInfo/natList.vue

@@ -144,7 +144,7 @@
         <el-button style="float:left;margin-left:10px"
                    class="diy-button--export"
                    size="small"
-                   @click="handleTiming()">定时</el-button>
+                   @click="handleTiming()">更新数据</el-button>
       </div>
 
       <el-table class="table"
@@ -598,7 +598,7 @@ export default {
 
     async handleTiming (row) {
 
-      this.$confirm("确认执行定时任务?", "提示", {
+      this.$confirm("确认执行更新数据?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -615,7 +615,7 @@ export default {
     },
 
     async timingNat (row) {
-      const url = "/epmetuser/dataSyncConfig/natInfoScanTask"
+      const url = "/epmetuser/dataSyncConfig/natInfoSyncButton"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
 
       let params = {