提交 5c18dbf2 编写于 作者: lyf's avatar lyf

更改红点展示方式

上级 b17ae4fb
...@@ -202,7 +202,6 @@ ...@@ -202,7 +202,6 @@
<div class="component-content screenSet" id="screenSet"> <div class="component-content screenSet" id="screenSet">
<el-tabs v-if="tabrefresh" v-model="activeName" @tab-click="handleClick"> <el-tabs v-if="tabrefresh" v-model="activeName" @tab-click="handleClick">
<el-tab-pane <el-tab-pane
:label="item.label" :label="item.label"
:name="item.active" :name="item.active"
v-for="item in tabpaneList" v-for="item in tabpaneList"
...@@ -213,7 +212,6 @@ ...@@ -213,7 +212,6 @@
<el-badge :is-dot="item.isdot" class="item"> <el-badge :is-dot="item.isdot" class="item">
{{ item.label }}({{ item.dgCount }}) {{ item.label }}({{ item.dgCount }})
</el-badge> </el-badge>
</span> </span>
</div> </div>
<table-component <table-component
...@@ -250,7 +248,6 @@ ...@@ -250,7 +248,6 @@
<match-component <match-component
@search="search" @search="search"
:matchVisible.sync="matchVisible" :matchVisible.sync="matchVisible"
:diagnoseLogId="diagnoseLogId" :diagnoseLogId="diagnoseLogId"
:batchFlag="batchFlag" :batchFlag="batchFlag"
...@@ -318,13 +315,13 @@ ...@@ -318,13 +315,13 @@
</template> </template>
<script> <script>
let vm = null; let vm = null;
import {updateDiagnosis} from "../../../utils/diagnosis"; import { updateDiagnosis } from "../../../utils/diagnosis";
import { base64decode } from "../../../utils/utils.js"; import { base64decode } from "../../../utils/utils.js";
const DOWN_URL= '/diagnose/admin/diagnose/export'; const DOWN_URL = "/diagnose/admin/diagnose/export";
const LIST_URL= '/diagnose/admin/diagnose/list'; const LIST_URL = "/diagnose/admin/diagnose/list";
const COUNT_QUERY = "/diagnose/admin/diagnose/countQuery"; const COUNT_QUERY = "/diagnose/admin/diagnose/countQuery";
const DEP_URL= '/hospital/departments/0' const DEP_URL = "/hospital/departments/0";
import TableComponent from "@/components/list/table-c"; import TableComponent from "@/components/list/table-c";
import { import {
TYPE_LIST, TYPE_LIST,
...@@ -372,13 +369,13 @@ export default { ...@@ -372,13 +369,13 @@ export default {
orderRangeTime: "", orderRangeTime: "",
completeRangeTime: "", completeRangeTime: "",
depList: [], depList: [],
tabrefresh:true, tabrefresh: true,
searchParam: { searchParam: {
id: "", id: "",
operateName: "", operateName: "",
assistantVal: "", assistantVal: "",
receptionVal: "", receptionVal: "",
sort:null, sort: null,
triageDepartmentId: "", triageDepartmentId: "",
diagnoseType: "", //预约问诊类型:1、音频 2、视频 3、图文 diagnoseType: "", //预约问诊类型:1、音频 2、视频 3、图文
createdTimeBegin: "", createdTimeBegin: "",
...@@ -455,12 +452,9 @@ export default { ...@@ -455,12 +452,9 @@ export default {
}, },
mounted() { mounted() {
this.setTableHeight(); this.setTableHeight();
}, },
destroyed(){ destroyed() {
clearInterval(this.timer); clearInterval(this.timer);
}, },
methods: { methods: {
selectToggle() { selectToggle() {
...@@ -472,7 +466,6 @@ export default { ...@@ -472,7 +466,6 @@ export default {
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.getTabs(); this.getTabs();
}, 600000); }, 600000);
// 600000 // 600000
}, },
...@@ -482,10 +475,10 @@ export default { ...@@ -482,10 +475,10 @@ export default {
this.GET(url).then((res) => { this.GET(url).then((res) => {
if (res.code == "000000") { if (res.code == "000000") {
this.setTable(res.data); this.setTable(res.data);
this.tabrefresh=false this.tabrefresh = false;
this.$nextTick(()=>{ this.$nextTick(() => {
this.tabrefresh=true this.tabrefresh = true;
}) });
} }
}); });
}, },
...@@ -493,18 +486,18 @@ export default { ...@@ -493,18 +486,18 @@ export default {
init() { init() {
let fullPath = this.$route.fullPath; let fullPath = this.$route.fullPath;
let fromType = 1; let fromType = 1;
if(fullPath.indexOf("?") > -1){ if (fullPath.indexOf("?") > -1) {
let str = base64decode(fullPath.split("?")[1]); let str = base64decode(fullPath.split("?")[1]);
if(str.indexOf("?")){ if (str.indexOf("?")) {
fromType = str.split("=")[1]; fromType = str.split("=")[1];
} }
} }
// this.fromType = +(this.$route.query.fromType || 1); // this.fromType = +(this.$route.query.fromType || 1);
this.fromType = + fromType; this.fromType = +fromType;
this.activeName = "99"; this.activeName = "99";
this.searchParam.status = ""; this.searchParam.status = "";
this.Raw_tabpaneList=[] this.Raw_tabpaneList = [];
this.getTabs(); this.getTabs();
this.contrastData(); this.contrastData();
}, },
...@@ -512,7 +505,7 @@ export default { ...@@ -512,7 +505,7 @@ export default {
// 不同也main切换不同的tab // 不同也main切换不同的tab
setTable(data) { setTable(data) {
let tabs = ALL_TAB_LIST; let tabs = ALL_TAB_LIST;
console.log("this.fromType",this.fromType) console.log("this.fromType", this.fromType);
switch (this.fromType) { switch (this.fromType) {
case 1: case 1:
tabs = ALL_TAB_LIST; tabs = ALL_TAB_LIST;
...@@ -549,19 +542,22 @@ export default { ...@@ -549,19 +542,22 @@ export default {
count = count + data[index].dgCount; count = count + data[index].dgCount;
let isdot = false; let isdot = false;
if (this.Raw_tabpaneList.length > 0) { if (this.Raw_tabpaneList.length > 0) {
isdot = data[index].dgCount == this.Raw_tabpaneList[i].dgCount ? false : true; isdot =
data[index].dgCount > this.Raw_tabpaneList[i].dgCount
? true
: false;
} }
tabs[i] = { tabs[i] = {
...tabs[i], ...tabs[i],
dgCount: data[index].dgCount, dgCount: data[index].dgCount,
isdot:isdot isdot: isdot,
}; };
} }
} }
tabs[0].dgCount = count; tabs[0].dgCount = count;
this.tabpaneList = tabs; this.tabpaneList = tabs;
if(this.Raw_tabpaneList.length==0){ if (this.Raw_tabpaneList.length == 0) {
this.Raw_tabpaneList =JSON.parse(JSON.stringify(tabs)); this.Raw_tabpaneList = JSON.parse(JSON.stringify(tabs));
} }
}, },
...@@ -596,11 +592,15 @@ export default { ...@@ -596,11 +592,15 @@ export default {
for (let i = 0; i < this.tabpaneList.length; i++) { for (let i = 0; i < this.tabpaneList.length; i++) {
if (this.tabpaneList[i].active == val.paneName) { if (this.tabpaneList[i].active == val.paneName) {
this.tabpaneList[i].isdot = false; this.tabpaneList[i].isdot = false;
this.Raw_tabpaneList[i]=this.tabpaneList[i] this.Raw_tabpaneList[i] = this.tabpaneList[i];
} }
} }
this.searchParam.status = this.searchParam.status =
val.paneName == 99 ? "" : val.paneName == 101||val.paneName == 102 ? "21" : val.paneName; val.paneName == 99
? ""
: val.paneName == 101 || val.paneName == 102
? "21"
: val.paneName;
if (this.fromType == 5 && this.searchParam.status) { if (this.fromType == 5 && this.searchParam.status) {
if (val.paneName == 101) { if (val.paneName == 101) {
this.searchParam.hasToFollowReason = 1; this.searchParam.hasToFollowReason = 1;
...@@ -644,34 +644,36 @@ export default { ...@@ -644,34 +644,36 @@ export default {
this.resetPage(); this.resetPage();
this.search(true); this.search(true);
}, },
sortfunc(data){ sortfunc(data) {
// ascending 升序 // ascending 升序
// descending 降序 // descending 降序
if(data.prop=="appointBeginTime"&&data.order=="ascending"){ if (data.prop == "appointBeginTime" && data.order == "ascending") {
this.searchParam.sort=1 this.searchParam.sort = 1;
} else if (
} data.prop == "appointBeginTime" &&
else if(data.prop=="appointBeginTime"&&data.order=="descending"){ data.order == "descending"
this.searchParam.sort=2 ) {
} this.searchParam.sort = 2;
else if(data.prop=="assistantBeginTime"&&data.order=="ascending"){ } else if (
this.searchParam.sort=3 data.prop == "assistantBeginTime" &&
} data.order == "ascending"
) {
else if(data.prop=="assistantBeginTime"&&data.order=="descending"){ this.searchParam.sort = 3;
this.searchParam.sort=4 } else if (
} data.prop == "assistantBeginTime" &&
else{ data.order == "descending"
this.searchParam.sort=null ) {
this.searchParam.sort = 4;
} else {
this.searchParam.sort = null;
} }
this.search(true) this.search(true);
}, },
search(isTabs) { search(isTabs) {
this.loading = true; this.loading = true;
if(!isTabs){ if (!isTabs) {
console.log("isTabs",isTabs) console.log("isTabs", isTabs);
this.getTabs(); this.getTabs();
} }
this.initTime(); this.initTime();
...@@ -717,7 +719,7 @@ export default { ...@@ -717,7 +719,7 @@ export default {
createdTimeEnd: "", createdTimeEnd: "",
operateTimeBegin: "", operateTimeBegin: "",
operateTimeEnd: "", operateTimeEnd: "",
sort:null, sort: null,
appointBeginTime: "", appointBeginTime: "",
appointEndTime: "", appointEndTime: "",
doneTimeBegin: "", doneTimeBegin: "",
...@@ -875,8 +877,8 @@ export default { ...@@ -875,8 +877,8 @@ export default {
} }
}, },
//重新匹配医生 //重新匹配医生
reMatchDot(row,type) { reMatchDot(row, type) {
console.log(row,type) console.log(row, type);
this.rematchingVisible = true; this.rematchingVisible = true;
this.diagnoseLogId = row.diagnoseLogId; this.diagnoseLogId = row.diagnoseLogId;
this.bizType = type; this.bizType = type;
......
...@@ -353,7 +353,6 @@ export default { ...@@ -353,7 +353,6 @@ export default {
if(item.status==2){ if(item.status==2){
item.timeleft=0 item.timeleft=0
} }
console.log("status",status)
let text = ""; let text = "";
switch (status) { switch (status) {
case 1: case 1:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册