|
@@ -615,19 +615,6 @@ export default {
|
|
type: "success",
|
|
type: "success",
|
|
message: "删除成功!"
|
|
message: "删除成功!"
|
|
});
|
|
});
|
|
- } else {
|
|
|
|
- if (response.message != null) {
|
|
|
|
- //下载有错误信息提示的报表
|
|
|
|
- //window.open(response.data);
|
|
|
|
- this.$message({
|
|
|
|
- showClose: true,
|
|
|
|
- dangerouslyUseHTMLString: true,
|
|
|
|
- message:
|
|
|
|
- '错误' +
|
|
|
|
- `,<a href="${response.message}" target="_blank">点击下载未导入的数据报表</a> `,
|
|
|
|
- duration: 30000
|
|
|
|
- });
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
})
|
|
})
|
|
.catch(() => {
|
|
.catch(() => {
|
|
@@ -768,6 +755,14 @@ export default {
|
|
} else if ("guest" == type) {
|
|
} else if ("guest" == type) {
|
|
personInfoApi.enabledGuest(formData);
|
|
personInfoApi.enabledGuest(formData);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ //关闭开关,是自动同步到服务器
|
|
|
|
+ //打开开关需要手动同步服务器
|
|
|
|
+ if(value){
|
|
|
|
+ //如果是打开开关,则修改状态
|
|
|
|
+ row.faceBound = false;
|
|
|
|
+ }
|
|
|
|
+
|
|
self.disabled = true;
|
|
self.disabled = true;
|
|
|
|
|
|
setTimeout(function() {
|
|
setTimeout(function() {
|
|
@@ -791,11 +786,26 @@ export default {
|
|
var jsonData = response.data;
|
|
var jsonData = response.data;
|
|
self.loading = false;
|
|
self.loading = false;
|
|
if (jsonData.result) {
|
|
if (jsonData.result) {
|
|
- self.changePage(self.pageIndex);
|
|
|
|
- self.$message({
|
|
|
|
- type: "success",
|
|
|
|
- message: "同步成功!"
|
|
|
|
- });
|
|
|
|
|
|
+ if (jsonData.data) {
|
|
|
|
+ self.changePage(self.pageIndex);
|
|
|
|
+ self.$message({
|
|
|
|
+ type: "success",
|
|
|
|
+ message: "同步成功!"
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
|
|
+ if (jsonData.message != null) {
|
|
|
|
+ //下载有错误信息提示的报表
|
|
|
|
+ //window.open(response.data);
|
|
|
|
+ self.$message({
|
|
|
|
+ showClose: true,
|
|
|
|
+ dangerouslyUseHTMLString: true,
|
|
|
|
+ message:
|
|
|
|
+ "错误" +
|
|
|
|
+ `,<a href="${jsonData.message}" target="_blank">点击下载错误报表</a> `,
|
|
|
|
+ duration: 30000
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
self.$message({
|
|
self.$message({
|
|
type: "warning",
|
|
type: "warning",
|
|
@@ -822,12 +832,26 @@ export default {
|
|
var jsonData = response.data;
|
|
var jsonData = response.data;
|
|
self.loading = false;
|
|
self.loading = false;
|
|
if (jsonData.result) {
|
|
if (jsonData.result) {
|
|
- self.changePage(self.pageIndex);
|
|
|
|
-
|
|
|
|
- self.$message({
|
|
|
|
- type: "success",
|
|
|
|
- message: "同步成功!"
|
|
|
|
- });
|
|
|
|
|
|
+ if (jsonData.data) {
|
|
|
|
+ self.changePage(self.pageIndex);
|
|
|
|
+ self.$message({
|
|
|
|
+ type: "success",
|
|
|
|
+ message: "同步成功!"
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
|
|
+ if (jsonData.message != null) {
|
|
|
|
+ //下载有错误信息提示的报表
|
|
|
|
+ //window.open(response.data);
|
|
|
|
+ self.$message({
|
|
|
|
+ showClose: true,
|
|
|
|
+ dangerouslyUseHTMLString: true,
|
|
|
|
+ message:
|
|
|
|
+ "错误" +
|
|
|
|
+ `,<a href="${jsonData.message}" target="_blank">点击下载错误报表</a> `,
|
|
|
|
+ duration: 30000
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
self.$message({
|
|
self.$message({
|
|
type: "warning",
|
|
type: "warning",
|