Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/api/operationControl/index.js

@@ -16,7 +16,7 @@ export async function getInfo (params) {
 export async function controlSave (data) {
   const res = await request.post('/mes/ordercontrol/save', data);
   if (res.data.code == 0) {
-    return res.data.data;
+    return res.data.message;
   }
   return Promise.reject(new Error(res.data.message));
 }
@@ -26,7 +26,7 @@ export async function controlSave (data) {
 export async function controlUpdate (data) {
   const res = await request.put('/mes/ordercontrol/update', data);
   if (res.data.code == 0) {
-    return res.data.data;
+    return res.data.message;
   }
   return Promise.reject(new Error(res.data.message));
 }

src/views/operationControl/index.vue

@@ -126,7 +126,7 @@
 			}
 			this.saveLoading = true
 			saveOrUpdate(this.formData).then(res=>{
-				this.$message.success('保存成功');
+				this.$message.success(res)
 				this.saveLoading = false
 				this.getInfoData()
 			}).catch(()=>{