diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index a63f6e1..b62ca50 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -19,3 +19,11 @@
data,
})
}
+// 删除
+export function delOpinion(data: object) {
+ return request({
+ url: '/resource/customer/suggestForm/delete',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index a63f6e1..b62ca50 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -19,3 +19,11 @@
data,
})
}
+// 删除
+export function delOpinion(data: object) {
+ return request({
+ url: '/resource/customer/suggestForm/delete',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index a33b1c7..6dbd678 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -12,7 +12,7 @@
})
}
// 提交
-export function submitSurveyForm(data: object) {
+export function updateSatifaction(data: object) {
return request({
url: '/resource/customer/questionnaire/submit',
method: 'post',
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index a63f6e1..b62ca50 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -19,3 +19,11 @@
data,
})
}
+// 删除
+export function delOpinion(data: object) {
+ return request({
+ url: '/resource/customer/suggestForm/delete',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index a33b1c7..6dbd678 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -12,7 +12,7 @@
})
}
// 提交
-export function submitSurveyForm(data: object) {
+export function updateSatifaction(data: object) {
return request({
url: '/resource/customer/questionnaire/submit',
method: 'post',
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 54ca54c..1b923c9 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
endTime: '',
deptId: '',
offset: 1,
- limit: 30,
+ limit: 50,
sort: 'id',
deptType: '',
})
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index a63f6e1..b62ca50 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -19,3 +19,11 @@
data,
})
}
+// 删除
+export function delOpinion(data: object) {
+ return request({
+ url: '/resource/customer/suggestForm/delete',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index a33b1c7..6dbd678 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -12,7 +12,7 @@
})
}
// 提交
-export function submitSurveyForm(data: object) {
+export function updateSatifaction(data: object) {
return request({
url: '/resource/customer/questionnaire/submit',
method: 'post',
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 54ca54c..1b923c9 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
endTime: '',
deptId: '',
offset: 1,
- limit: 30,
+ limit: 50,
sort: 'id',
deptType: '',
})
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 6294ad5..3897ab8 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -90,8 +90,8 @@
.sys-container {
// position: absolute;
// z-index: 99999;
- width: 34vh;
- height: 17vh;
+ width: 18%;
+ height: 140px;
font-size: 26px;
font-weight: 700;
border: 6px solid #04419c;
@@ -110,8 +110,8 @@
.common-container {
position: absolute;
z-index: 99999;
- width: 26vh;
- height: 8vh;
+ width: 12%;
+ height: 80px;
font-size: 20px;
font-weight: 700;
border: 6px solid #04419c;
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index a63f6e1..b62ca50 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -19,3 +19,11 @@
data,
})
}
+// 删除
+export function delOpinion(data: object) {
+ return request({
+ url: '/resource/customer/suggestForm/delete',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index a33b1c7..6dbd678 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -12,7 +12,7 @@
})
}
// 提交
-export function submitSurveyForm(data: object) {
+export function updateSatifaction(data: object) {
return request({
url: '/resource/customer/questionnaire/submit',
method: 'post',
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 54ca54c..1b923c9 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
endTime: '',
deptId: '',
offset: 1,
- limit: 30,
+ limit: 50,
sort: 'id',
deptType: '',
})
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 6294ad5..3897ab8 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -90,8 +90,8 @@
.sys-container {
// position: absolute;
// z-index: 99999;
- width: 34vh;
- height: 17vh;
+ width: 18%;
+ height: 140px;
font-size: 26px;
font-weight: 700;
border: 6px solid #04419c;
@@ -110,8 +110,8 @@
.common-container {
position: absolute;
z-index: 99999;
- width: 26vh;
- height: 8vh;
+ width: 12%;
+ height: 80px;
font-size: 20px;
font-weight: 700;
border: 6px solid #04419c;
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index a32f0f6..e95cb89 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -2,7 +2,7 @@
@@ -139,7 +155,7 @@
查看
-
+
删除
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index a63f6e1..b62ca50 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -19,3 +19,11 @@
data,
})
}
+// 删除
+export function delOpinion(data: object) {
+ return request({
+ url: '/resource/customer/suggestForm/delete',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index a33b1c7..6dbd678 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -12,7 +12,7 @@
})
}
// 提交
-export function submitSurveyForm(data: object) {
+export function updateSatifaction(data: object) {
return request({
url: '/resource/customer/questionnaire/submit',
method: 'post',
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 54ca54c..1b923c9 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
endTime: '',
deptId: '',
offset: 1,
- limit: 30,
+ limit: 50,
sort: 'id',
deptType: '',
})
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 6294ad5..3897ab8 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -90,8 +90,8 @@
.sys-container {
// position: absolute;
// z-index: 99999;
- width: 34vh;
- height: 17vh;
+ width: 18%;
+ height: 140px;
font-size: 26px;
font-weight: 700;
border: 6px solid #04419c;
@@ -110,8 +110,8 @@
.common-container {
position: absolute;
z-index: 99999;
- width: 26vh;
- height: 8vh;
+ width: 12%;
+ height: 80px;
font-size: 20px;
font-weight: 700;
border: 6px solid #04419c;
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index a32f0f6..e95cb89 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -2,7 +2,7 @@
@@ -139,7 +155,7 @@
查看
-
+
删除
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 41d4246..3969740 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -5,6 +5,7 @@
import dayjs from 'dayjs'
import questionnaireTable from './questionnaire.vue'
import useUserStore from '@/store/modules/user'
+import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
const $route = useRoute()
const $router = useRouter()
const userStore = useUserStore()
@@ -18,7 +19,7 @@
}
// 对话框类型:create,update
const dialogStatus = ref('create')
-const ruleForm = ref({
+const ruleForm = ref<{ [key: string]: string }>({
createTime: '',
customerId: '',
customerName: '',
@@ -56,11 +57,6 @@
const data = JSON.parse($route.query.row as string)
ruleForm.value = data
}
- if ($route.params.type === 'update') {
- ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
- // ruleForm.value.createUserId = userStore.id
- // ruleForm.value.createUserName = userStore.name
- }
}
onMounted(() => {
initDialog()
@@ -72,28 +68,27 @@
}
// 编辑
const update = () => {
- updateDocument(ruleForm.value).then((res) => {
+ const list = tableRef.value.rateList
+ list.forEach((item: any) => {
+ ruleForm.value[item.attributeName] = item.value.toString()
+ })
+ updateSatifaction(ruleForm.value).then((res) => {
ElMessage.success('修改成功')
close()
})
}
// 保存
const saveForm = async (formEl: FormInstance | undefined) => {
- if (!formEl) { return }
- await formEl.validate((valid, fields) => {
- if (valid) {
- ElMessageBox.confirm(
- '确认保存吗?',
- '提示',
- {
- confirmButtonText: '确认',
- cancelButtonText: '取消',
- type: 'warning',
- },
- ).then((res) => {
- update()
- })
- }
+ ElMessageBox.confirm(
+ '确认保存吗?',
+ '提示',
+ {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning',
+ },
+ ).then((res) => {
+ update()
})
}
// 取消
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index a63f6e1..b62ca50 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -19,3 +19,11 @@
data,
})
}
+// 删除
+export function delOpinion(data: object) {
+ return request({
+ url: '/resource/customer/suggestForm/delete',
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/eqpt/MeasurementBusiness/satisfaction.ts b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
index a33b1c7..6dbd678 100644
--- a/src/api/eqpt/MeasurementBusiness/satisfaction.ts
+++ b/src/api/eqpt/MeasurementBusiness/satisfaction.ts
@@ -12,7 +12,7 @@
})
}
// 提交
-export function submitSurveyForm(data: object) {
+export function updateSatifaction(data: object) {
return request({
url: '/resource/customer/questionnaire/submit',
method: 'post',
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 54ca54c..1b923c9 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -51,7 +51,7 @@
endTime: '',
deptId: '',
offset: 1,
- limit: 30,
+ limit: 50,
sort: 'id',
deptType: '',
})
diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue
index 6294ad5..3897ab8 100644
--- a/src/views/dashboard.vue
+++ b/src/views/dashboard.vue
@@ -90,8 +90,8 @@
.sys-container {
// position: absolute;
// z-index: 99999;
- width: 34vh;
- height: 17vh;
+ width: 18%;
+ height: 140px;
font-size: 26px;
font-weight: 700;
border: 6px solid #04419c;
@@ -110,8 +110,8 @@
.common-container {
position: absolute;
z-index: 99999;
- width: 26vh;
- height: 8vh;
+ width: 12%;
+ height: 80px;
font-size: 20px;
font-weight: 700;
border: 6px solid #04419c;
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index a32f0f6..e95cb89 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -2,7 +2,7 @@
@@ -139,7 +155,7 @@
查看
-
+
删除
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 41d4246..3969740 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -5,6 +5,7 @@
import dayjs from 'dayjs'
import questionnaireTable from './questionnaire.vue'
import useUserStore from '@/store/modules/user'
+import { updateSatifaction } from '@/api/eqpt/MeasurementBusiness/satisfaction'
const $route = useRoute()
const $router = useRouter()
const userStore = useUserStore()
@@ -18,7 +19,7 @@
}
// 对话框类型:create,update
const dialogStatus = ref('create')
-const ruleForm = ref({
+const ruleForm = ref<{ [key: string]: string }>({
createTime: '',
customerId: '',
customerName: '',
@@ -56,11 +57,6 @@
const data = JSON.parse($route.query.row as string)
ruleForm.value = data
}
- if ($route.params.type === 'update') {
- ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
- // ruleForm.value.createUserId = userStore.id
- // ruleForm.value.createUserName = userStore.name
- }
}
onMounted(() => {
initDialog()
@@ -72,28 +68,27 @@
}
// 编辑
const update = () => {
- updateDocument(ruleForm.value).then((res) => {
+ const list = tableRef.value.rateList
+ list.forEach((item: any) => {
+ ruleForm.value[item.attributeName] = item.value.toString()
+ })
+ updateSatifaction(ruleForm.value).then((res) => {
ElMessage.success('修改成功')
close()
})
}
// 保存
const saveForm = async (formEl: FormInstance | undefined) => {
- if (!formEl) { return }
- await formEl.validate((valid, fields) => {
- if (valid) {
- ElMessageBox.confirm(
- '确认保存吗?',
- '提示',
- {
- confirmButtonText: '确认',
- cancelButtonText: '取消',
- type: 'warning',
- },
- ).then((res) => {
- update()
- })
- }
+ ElMessageBox.confirm(
+ '确认保存吗?',
+ '提示',
+ {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning',
+ },
+ ).then((res) => {
+ update()
})
}
// 取消
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/questionnaire.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/questionnaire.vue
index bedf62b..2fba52a 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/questionnaire.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/questionnaire.vue
@@ -1,177 +1,71 @@
-
+
+
+
+ 总分: {{ totalSatisfaction }}
+
+
+
+
+
+
+
+
+
+
@@ -181,9 +75,9 @@
// display: none;
// }
// }
-.radio {
- ::v-deep(.el-radio__label) {
- display: none;
- }
-}
+// .radio {
+// ::v-deep(.el-radio__label) {
+// display: none;
+// }
+// }