From 1cb1fbf80c955986385377b5f84e8915d1e655d6 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 15 一月 2025 15:04:00 +0800
Subject: [PATCH] 测试完成
---
vue.config.js | 4 ++--
src/assets/images/profile.jpg | 0
src/views/system/user/profile/index.vue | 8 ++++++--
src/views/knowledge/education/index.vue | 2 +-
src/router/index.js | 26 +++++++++++++-------------
src/assets/logo/logoxh.png | 0
src/views/patient/propaganda/QuestionnaireTask.vue | 2 --
src/assets/logo/logoxh3.png | 0
/dev/null | 0
src/views/patient/patient/ExternalPatient.vue | 4 ++--
src/views/followvisit/record/detailpage/index.vue | 2 +-
src/views/knowledge/education/compilequer/index.vue | 2 +-
src/views/patient/propaganda/particty.vue | 1 -
src/views/followvisit/discharge/index.vue | 5 ++++-
14 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/src/assets/images/profile.jpg b/src/assets/images/profile.jpg
index 77d3c32..c165d3b 100644
--- a/src/assets/images/profile.jpg
+++ b/src/assets/images/profile.jpg
Binary files differ
diff --git a/src/assets/logo/logoxh.png b/src/assets/logo/logoxh.png
index 77d3c32..c0760d3 100644
--- a/src/assets/logo/logoxh.png
+++ b/src/assets/logo/logoxh.png
Binary files differ
diff --git a/src/assets/logo/logoxh1.png b/src/assets/logo/logoxh1.png
deleted file mode 100644
index c0760d3..0000000
--- a/src/assets/logo/logoxh1.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/logo/logoxh3.png b/src/assets/logo/logoxh3.png
new file mode 100644
index 0000000..77d3c32
--- /dev/null
+++ b/src/assets/logo/logoxh3.png
Binary files differ
diff --git a/src/router/index.js b/src/router/index.js
index 6f4d0f9..84042a6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -96,19 +96,19 @@
component: () => import('@/views/error/401'),
hidden: true
},
- // {
- // path: '',
- // component: Layout,
- // redirect: 'index',
- // children: [
- // {
- // path: 'index',
- // component: () => import('@/views/index'),
- // name: 'Index',
- // meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
- // }
- // ]
- // },
+ {
+ path: '',
+ component: Layout,
+ redirect: 'index',
+ children: [
+ {
+ path: 'index',
+ component: () => import('@/views/index'),
+ name: 'Index',
+ meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
+ }
+ ]
+ },
{
path: '/user',
component: Layout,
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 624a9cb..85dbad0 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -221,7 +221,8 @@
width="120"
>
<template slot-scope="scope">
- <div v-if="scope.row.sendstate == 1">
+ <el-tooltip class="item" effect="dark" :content="scope.row.remark" placement="top-start">
+ <div v-if="scope.row.sendstate == 1">
<el-tag type="primary" :disable-transitions="false"
>琚鍙�</el-tag
>
@@ -247,6 +248,8 @@
<div v-if="scope.row.sendstate == 6">
<el-tag type="danger" :disable-transitions="false">宸插畬鎴�</el-tag>
</div>
+ </el-tooltip>
+
</template>
</el-table-column>
<!-- <el-table-column
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index e0f68c0..3856a72 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -648,7 +648,7 @@
taskid: this.taskid,
}).then((res) => {
if (res.code == 200) {
- objson = res.rows[0];
+ objson = res.rows[0].serviceSubtaskList[0];
objson.suggest = son;
Editsingletaskson(objson).then((res) => {
if (res.code) {
diff --git a/src/views/knowledge/education/compilequer/index.vue b/src/views/knowledge/education/compilequer/index.vue
index 116116c..be12c5b 100644
--- a/src/views/knowledge/education/compilequer/index.vue
+++ b/src/views/knowledge/education/compilequer/index.vue
@@ -943,7 +943,7 @@
// 鑾峰彇鍏夋爣鎵�鍦ㄤ綅缃�
let length = quill.getSelection().index;
// 鎻掑叆鍥剧墖||瑙嗛 res.info涓烘湇鍔″櫒杩斿洖鐨勫浘鐗囧湴鍧�
- if (type == "mp4" || type == "MP4") {
+ if (type == "mp4" || type == "MP4"|| type == "avi"|| type == "AVI") {
window.jsValue = imgUrl;
quill.insertEmbed(length, "video", imgUrl);
} else {
diff --git a/src/views/knowledge/education/index.vue b/src/views/knowledge/education/index.vue
index 8b17e2c..3be5dc8 100644
--- a/src/views/knowledge/education/index.vue
+++ b/src/views/knowledge/education/index.vue
@@ -824,7 +824,7 @@
// 鎵撳紑缁熻鍥捐〃
statistics() {
//鍙栨暟鎹�
- let obj = { assortid: 13, isavailable: "", pageNum: 1, pageSize: 10 };
+ let obj = { assortid: 13, isavailable: "", pageNum: 1, pageSize: 20 };
getlibrarylist(obj).then((response) => {
console.log(response.rows, "response.rows");
response.rows.forEach((item) => {
diff --git a/src/views/patient/patient/ExternalPatient.vue b/src/views/patient/patient/ExternalPatient.vue
index a4d5e2f..91eee25 100644
--- a/src/views/patient/patient/ExternalPatient.vue
+++ b/src/views/patient/patient/ExternalPatient.vue
@@ -86,7 +86,7 @@
icon="el-icon-upload2"
size="medium"
@click="handleImport"
- v-hasPermi="['system:user:import']"
+
>瀵煎叆</el-button
>
</div>
@@ -97,7 +97,7 @@
icon="el-icon-download"
size="medium"
@click="handleExport"
- v-hasPermi="['system:user:export']"
+
>瀵煎嚭</el-button
>
</div>
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 72eedde..78551f2 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -75,7 +75,6 @@
v-for="(item, index) in checkboxlist"
:key="index"
:label="item.value"
- :disabled="!item.disabled"
>
{{ item.label }}</el-checkbox
>
@@ -1260,7 +1259,6 @@
{
value: "4",
label: "鐭俊",
-
},
{
value: "5",
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 0b1608d..6fbf96d 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -78,7 +78,6 @@
v-for="(item, index) in checkboxlist"
:key="index"
:label="item.value"
- :disabled="!item.disabled"
@change="checkboxChange($event, item.value)"
>
{{ item.label }}</el-checkbox
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index ad530f9..b5624d3 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -24,8 +24,12 @@
<div class="pull-right">{{ user.email }}</div>
</li>
<li class="list-group-item">
- <svg-icon icon-class="tree" />鎵�灞為儴闂�
- <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
+ <svg-icon icon-class="tree" />鎵�灞為櫌鍖�
+ <div class="pull-right" >{{ user.belongWards[0].districtName }}</div>
+ </li>
+ <li class="list-group-item">
+ <svg-icon icon-class="tree" />鎵�灞炵瀹�
+ <div class="pull-right" >{{ user.belongDepts[0].deptName }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />鎵�灞炶鑹�
diff --git a/vue.config.js b/vue.config.js
index 7e0400f..21f5d7c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,10 +38,10 @@
// target: `http://192.168.168.60:8095`,
// target: `http://10.202.20.185:8095`,
// target: `http://192.168.100.184:8095`,
- target:`http://localhost: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