From 5dc9d1b98ea27422dbea14857dad5c7367eaedfe Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 16 十二月 2024 11:08:01 +0800
Subject: [PATCH] 测试完成
---
src/api/login.js | 7
src/api/system/user.js | 8
src/store/modules/user.js | 4
src/views/login.vue | 41 +++
src/views/patient/propaganda/index.vue | 2
vue.config.js | 4
src/views/patient/medtechnician/SpecializedService.vue | 2
src/views/sfstatistics/percentage/index.vue | 288 +++++++++++++++++++---------
dist (3).zip | 0
src/views/followvisit/discharge/index.vue | 241 +++++++++++++++--------
10 files changed, 393 insertions(+), 204 deletions(-)
diff --git "a/dist \0503\051.zip" "b/dist \0503\051.zip"
new file mode 100644
index 0000000..50f221c
--- /dev/null
+++ "b/dist \0503\051.zip"
Binary files differ
diff --git a/src/api/login.js b/src/api/login.js
index 649f59c..45b9bab 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,12 +1,13 @@
import request from '@/utils/request'
// 鐧诲綍鏂规硶
-export function login(username, password, code, uuid) {
+export function login(username, password, code, uuid,guid) {
const data = {
username,
password,
code,
- uuid
+ uuid,
+ guid,
}
return request({
url: '/login',
@@ -56,4 +57,4 @@
method: 'get',
timeout: 20000
})
-}
\ No newline at end of file
+}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 4b261b2..e68cb47 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -86,6 +86,14 @@
data: data,
});
}
+// 淇敼鐢ㄦ埛涓汉淇℃伅
+export function getSfStatistics(data) {
+ return request({
+ url: "/smartor/serviceSubtask/getSfStatistics",
+ method: "post",
+ data: data,
+ });
+}
// 鐢ㄦ埛瀵嗙爜閲嶇疆
export function updateUserPwd(oldPassword, newPassword) {
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 714790e..9c01098 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -118,10 +118,12 @@
const password = userInfo.password
const code = userInfo.code
const uuid = userInfo.uuid
+ const guid = userInfo.guid
return new Promise((resolve, reject) => {
- login(username, password, code, uuid).then(res => {
+ login(username, password, code, uuid,guid).then(res => {
setToken(res.token)
commit('SET_TOKEN', res.token)
+ localStorage.setItem('guid', guid);
resolve()
}).catch(error => {
reject(error)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index caa2199..624a9cb 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -22,6 +22,44 @@
</div>
</el-card>
</el-col>
+ <el-col :span="2.5">
+ <div class="ysfleftvlue">
+ <el-card shadow="hover">
+ <div style="padding: 8px">
+ <span>宸插彂閫佹湭棰嗗彇</span>
+ <div
+ style="
+ text-align: center;
+ font-size: 18px;
+ margin-top: 10px;
+ font-weight: 600;
+ "
+ >
+ {{ yfsvalue }}
+ </div>
+ </div>
+ </el-card>
+ </div>
+ </el-col>
+ <el-col :span="2.5">
+ <div class="errleftvlue">
+ <el-card shadow="hover">
+ <div style="padding: 8px">
+ <span>寮傚父</span>
+ <div
+ style="
+ text-align: center;
+ font-size: 18px;
+ margin-top: 10px;
+ font-weight: 600;
+ "
+ >
+ {{ ycvalue }}
+ </div>
+ </div>
+ </el-card>
+ </div>
+ </el-col>
</el-row>
</div>
<el-row :gutter="20">
@@ -59,19 +97,15 @@
placeholder="璇疯緭鍏ユ偅鑰呭鍚�"
></el-input>
</el-form-item>
+
<el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
- <el-select
- v-model="topqueryParams.searchscope"
- placeholder="璇烽�夋嫨鎮ｈ�呰寖鍥�"
- >
- <el-option
- v-for="item in source"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+ <el-cascader
+ v-model="topqueryParams.scopetype"
+ placeholder="榛樿鍏ㄩ儴"
+ :options="sourcetype"
+ :props="{ expandTrigger: 'hover' }"
+ @change="handleChange"
+ ></el-cascader>
</el-form-item>
<el-form-item label="浠诲姟鐘舵��" prop="status">
@@ -645,6 +679,8 @@
},
dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
inputVisible: false,
+ ycvalue: "",
+ yfsvalue: "",
inputValue: "",
preachform: "",
previewVisible: false, //闂ㄨ瘖闅忚棰勮寮规
@@ -659,18 +695,21 @@
},
value: [],
list: [],
- source: [
- {
- value: 0,
- label: "鎵�灞炴偅鑰�",
- },
+
+ sourcetype: [
{
value: 1,
- label: "绉戝鎮ｈ��",
+ label: "绉戝",
+ children: [],
},
{
value: 2,
- label: "鐥呭尯鎮ｈ��",
+ label: "鐥呭尯",
+ children: [],
+ },
+ {
+ value: 3,
+ label: "鍏ㄩ儴",
},
],
loading: false,
@@ -680,59 +719,37 @@
value: 0,
},
{
- name: "搴旈殢璁�",
- value: 0,
- },
- {
name: "鎮ｈ�呰繃婊�",
value: 0,
},
{
- name: "寮傚父",
+ name: "搴旈殢璁�",
value: 0,
},
+
+ // {
+ // name: "寮傚父",
+ // value: 0,
+ // },
{
name: "鍙戦�佸け璐�",
value: 0,
},
{
- name: "宸插畬鎴�",
+ name: "寰呭彂閫�",
value: 0,
},
+ {
+ name: "宸插彂閫�",
+ value: 0,
+ },
+
// {
// name: "宸插彂閫佹湭棰嗗彇",
// value: 0,
// },
],
- pickerOptions: {
- disabledDate(time) {
- return time.getTime() > Date.now();
- },
- shortcuts: [
- {
- text: "浠婂ぉ",
- onClick(picker) {
- picker.$emit("pick", new Date());
- },
- },
- {
- text: "鏄ㄥぉ",
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() - 3600 * 1000 * 24);
- picker.$emit("pick", date);
- },
- },
- {
- text: "涓�鍛ㄥ墠",
- onClick(picker) {
- const date = new Date();
- date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
- picker.$emit("pick", date);
- },
- },
- ],
- },
+
// 琛ㄥ崟鍙傛暟
form: {
phonenumber: "",
@@ -747,7 +764,10 @@
pageNum: 1,
pageSize: 10,
serviceType: 2,
- searchscope: 2,
+ searchscope: 3,
+ scopetype: [],
+ leaveldeptcodes: [],
+ leavehospitaldistrictcodes: [],
},
propss: { multiple: true },
options: [],
@@ -788,6 +808,8 @@
label: "姝ｅ父",
},
],
+ errtype: "",
+ leavehospitaldistrictcode: "",
serviceState: [],
checkboxlist: [],
// 琛ㄥ崟鏍￠獙
@@ -798,8 +820,26 @@
created() {
this.serviceState = store.getters.serviceState;
this.checkboxlist = store.getters.checkboxlist;
-
- this.getList(1);
+ this.errtype = this.$route.query.errtype;
+ this.leavehospitaldistrictcode =
+ this.$route.query.leavehospitaldistrictcode;
+ this.sourcetype[0].children = store.getters.belongDepts.map((dept) => {
+ return {
+ label: dept.deptName,
+ value: dept.deptCode,
+ };
+ });
+ this.sourcetype[1].children = store.getters.belongWards.map((dept) => {
+ return {
+ label: dept.districtName,
+ value: dept.districtCode,
+ };
+ });
+ if (this.errtype) {
+ this.toleadExport(2);
+ } else {
+ this.getList(1);
+ }
this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg;
});
@@ -810,21 +850,20 @@
methods: {
/** 鏌ヨ闂ㄨ瘖闅忚鏈嶅姟鍒楄〃 */
getList(refresh) {
- if (this.topqueryParams.searchscope == 1) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.topqueryParams.leavehospitaldistrictcodes = null;
- } else if (this.topqueryParams.searchscope == 2) {
- this.topqueryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- this.topqueryParams.leaveldeptcodes = null;
- } else {
+ // 榛樿鍏ㄩ儴
+ if (this.topqueryParams.searchscope == 3) {
this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
);
this.topqueryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
+ }
+ // 鎺ュ彈寮傚父璺宠浆
+ if (this.errtype) {
+ this.topqueryParams.leavehospitaldistrictcodes.push(
+ this.leavehospitaldistrictcode
+ );
+ console.log(this.topqueryParams.leavehospitaldistrictcodes, "11");
}
this.loading = true;
getTaskservelist(this.topqueryParams).then((response) => {
@@ -833,28 +872,26 @@
if (refresh) {
this.cardlist[0].value =
Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
- this.cardlist[1].value = response.rows[0].ysf;
- this.cardlist[2].value = response.rows[0].wzx;
- this.cardlist[3].value = response.rows[0].yc;
- this.cardlist[4].value = response.rows[0].fssb;
- this.cardlist[5].value = response.rows[0].blq;
+ this.cardlist[1].value = response.rows[0].wzx;
+ this.cardlist[2].value = response.rows[0].ysf;
+ this.ycvalue = response.rows[0].yc;
+ this.cardlist[3].value = response.rows[0].fssb;
+ this.cardlist[4].value = response.rows[0].dfs;
+ this.cardlist[5].value = response.rows[0].yfs2;
+ this.yfsvalue = response.rows[0].yfs;
}
- // this.cardlist[6].value = response.rows[0].yfs;
this.loading = false;
this.userList.forEach((item) => {
let idArray = null;
if (item.endtime) {
item.endDay = this.daysBetween(item.endtime);
- console.log(item.endDay, "鏃堕棿");
}
- console.log(item, "item");
+
if (item.preachform) {
if (item.endtime) {
item.preachformson = item.preachform;
idArray = item.preachform.split(",");
- console.log(idArray, "idArray111");
}
- console.log(idArray, "idArray222");
item.preachform = idArray.map((value) => {
// 鏌ユ壘id瀵瑰簲鐨勫璞�
@@ -927,17 +964,7 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery(refresh) {
-
- if (this.topqueryParams.searchscope == 1) {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
- (obj) => obj.deptCode
- );
- this.topqueryParams.leavehospitaldistrictcodes = null;
- } else if (this.topqueryParams.searchscope == 2) {
- this.topqueryParams.leavehospitaldistrictcodes =
- store.getters.belongWards.map((obj) => obj.districtCode);
- this.topqueryParams.leaveldeptcodes = null;
- } else {
+ if (this.topqueryParams.searchscope == 3) {
this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
(obj) => obj.deptCode
);
@@ -949,6 +976,25 @@
this.topqueryParams.endOutHospTime = this.dateRange[1];
this.getList(refresh);
+ },
+ // 鎮ｈ�呰寖鍥村鐞�
+ handleChange(value) {
+ let type = value[0];
+ let code = value.slice(-1)[0];
+ this.topqueryParams.leavehospitaldistrictcodes = [];
+ this.topqueryParams.leaveldeptcodes = [];
+
+ if (type == 1) {
+ this.topqueryParams.leaveldeptcodes.push(code);
+ this.topqueryParams.leavehospitaldistrictcodes = [];
+ this.topqueryParams.searchscope = 1;
+ } else if (type == 2) {
+ this.topqueryParams.leavehospitaldistrictcodes.push(code);
+ this.topqueryParams.leaveldeptcodes = [];
+ this.topqueryParams.searchscope = 2;
+ } else {
+ this.topqueryParams.searchscope = 3;
+ }
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
@@ -1124,8 +1170,10 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
+ this.topqueryParams.pageNum = null;
+ this.topqueryParams.pageSize = null;
this.download(
- "system/user/export",
+ "smartor/serviceSubtask/export",
{
...this.topqueryParams,
},
@@ -1242,6 +1290,21 @@
background: #8dc8f8;
cursor: pointer; /* 榧犳爣鎮诞鏃跺彉涓烘墜褰� */
}
+::v-deep.errleftvlue .el-card__body {
+ background: #fdd0d7;
+}
+::v-deep.errleftvlue .el-card__body:hover {
+ background: #f88d96;
+ cursor: pointer; /* 榧犳爣鎮诞鏃跺彉涓烘墜褰� */
+}
+
+::v-deep.ysfleftvlue .el-card__body {
+ background: #d0fdd8;
+}
+::v-deep.ysfleftvlue .el-card__body:hover {
+ background: #8df8a4;
+ cursor: pointer; /* 榧犳爣鎮诞鏃跺彉涓烘墜褰� */
+}
.button-bb {
font-weight: 500;
background-color: #2ba05c;
diff --git a/src/views/login.vue b/src/views/login.vue
index ce46604..272c39b 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -36,6 +36,18 @@
/>
</el-input>
</el-form-item>
+ <el-form-item prop="guid">
+ <el-select style="width: 100%;" v-model="loginForm.guid" placeholder="璇烽�夋嫨闄㈠尯">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ <i slot="prefix" class="el-icon-mobile"></i>
+ </el-select>
+ </el-form-item>
<!-- <el-form-item prop="code" v-if="captchaEnabled">
<el-input
v-model="loginForm.code"
@@ -100,7 +112,13 @@
rememberMe: false,
code: "",
uuid: "",
+ guid:'',
},
+ options: [
+ { value: "1", label: "涓尰澶т簩闄�" },
+ { value: "2", label: "涓尰澶т笁闄�" },
+ { value: "3", label: "涓尰澶у洓闄�" },
+ { value: "4", label: "涓尰澶т簲闄�" },],
loginRules: {
username: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" },
@@ -108,7 +126,7 @@
password: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
],
- // code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }],
+ guid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
},
loading: false,
// 楠岃瘉鐮佸紑鍏�
@@ -129,6 +147,9 @@
created() {
this.getCode();
this.getCookie();
+ if (localStorage.getItem('guid')) {
+ this.loginForm.guid = localStorage.getItem('guid');
+ }
},
methods: {
getCode() {
@@ -170,6 +191,7 @@
Cookies.remove("password");
Cookies.remove("rememberMe");
}
+ localStorage.removeItem('guid');
this.$store
.dispatch("Login", this.loginForm)
.then(() => {
@@ -194,17 +216,17 @@
justify-content: center;
align-items: center;
height: 100%;
- overflow:hidden !important;
+ overflow: hidden !important;
background-position: center center;
/* 鑳屾櫙鍥句笉骞抽摵 */
-background-repeat: no-repeat;
-/* 褰撳唴瀹归珮搴﹀ぇ浜庡浘鐗囬珮搴︽椂锛岃儗鏅浘鍍忕殑浣嶇疆鐩稿浜巚iewport鍥哄畾 */
-background-attachment: fixed;
-/* 璁╄儗鏅浘鍩轰簬瀹瑰櫒澶у皬浼哥缉 */
-background-size: cover;
-/* 璁剧疆鑳屾櫙棰滆壊锛岃儗鏅浘鍔犺浇杩囩▼涓細鏄剧ず鑳屾櫙鑹� */
-background-color: #464646;
+ background-repeat: no-repeat;
+ /* 褰撳唴瀹归珮搴﹀ぇ浜庡浘鐗囬珮搴︽椂锛岃儗鏅浘鍍忕殑浣嶇疆鐩稿浜巚iewport鍥哄畾 */
+ background-attachment: fixed;
+ /* 璁╄儗鏅浘鍩轰簬瀹瑰櫒澶у皬浼哥缉 */
+ background-size: cover;
+ /* 璁剧疆鑳屾櫙棰滆壊锛岃儗鏅浘鍔犺浇杩囩▼涓細鏄剧ず鑳屾櫙鑹� */
+ background-color: #464646;
background-image: url("../assets/images/login-background.jpg");
background-size: cover;
}
@@ -257,6 +279,7 @@
font-size: 12px;
letter-spacing: 1px;
}
+
.login-code-img {
height: 38px;
}
diff --git a/src/views/patient/medtechnician/SpecializedService.vue b/src/views/patient/medtechnician/SpecializedService.vue
index 4fe475b..128c475 100644
--- a/src/views/patient/medtechnician/SpecializedService.vue
+++ b/src/views/patient/medtechnician/SpecializedService.vue
@@ -286,7 +286,7 @@
>
<template slot-scope="scope">
<span>{{
- scope.row.endDay ? scope.row.endDay + "澶�" : "鏃ユ湡缂哄け"
+ scope.row.endDay ? scope.row.endDay + "澶�" : ""
}}</span>
</template>
</el-table-column>
diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue
index 1d493f5..87dc142 100644
--- a/src/views/patient/propaganda/index.vue
+++ b/src/views/patient/propaganda/index.vue
@@ -268,7 +268,7 @@
>
<template slot-scope="scope">
<span>{{
- scope.row.endDay ? scope.row.endDay + "澶�" : "鏃ユ湡缂哄け"
+ scope.row.endDay ? scope.row.endDay + "澶�" : ""
}}</span>
</template>
</el-table-column>
diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index 52cd9b9..b07102b 100644
--- a/src/views/sfstatistics/percentage/index.vue
+++ b/src/views/sfstatistics/percentage/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="Questionnairemanagement">
<!-- 宸︿晶鏍� -->
- <div class="sidecolumn">
+ <!-- <div class="sidecolumn">
<div class="sidecolumn-top">
<div class="top-wj">鎮ｈ�呰寖鍥�</div>
</div>
@@ -19,10 +19,10 @@
<el-tab-pane label="浣撴" name="physical"></el-tab-pane>
</el-tabs>
</div>
- </div>
+ </div> -->
<!-- 鍙充晶鏁版嵁 -->
<div class="leftvlue">
- <div class="leftvlue-top">
+ <!-- <div class="leftvlue-top">
<el-tabs v-model="topactiveName" @tab-click="tophandleClick">
<el-tab-pane name="Local">
<span class="mulsz" slot="label">鎸夊嚭闄㈢梾鍖虹粺璁� </span>
@@ -31,7 +31,7 @@
<span class="mulsz" slot="label">鎸夊嚭闄㈢瀹ょ粺璁� </span>
</el-tab-pane>
</el-tabs>
- </div>
+ </div> -->
<div class="leftvlue-bg">
<el-row :gutter="20">
<!--鏍囩鏁版嵁-->
@@ -44,7 +44,7 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item label="鍖婚櫌" prop="userName">
+ <!-- <el-form-item label="鍖婚櫌" prop="userName">
<el-select v-model="queryParams.value1" placeholder="璇烽�夋嫨">
<el-option
v-for="item in options"
@@ -54,19 +54,35 @@
>
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鍑洪櫌鐥呭尯" prop="userName">
- <el-select v-model="queryParams.value2" placeholder="璇烽�夋嫨">
+ <!-- <el-select v-model="queryParams.leavehospitaldistrictcodes" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in options"
- :key="item.value"
+ v-for="item in flatArray"
+ :key="item.deptCode"
:label="item.label"
- :value="item.value"
+ :value="item.deptCode"
+ >
+ </el-option>
+ </el-select> -->
+ <el-select
+ v-model="queryParams.leavehospitaldistrictcodes"
+
+ size="medium"
+ multiple
+ filterable
+ placeholder="璇烽�夋嫨鐥呭尯"
+ >
+ <el-option
+ v-for="item in flatArray"
+ :key="item.deptCode"
+ :label="item.label"
+ :value="item.deptCode"
>
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="绠＄悊鏂规" prop="userName">
+ <!-- <el-form-item label="绠＄悊鏂规" prop="userName">
<el-select v-model="queryParams.value3" placeholder="璇烽�夋嫨">
<el-option
v-for="item in options"
@@ -76,8 +92,8 @@
>
</el-option>
</el-select>
- </el-form-item>
- <el-form-item label="鍑洪櫌鏃ユ湡" prop="userName">
+ </el-form-item> -->
+ <!-- <el-form-item label="鍑洪櫌鏃ユ湡" prop="userName">
<el-date-picker
v-model="queryParams.valuetime1"
align="right"
@@ -86,14 +102,14 @@
:picker-options="pickerOptionsa"
>
</el-date-picker>
- </el-form-item>
- <el-form-item label="璁″垝闅忚鏃ユ湡" prop="userName">
+ </el-form-item> -->
+ <el-form-item label="缁熻鏃ユ湡" prop="userName">
<el-date-picker
- v-model="queryParams.valuetime2"
- align="right"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="pickerOptions"
+ v-model="queryParams.dateRange"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
>
</el-date-picker>
</el-form-item>
@@ -170,115 +186,137 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
- <el-table-column
+ <!-- <el-table-column
fixed
label="搴忓彿"
align="center"
key="tagid"
prop="tagid"
width="50"
- />
+ /> -->
<el-table-column
fixed
label="鍑洪櫌鐥呭尯"
align="center"
- key="tagname"
- prop="tagname"
+ key="leavehospitaldistrictname"
+ prop="leavehospitaldistrictname"
width="100"
:show-overflow-tooltip="true"
/>
<el-table-column
- label="搴旈殢璁挎暟"
+ label="鏈嶅姟鎬婚噺"
align="center"
- key="updateTime"
- prop="updateTime"
+ key="serviceCount"
+ prop="serviceCount"
>
<template slot-scope="scope">
<span
>{{ scope.row.updateBy }}
- <p>{{ scope.row.updateTime }}</p></span
+ <p>{{ scope.row.serviceCount }}</p></span
>
</template>
</el-table-column>
<el-table-column
- label="闅忚瀹屾垚鏁�"
+ label="鎮ｈ�呰繃婊ゆ暟閲�"
align="center"
- key="tagdescription"
- prop="tagdescription"
+ width="120"
+ key="bzxCount"
+ prop="bzxCount"
+ >
+ </el-table-column>
+ <el-table-column
+ label="搴旈殢璁块噺"
+ align="center"
+ key="ysfCount"
+ prop="ysfCount"
+ >
+ </el-table-column
+ ><el-table-column
+ label="鍙戦�佸け璐�"
+ align="center"
+ key="fssbCount"
+ prop="fssbCount"
+ >
+ </el-table-column
+ ><el-table-column
+ label="寰呭彂閫�"
+ align="center"
+ key="dfsCount"
+ prop="dfsCount"
+ >
+ </el-table-column
+ ><el-table-column
+ label="宸插彂閫�"
+ align="center"
+ key="yfsCount"
+ prop="yfsCount"
+ >
+ </el-table-column>
+ <el-table-column
+ label="宸插畬鎴�"
+ align="center"
+ key="ywcCount"
+ prop="ywcCount"
>
</el-table-column>
<el-table-column
label="闅忚瀹屾垚鐜�"
align="center"
- key="isupload"
- prop="isupload"
+ width="120"
+ key="sfwcl"
+ prop="sfwcl"
>
+ <template slot-scope="scope">
+ <span>{{ Number(scope.row.sfwcl)*100 }}%</span>
+ </template>
</el-table-column>
- <el-table-column
- label="AI澶栧懠娆℃暟"
+ <!-- <el-table-column
+ label="鍏紬鍙峰彂閫佹鏁�"
align="center"
key="tagdescription"
prop="tagdescription"
>
</el-table-column>
<el-table-column
- label="AI闅忚瀹屾垚鏁�"
+ label="鍏紬鍙烽殢璁垮畬鎴愭暟"
align="center"
key="tagdescription"
prop="tagdescription"
>
</el-table-column>
<el-table-column
- label="AI闅忚瀹屾垚鐜�"
+ label="鍏紬鍙烽殢璁垮畬鎴愮巼"
align="center"
key="tagdescription"
prop="tagdescription"
>
- </el-table-column>
- <el-table-column
- label="寰俊鍙戦�佹鏁�"
- align="center"
- key="tagdescription"
- prop="tagdescription"
- >
- </el-table-column>
- <el-table-column
- label="寰俊闅忚瀹屾垚鏁�"
- align="center"
- key="tagdescription"
- prop="tagdescription"
- >
- </el-table-column>
- <el-table-column
- label="寰俊闅忚瀹屾垚鐜�"
- align="center"
- key="tagdescription"
- prop="tagdescription"
- >
- </el-table-column>
+ </el-table-column> -->
<el-table-column
label="鐭俊鍙戦�佹鏁�"
align="center"
- key="tagdescription"
- prop="tagdescription"
+ width="120"
+ key="dxfscs"
+ prop="dxfscs"
>
</el-table-column>
<el-table-column
label="鐭俊闅忚瀹屾垚鏁�"
align="center"
- key="tagdescription"
- prop="tagdescription"
+ width="120"
+ key="dxsfwccs"
+ prop="dxsfwccs"
>
</el-table-column>
<el-table-column
label="鐭俊闅忚瀹屾垚鐜�"
align="center"
- key="tagdescription"
- prop="tagdescription"
+ width="120"
+ key="dxsfwcl"
+ prop="dxsfwcl"
>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="浜哄伐闅忚娆℃暟"
align="center"
key="tagdescription"
@@ -298,8 +336,8 @@
key="tagdescription"
prop="tagdescription"
>
- </el-table-column>
- <el-table-column
+ </el-table-column> -->
+ <!-- <el-table-column
label="澶辫鏁�"
align="center"
key="tagdescription"
@@ -318,30 +356,42 @@
align="center"
key="tagdescription"
prop="tagdescription"
- >
- </el-table-column>
+ > -->
+ <!-- </el-table-column> -->
<el-table-column
label="寮傚父鎬绘暟"
align="center"
- key="tagdescription"
- prop="tagdescription"
+ key="yczs"
+ prop="yczs"
>
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="danger"
+ plain
+ @click="routerErr(scope.row)"
+ ><span class="button-zx"
+ >{{scope.row.yczs}}</span
+ ></el-button
+ >
+ </template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="鎬诲紓甯哥巼"
align="center"
key="tagdescription"
prop="tagdescription"
>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
label="鍥炲寮傚父鏁�"
align="center"
- key="tagdescription"
- prop="tagdescription"
+ width="100"
+ key="hfycs"
+ prop="hfycs"
>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="鍥炲寮傚父鍙婃椂澶勭悊鏁�"
align="center"
key="tagdescription"
@@ -354,7 +404,7 @@
key="tagdescription"
prop="tagdescription"
>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column
label="鎿嶄綔"
@@ -385,13 +435,13 @@
</el-table-column> -->
</el-table>
- <pagination
+ <!-- <pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
- />
+ /> -->
</el-col>
</el-row>
</div>
@@ -412,6 +462,9 @@
listtag,
tagclassifylist,
} from "@/api/system/label";
+import {
+ getSfStatistics,deptTreeSelect
+} from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -460,6 +513,7 @@
idds: "", //鍒嗙被id
// 鎬绘潯鏁�
total: 0,
+ flatArray:[],
amendtag: false, //鏄惁淇敼绫诲埆
lstamendtag: false, //鏄惁淇敼鏍囩
scavisible: false, //鍒犻櫎寮规
@@ -498,7 +552,7 @@
goQRCodeVisible: false, //浜岀淮鐮佸脊妗�
sidecolumnval: "", //绫诲埆鎼滅储
propss: { multiple: true },
- topqueryParams: {}, //瀵煎嚭绛涢�夋潯浠�
+
options: [
{
value: 1,
@@ -533,8 +587,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- tagname: undefined,
- tagdescription: undefined,
+ serviceType:[2],
+ dateRange: [],
},
// 鍒椾俊鎭�
columns: [
@@ -551,16 +605,16 @@
watch: {},
created() {
this.getList();
- this.gitclasify();
+this.getDeptTree();
},
methods: {
/** 鏌ヨ鏍囩鍒楄〃 */
getList() {
- listtag(this.addDateRange(this.queryParams)).then((response) => {
+ getSfStatistics(this.queryParams).then((response) => {
console.log(response);
- this.total = response.total;
- this.userList = response.rows;
+ // this.total = response.total;
+ this.userList = response.data;
});
},
/** 淇敼鏍囩 */
@@ -575,6 +629,36 @@
tagdescription: row.tagdescription,
tagid: row.tagid,
};
+ },
+ // 鑾峰彇绉戝鏍�
+ getDeptTree() {
+ // 绉戝鍒楄〃
+ deptTreeSelect().then((response) => {
+ this.deptOptions = response.data;
+ console.log( this.deptOptions,' this.deptOptions');
+
+ this.flatArray = this.flattenArray(response.data);
+ console.log(this.flatArray,'this.flatArray');
+ });
+ },
+ flattenArray(multiArray) {
+ let result = [];
+
+ // 閫掑綊鍑芥暟锛岀敤浜庡皢澶氱骇鏁扮粍杞崲涓轰竴缁存暟缁勶紝鍙寘鍚渶搴曞眰鐨勫厓绱�
+ function flatten(element) {
+ // 濡傛灉褰撳墠鍏冪礌鏈夊瓙鍏冪礌锛岀户缁�掑綊
+ if (element.children && element.children.length > 0) {
+ element.children.forEach((child) => flatten(child));
+ } else {
+ // 鍏嬮殕鍏冪礌浠ラ伩鍏嶄慨鏀瑰師濮嬫暟鎹�
+ let item = JSON.parse(JSON.stringify(element));
+ result.push(item); // 灏嗘渶搴曞眰鐨勫厓绱犳坊鍔犲埌缁撴灉鏁扮粍
+ }
+ }
+
+ // 浠庨《灞傚厓绱犲紑濮嬮�掑綊
+ multiArray.forEach((element) => flatten(element));
+ return result; // 杩斿洖鍙寘鍚渶搴曞眰鍏冪礌鐨勪竴缁存暟缁�
},
addladeltag() {
this.lstamendtagVisible = true;
@@ -607,6 +691,16 @@
tagdescription: "",
tagid: "",
};
+ },
+ routerErr(row) {
+ console.log(row,'璺宠浆寮傚父');
+ this.$router.push({
+ path: "/followvisit/discharge",
+ query: {
+ errtype: 1,
+ leavehospitaldistrictcode: row.leavehospitaldistrictcode,
+ },
+ });
},
// 琛ㄥ崟閲嶇疆
@@ -646,14 +740,15 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
+ console.log();
+ this.queryParams.startTime = this.parseTime(this.queryParams.dateRange[0]);
+ this.queryParams.endTime = this.parseTime(this.queryParams.dateRange[1]);
this.getList();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.dateRange = [];
- this.resetForm("queryForm");
- this.queryParams.tagname = "";
- this.$refs.tree.setCurrentKey(null);
+ this.queryParams.dateRange = [];
+ this.queryParams.leavehospitaldistrictcodes=[];
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -689,7 +784,7 @@
this.download(
"base/tag/export",
{
- ...this.topqueryParams,
+ ...this.queryParams,
},
`user_${new Date().getTime()}.xlsx`
);
@@ -699,9 +794,6 @@
</script>
<style lang="scss" scoped>
-.Questionnairemanagement {
- display: flex;
-}
.sidecolumn {
width: 180px;
min-height: 100vh;
@@ -781,9 +873,9 @@
.leftvlue {
// display: flex;
// flex: 1;
- width: 80%;
- margin-top: 20px;
- // margin: 20px;
+ // width: 80%;
+ // margin-top: 20px;
+ margin: 20px;
padding: 30px;
background: #ffff;
border: 1px solid #dcdfe6;
diff --git a/vue.config.js b/vue.config.js
index caac8d8..3304542 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,11 +37,11 @@
[process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.168.60:8095`,
// target: `http://10.202.20.185:8095`,
- // target: `http://192.168.2.10:8095`,
+ target: `http://192.168.2.10:8095`,
// target:`http://localhost:8095`,
// target: `http://192.168.101.135:8095`,
// target: `http://192.168.101.166:8093`,
- target: `http://192.168.191.181:8095`,
+ // target: `http://192.168.191.181:8095`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.3