From 9e34f13a1cd13d2115213eafede528b146d246a4 Mon Sep 17 00:00:00 2001 From: WXL (wul) <wl_5969728@163.com> Date: 星期五, 26 九月 2025 15:52:11 +0800 Subject: [PATCH] 测试完成 --- src/api/system/user.js | 15 +++++ dist (2).zip | 0 vue.config.js | 4 dist (3).zip | 0 src/views/sfstatistics/percentage/satisfaction.vue | 87 ++++++++++------------------ src/components/SortCheckbox/index.vue | 10 +- src/views/outsideChainnew.vue | 22 +++--- 7 files changed, 65 insertions(+), 73 deletions(-) diff --git "a/dist \0502\051.zip" "b/dist \0502\051.zip" new file mode 100644 index 0000000..1e58684 --- /dev/null +++ "b/dist \0502\051.zip" Binary files differ diff --git "a/dist \0503\051.zip" "b/dist \0503\051.zip" new file mode 100644 index 0000000..03953bb --- /dev/null +++ "b/dist \0503\051.zip" Binary files differ diff --git a/src/api/system/user.js b/src/api/system/user.js index 451a5c0..601a80c 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -94,6 +94,21 @@ data: data, }); } +// 婊℃剰搴︽槑缁嗘煡璇� +export function getSfStatisticsJoydetails(data) { + return request({ + url: "/smartor/serviceSubtask/getSfStatisticsJoydetails", + method: "post", + data: data, + }); +}// 婊℃剰搴︾粺璁� +export function getSfStatisticsJoy(data) { + return request({ + url: "/smartor/serviceSubtask/getSfStatisticsJoy", + method: "post", + data: data, + }); +} // 鏈強鏃舵煡璇� export function selectTimelyRate(data) { return request({ diff --git a/src/components/SortCheckbox/index.vue b/src/components/SortCheckbox/index.vue index 127a24d..d302d22 100644 --- a/src/components/SortCheckbox/index.vue +++ b/src/components/SortCheckbox/index.vue @@ -55,10 +55,10 @@ type: Array, default: () => [], }, - selectedOrder: { - type: Array, - default: () => [], - }, + // selectedOrder: { + // type: Array, + // default: () => [], + // }, valueKey: { type: String, default: "value", @@ -76,7 +76,7 @@ data() { return { checkedValues: [], - // selectedOrder: [], // 鐜板湪鏍煎紡涓� [{value, compensateTime}] + selectedOrder: [], // 鐜板湪鏍煎紡涓� [{value, compensateTime}] }; }, watch: { diff --git a/src/views/outsideChainnew.vue b/src/views/outsideChainnew.vue index f8738ed..1041445 100644 --- a/src/views/outsideChainnew.vue +++ b/src/views/outsideChainnew.vue @@ -35,7 +35,7 @@ > <el-radio border - v-for="(items, index) in item.ivrLibaScriptTargetoptionList" + v-for="(items, index) in item.ivrTaskScriptTargetoptionList" :class=" items.isabnormal && item.questionResult == items.targetvalue ? 'red-star' @@ -68,7 +68,7 @@ <el-checkbox border @change="$forceUpdate()" - v-for="(items, indexs) in item.ivrLibaScriptTargetoptionList" + v-for="(items, indexs) in item.ivrTaskScriptTargetoptionList" :key="indexs" :label="items.targetvalue" > @@ -168,7 +168,7 @@ // scriptType: 1, // scriptContent: "鎮ㄧ殑骞撮緞鑼冨洿鏄紵", // questionResult: null, - // ivrLibaScriptTargetoptionList: [ + // ivrTaskScriptTargetoptionList: [ // { targetvalue: "18-25", value: "18-25", isabnormal: true }, // { targetvalue: "26-35", value: "26-35" }, // { targetvalue: "36-45", value: "36-45" }, @@ -181,7 +181,7 @@ // scriptType: 1, // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵", // questionResult: null, - // ivrLibaScriptTargetoptionList: [ + // ivrTaskScriptTargetoptionList: [ // { targetvalue: "瀛︾敓", value: "student" }, // { targetvalue: "鏁欏笀", value: "teacher" }, // { targetvalue: "宸ョ▼甯�", value: "engineer" }, @@ -194,7 +194,7 @@ // scriptType: 2, // scriptContent: "鎮ㄦ劅鍏磋叮鐨勬椿鍔ㄦ湁鍝簺锛�", // questionResult: [], - // ivrLibaScriptTargetoptionList: [ + // ivrTaskScriptTargetoptionList: [ // { targetvalue: "鏃呮父", value: "travel", isabnormal: true }, // { targetvalue: "闃呰", value: "reading", isabnormal: true }, // { targetvalue: "杩愬姩", value: "sports", isabnormal: true }, @@ -207,7 +207,7 @@ // scriptType: 1, // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵", // questionResult: null, - // ivrLibaScriptTargetoptionList: [ + // ivrTaskScriptTargetoptionList: [ // { targetvalue: "瀛︾敓", value: "student" }, // { targetvalue: "鏁欏笀", value: "teacher" }, // { targetvalue: "宸ョ▼甯�", value: "engineer" }, @@ -220,7 +220,7 @@ // scriptType: 1, // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵", // questionResult: null, - // ivrLibaScriptTargetoptionList: [ + // ivrTaskScriptTargetoptionList: [ // { targetvalue: "瀛︾敓", value: "student" }, // { targetvalue: "鏁欏笀", value: "teacher" }, // { targetvalue: "宸ョ▼甯�", value: "engineer", isabnormal: true }, @@ -233,7 +233,7 @@ // scriptType: 1, // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵", // questionResult: null, - // ivrLibaScriptTargetoptionList: [ + // ivrTaskScriptTargetoptionList: [ // { targetvalue: "瀛︾敓", value: "student" }, // { targetvalue: "鏁欏笀", value: "teacher" }, // { targetvalue: "宸ョ▼甯�", value: "engineer" }, @@ -418,7 +418,7 @@ console.log(arr, "srr"); arr.forEach((item, index) => { if (item.scriptType == 3||item.scriptType == 4) return; - var obj = item.ivrLibaScriptTargetoptionList.find( + var obj = item.ivrTaskScriptTargetoptionList.find( (items) => items.targetvalue == item.questionResult ); console.log(obj, "isabnormal"); @@ -449,7 +449,7 @@ // 澶勭悊鍗曢�夐�夐」 handleOptionChange(selectedvalue, index, arr) { // 鏌ユ壘閫変腑鐨勯�夐」瀵硅薄 - const selectedOption = arr.ivrLibaScriptTargetoptionList.find( + const selectedOption = arr.ivrTaskScriptTargetoptionList.find( (option) => option.targetvalue == selectedvalue ); if (selectedOption) { @@ -464,7 +464,7 @@ // 锟斤拷鍔犲垎鏁� let score = 0; selectedvalues.forEach((value) => { - const selectedOption = arr.ivrLibaScriptTargetoptionList.find( + const selectedOption = arr.ivrTaskScriptTargetoptionList.find( (option) => option.targetvalue == value ); if (selectedOption) { diff --git a/src/views/sfstatistics/percentage/satisfaction.vue b/src/views/sfstatistics/percentage/satisfaction.vue index b9ced80..99a6ba4 100644 --- a/src/views/sfstatistics/percentage/satisfaction.vue +++ b/src/views/sfstatistics/percentage/satisfaction.vue @@ -131,8 +131,6 @@ :data="userList" :border="true" @selection-change="handleSelectionChange" - @row-click="handleRowClick" - @expand-change="handleRowClick" :row-key="getRowKey" :expand-row-keys="expands" > @@ -207,22 +205,22 @@ <el-table-column label="婊℃剰搴﹂鐩�婚噺" align="center" - key="manual" - prop="manual" + key="joyAllCount" + prop="joyAllCount" > </el-table-column> <el-table-column label="婊℃剰搴﹀~鎶ラ噺" align="center" - key="sms" - prop="sms" + key="joyCount" + prop="joyCount" > </el-table-column> <el-table-column label="瀹屾垚姣旂巼" align="center" - key="rate" - prop="rate" + key="joyTotal" + prop="joyTotal" > <template slot-scope="scope"> <el-button @@ -230,27 +228,31 @@ type="text" @click="Seedetails(scope.row)" ><span class="button-zx" - >{{ (Number(scope.row.rate) * 100).toFixed(2) }}%</span + >{{ + (Number(scope.row.joyTotal) * 100).toFixed(2) + }}%</span ></el-button > </template> </el-table-column> <el-table-column - label="鎿嶄綔" - align="center" - fixed="right" - width="300" - class-name="small-padding fixed-width" - > - <template slot-scope="scope"> - <el-button size="medium" type="text" @click="Seedetails(scope.row)" - ><span class="button-zx" - ><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span - ></el-button - > - - </template> - </el-table-column> + label="鎿嶄綔" + align="center" + fixed="right" + width="300" + class-name="small-padding fixed-width" + > + <template slot-scope="scope"> + <el-button + size="medium" + type="text" + @click="Seedetails(scope.row)" + ><span class="button-zx" + ><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span + ></el-button + > + </template> + </el-table-column> </el-table> <!-- <pagination @@ -523,7 +525,11 @@ changetagcategory, } from "@/api/system/label"; import store from "@/store"; -import { getSfStatistics, selectTimelyRate } from "@/api/system/user"; +import { + getSfStatisticsJoydetails, + getSfStatisticsJoy, + selectTimelyRate, +} from "@/api/system/user"; import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; @@ -698,7 +704,7 @@ // 绉婚櫎鍙兘瀛樺湪鐨�"all"鍊� delete params.leavehospitaldistrictcodes.all; delete params.deptcodes.all; - getSfStatistics(params).then((response) => { + getSfStatisticsJoy(params).then((response) => { console.log(response); // this.total = response.total; this.userList = response.data; @@ -708,35 +714,6 @@ return row.statisticaltype === 1 ? row.leavehospitaldistrictcode : row.deptcode; - }, - - // 澶勭悊琛岀偣鍑诲睍寮� - handleRowClick(row) { - console.log(row, "row"); - - // 濡傛灉宸茬粡灞曞紑鍒欐敹璧� - if (this.expands.includes(this.getRowKey(row))) { - this.expands = []; - return; - } - // 澶勭悊鏌ヨ鍙傛暟 - const params = { - ...this.queryParams, - // 濡傛灉閫夋嫨浜�"鍏ㄩ儴"锛屽垯浼犳墍鏈夌梾鍖�/绉戝浠g爜 - leavehospitaldistrictcodes: [row.leavehospitaldistrictcode], - drcode: "1", - }; - // 濡傛灉璇ヨ杩樻病鏈夊姞杞藉尰鐢熸暟鎹紝鍒欏姞杞� - if (!row.doctorStats) { - this.loading = true; - getSfStatistics(params).then((res) => { - this.$set(row, "doctorStats", res.data); - this.expands = [this.getRowKey(row)]; - this.loading = false; - }); - } else { - this.expands = [this.getRowKey(row)]; - } }, /** 淇敼鏍囩 */ handleUpdate(row) { diff --git a/vue.config.js b/vue.config.js index 05235cf..ad3682d 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,8 +36,8 @@ // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `https://www.health-y.cn/lssf`, - // target: `http://192.168.100.127:8095`, - target: `http://192.168.100.10:8096`, + target: `http://192.168.100.127:8095`, + // target: `http://192.168.100.10:8096`, // target:`http://localhost:8095`, // target:`http://35z1t16164.qicp.vip`, // target: `http://192.168.100.193:8095`, -- Gitblit v1.9.3