From b5a56d53e44c426fa188ba3e4e1db3eb779e2fd9 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 11 九月 2024 21:49:21 +0800
Subject: [PATCH] 测试完成
---
vue.config.js | 1
src/views/patient/patient/index.vue | 7
src/views/shortmessage/taglibrary/index.vue | 2
src/views/system/user/authRole.vue | 6
src/views/patient/subsequent/index.vue | 6
src/views/monitor/logininfor/index.vue | 2
src/views/monitor/operlog/index.vue | 4
src/views/outsideChainwt.vue | 327 +++++++++++++--------
src/views/system/role/authUser.vue | 4
src/store/getters.js | 2
src/views/monitor/job/log.vue | 2
src/views/patient/physical/index.vue | 6
src/store/modules/user.js | 10
src/views/system/post/index.vue | 2
src/views/patient/patient/hospital.vue | 2
src/views/patient/patient/profile/index.vue | 2
src/views/shortmessage/messagebank/index.vue | 4
src/views/patient/medtechnician/index.vue | 6
src/views/system/dict/index.vue | 4
src/views/followvisit/outpatient/index.vue | 4
src/views/system/config/index.vue | 2
src/views/system/role/index.vue | 4
src/views/patient/patient/physical.vue | 4
src/utils/ruoyi.js | 14
src/views/patient/patient/outpatient.vue | 2
src/views/followvisit/satisfaction/index.vue | 2
src/views/patient/propaganda/QuestionnaireTask.vue | 70 ++++
src/views/patient/patient/PatientChart.vue | 2
src/views/system/menu/index.vue | 4
src/views/system/category/index.vue | 4
src/views/followvisit/record/detailpage/index.vue | 53 +++
src/views/system/dict/data.vue | 4
src/views/system/role/selectUser.vue | 2
src/views/knowledge/education/compilequer/index.vue | 216 ++++++++++---
src/views/followvisit/tasklist/index.vue | 2
src/views/followvisit/tasklist/FollowupDetails/index.vue | 2
src/views/patient/patient/authRole.vue | 6
src/views/complaint/complaintmy/index.vue | 2
src/views/monitor/job/index.vue | 2
src/views/system/dept/index.vue | 2
src/views/monitor/online/index.vue | 2
src/views/patient/questionnaire/index.vue | 6
src/views/followvisit/linem/index.vue | 2
src/views/followvisit/record/index.vue | 4
/dev/null | 0
src/views/system/user/index.vue | 53 +++
src/views/repositoryai/matching/index.vue | 2
src/views/complaint/complaintlist/index.vue | 6
src/views/followvisit/discharge/index.vue | 6
49 files changed, 626 insertions(+), 257 deletions(-)
diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index 223041f..0000000
--- a/dist.zip
+++ /dev/null
Binary files differ
diff --git a/src/store/getters.js b/src/store/getters.js
index e5dec5e..59e79d5 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -11,6 +11,8 @@
introduction: (state) => state.user.introduction,
roles: (state) => state.user.roles,
permissions: (state) => state.user.permissions,
+ leavehospitaldistrictcodes: (state) => state.user.leavehospitaldistrictcodes,
+ leaveldeptcodes: (state) => state.user.leaveldeptcodes,
permission_routes: (state) => state.permission.routes,
topbarRouters: (state) => state.permission.topbarRouters,
defaultRoutes: (state) => state.permission.defaultRoutes,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 09507cf..4b800bf 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -6,6 +6,8 @@
token: getToken(),
name: '',
avatar: '',
+ leavehospitaldistrictcodes:[],
+ leaveldeptcodes:[],
roles: [],
permissions: [],
// 鏈嶅姟绫诲瀷
@@ -94,6 +96,12 @@
},
SET_Serviceauthority: (state, Serviceauthority) => {
state.Serviceauthority = Serviceauthority
+ },
+ SET_leavehospitaldistrictcodes: (state, leavehospitaldistrictcodes) => {
+ state.leavehospitaldistrictcodes = leavehospitaldistrictcodes
+ },
+ SET_leaveldeptcodes: (state, leaveldeptcodes) => {
+ state.leaveldeptcodes = leaveldeptcodes
}
},
@@ -128,6 +136,8 @@
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.userName)
+ commit('SET_leavehospitaldistrictcodes', user.leavehospitaldistrictcodes)
+ commit('SET_leaveldeptcodes', user.leaveldeptcodes)
commit('SET_AVATAR', avatar)
resolve(res)
}).catch(error => {
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index b42d95d..601e46c 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -49,6 +49,20 @@
});
return time_str;
}
+// 鍑洪櫌/鍏ラ櫌澶╂暟璁＄畻
+export function Daycount(dateString1, dateString2){
+// 灏嗘棩鏈熷瓧绗︿覆杞崲涓烘棩鏈熷璞�
+var date1 = new Date(dateString1);
+var date2 = new Date(dateString2);
+
+// 璁＄畻鏃堕棿宸紙姣锛�
+var timeDifference = date2 - date1;
+
+// 灏嗘椂闂村樊杞崲涓哄ぉ鏁�
+var daysDifference = Math.ceil(timeDifference / (1000 * 3600 * 24));
+
+return daysDifference;
+}
// 杩囨护鍣�
export function formatTime(val) {
if (val) {
diff --git a/src/views/complaint/complaintlist/index.vue b/src/views/complaint/complaintlist/index.vue
index a1c32bd..51c79d3 100644
--- a/src/views/complaint/complaintlist/index.vue
+++ b/src/views/complaint/complaintlist/index.vue
@@ -204,7 +204,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -214,7 +214,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -224,7 +224,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/complaint/complaintmy/index.vue b/src/views/complaint/complaintmy/index.vue
index 0dc4681..1bffc24 100644
--- a/src/views/complaint/complaintmy/index.vue
+++ b/src/views/complaint/complaintmy/index.vue
@@ -172,7 +172,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 3d30a2e..a8d9bf0 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -242,7 +242,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.admindate) }}</span>
+ <span>{{ formatTime(scope.row.admindate) }}</span>
</template>
</el-table-column>
<!-- <el-table-column
@@ -254,7 +254,7 @@
>
<template slot-scope="scope">
<span v-if="scope.row.sendType != 3">{{
- parseTime(scope.row.createTime)
+ formatTime(scope.row.createTime)
}}</span>
<span v-else>鍗冲埢鍙戦��</span>
</template>
@@ -267,7 +267,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.finishtime) }}</span>
+ <span>{{ formatTime(scope.row.finishtime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/followvisit/linem/index.vue b/src/views/followvisit/linem/index.vue
index a21e535..a73719a 100644
--- a/src/views/followvisit/linem/index.vue
+++ b/src/views/followvisit/linem/index.vue
@@ -111,7 +111,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/followvisit/outpatient/index.vue b/src/views/followvisit/outpatient/index.vue
index ed8f323..45c29f5 100644
--- a/src/views/followvisit/outpatient/index.vue
+++ b/src/views/followvisit/outpatient/index.vue
@@ -245,7 +245,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.admindate) }}</span>
+ <span>{{ formatTime(scope.row.admindate) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -256,7 +256,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.finishtime) }}</span>
+ <span>{{ formatTime(scope.row.finishtime) }}</span>
</template>
</el-table-column>
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 15292dd..8837754 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -4,7 +4,22 @@
<div class="Followuserinfo">
<div>
<div class="userinfo-text">
- {{ sendname }}<span>鎮ｈ�呮湇鍔¤鎯�</span>
+ <!-- <span>鎮ｈ�呮湇鍔¤鎯�</span> -->
+ <div class="headline">
+ <div>鎮ｈ�呮湇鍔¤鎯�</div>
+ <div style="margin-left: 20px">
+ <el-button
+ v-if="!Whetherall"
+ type="primary"
+ @click="getTaskservelist()"
+ >鏌ョ湅鎮ｈ�呭叏閮ㄦ湇鍔�</el-button>
+ <el-button
+ v-else
+ type="success"
+ @click="getTaskservelist(taskid)"
+ >鏌ョ湅鎮ｈ�呮湰娆℃湇鍔′俊鎭�</el-button>
+ </div>
+ </div>
<!-- <el-button type="success">闅忚鍚庣煭淇�</el-button> -->
</div>
</div>
@@ -46,7 +61,7 @@
width="210"
>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="鎿嶄綔"
fixed="right"
align="center"
@@ -64,7 +79,7 @@
></el-button
>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</div>
</div>
@@ -203,6 +218,7 @@
radio: "2",
taskname: "",
tableDatatop: [], //棰樼洰琛�
+ Whetherall:false, //鏄惁鍏ㄩ儴璁板綍灞曠ず
logsheetlist: [],
sendname: null,
serviceType: null,
@@ -217,7 +233,7 @@
this.patid = this.$route.query.patid;
this.serviceType = this.$route.query.serviceType;
this.getsearchrResults();
- this.getTaskservelist();
+ this.getTaskservelist(this.taskid);
},
methods: {
@@ -241,16 +257,27 @@
});
},
// 鑾峰彇鎮ｈ�呰褰�
- getTaskservelist() {
+ getTaskservelist(taskid) {
+ if (taskid) {
+ this.Whetherall=false;
+ }else{
+ this.Whetherall=true;
+ }
getTaskservelist({
patid: this.patid,
+ taskid: taskid,
}).then((res) => {
if (res.code == 200) {
this.logsheetlist = res.rows;
}
});
},
- Seedetails() {},
+ Seedetails(row) {
+ this.$modal.confirm('鏄惁鏌ョ湅浠诲姟涓�"' + optionids + '"鐨勬湇鍔￠」锛�').then(function () {
+ }).then(() => {
+ this.getList();
+ }).catch(() => { });
+ },
},
};
</script>
@@ -331,6 +358,20 @@
}
}
}
+.headline {
+ font-size: 24px;
+ height: 40px;
+ border-left: 5px solid #41a1be;
+ padding-left: 5px;
+ margin-bottom: 10px;
+ display: flex;
+ // justify-content: space-between;
+ .Add-details {
+ font-size: 18px;
+ color: #02a7f0;
+ cursor: pointer;
+ }
+ }
::v-deep.offside-value .el-radio__label {
color: #fff;
}
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index cd65bf0..f965cb6 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -201,7 +201,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.admindate) }}</span>
+ <span>{{ formatTime(scope.row.admindate) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -212,7 +212,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.finishtime) }}</span>
+ <span>{{ formatTime(scope.row.finishtime) }}</span>
</template>
</el-table-column>
diff --git a/src/views/followvisit/satisfaction/index.vue b/src/views/followvisit/satisfaction/index.vue
index 465309e..73901fb 100644
--- a/src/views/followvisit/satisfaction/index.vue
+++ b/src/views/followvisit/satisfaction/index.vue
@@ -241,7 +241,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/followvisit/tasklist/FollowupDetails/index.vue b/src/views/followvisit/tasklist/FollowupDetails/index.vue
index 4a9248b..49c199d 100644
--- a/src/views/followvisit/tasklist/FollowupDetails/index.vue
+++ b/src/views/followvisit/tasklist/FollowupDetails/index.vue
@@ -301,7 +301,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index e1e59cb..8435edd 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -170,7 +170,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/knowledge/education/compilequer/index.vue b/src/views/knowledge/education/compilequer/index.vue
index c605e6e..df401b1 100644
--- a/src/views/knowledge/education/compilequer/index.vue
+++ b/src/views/knowledge/education/compilequer/index.vue
@@ -255,7 +255,9 @@
<!-- 瀹ｆ暀鍐呭 -->
<div v-if="Editprogress == 2">
<el-row :gutter="20">
- <el-col :span="4"><div class="leftvlue-jbxx">瀹ｆ暀鍐呭</div></el-col>
+ <el-col :span="4">
+ <div class="leftvlue-jbxx">瀹ｆ暀鍐呭</div>
+ </el-col>
</el-row>
<div>
@@ -266,7 +268,7 @@
label-width="100px"
class="demo-ruleForm"
>
- <el-row gutter="20">
+ <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="璧勬枡褰㈠紡" prop="region">
<el-select
@@ -299,8 +301,8 @@
<el-button type="info" @click="closeFm('ruleForm')"
>鍏抽棴</el-button
>
- </div></el-col
- >
+ </div>
+ </el-col>
</el-row>
</el-form>
</div>
@@ -429,7 +431,7 @@
url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
},
],
- content: "", //鏈�缁堜繚瀛樼殑鍐呭
+ content: `<p>娴嬭瘯</p><video class="ql-video" controls="controls" controlslist="nofullscreen" type="video/mp4" style="object-fit:fill;width: 100%;" preload="auto" playsinline="true" x-webkit-airplay="allow" x5-video-orientation="portraint" x5-playsinline="true" x5-video-player-fullscreen="true" src="http://218.108.11.22:8093/profile-api/upload/vadio/钀ュ吇娉垫搷浣滆鑼�.mp4"></video><video class="ql-video" controls="controls" controlslist="nofullscreen" type="video/mp4" style="object-fit:fill;width: 100%;" preload="auto" playsinline="true" x-webkit-airplay="allow" x5-video-orientation="portraint" x5-playsinline="true" x5-video-player-fullscreen="true" src="http://218.108.11.22:8093/profile-api/upload/vadio/娉ㄥ皠鍣ㄦ帹娉�.mp4"></video><p>321</p>"`, //鏈�缁堜繚瀛樼殑鍐呭
fileName: "", //鏂囦欢鍚�
dynamicTags: [],
inputVisible: false,
@@ -508,6 +510,13 @@
deptList: [],
tempDetpRelevanceslist: [],
props: { multiple: true, value: "deptId", label: "deptName" },
+ // 鍐呯綉鐨勯儴鍒嗭紙鏂囦欢锛�
+ oldPattern: "http://192.168.191.181:8095/profile/upload",
+ // 鍐呯綉鐨勯儴鍒嗭紙鏂囦欢锛�
+ oldPatternhtml: "/http:\/\/192\.168\.191\.181:8095\/profile\/upload\//g",
+ // 澶栫綉閮ㄥ垎锛堟枃浠讹級
+ newPattern: "http://218.108.11.22:8093/profile-api/upload",
+
xjxsoptions: [
{
value: "1",
@@ -581,11 +590,14 @@
if (this.id) {
getlibraryinfo({ id: this.id }).then((res) => {
this.ruleForm = res.data[0];
- this.ruleForm.campus = this.ruleForm.campus.split(",");
+ if (this.ruleForm.campus)
+ this.ruleForm.campus = this.ruleForm.campus.split(",");
this.dynamicTags = res.data[0].heLibraryTagList.map(
this.processElement
);
- this.Getmissioncontent(this.ruleForm.htmlRichText);
+ if (this.ruleForm.htmlRichText) {
+ this.Getmissioncontent(this.ruleForm.htmlRichText);
+ }
if (this.ruleForm.deptNames) {
this.tempDetpRelevanceslist = JSON.parse(this.ruleForm.deptNames);
}
@@ -606,15 +618,51 @@
listDept(this.queryParams).then((response) => {
this.deptList = this.handleTree(response.data, "deptId");
});
- this.loading = false;
- },
+ // ------------------
+
+ // let html =
+ // '<p>娴嬭瘯</p><video class="ql-video" controls="controls" controlslist="nofullscreen" type="video/mp4" style="object-fit:fill;width: 100%;" preload="auto" playsinline="true" x-webkit-airplay="allow" x5-video-orientation="portraint" x5-playsinline="true" x5-video-player-fullscreen="true" src="http://192.168.191.181:8095/profile/upload/vadio/钀ュ吇娉典粙缁�.mp4"></video><p>娴嬭瘯111</p><video class="ql-video" controls="controls" controlslist="nofullscreen" type="video/mp4" style="object-fit:fill;width: 100%;" preload="auto" playsinline="true" x-webkit-airplay="allow" x5-video-orientation="portraint" x5-playsinline="true" x5-video-player-fullscreen="true" src="http://192.168.191.181:8095/profile/upload/vadio/娉ㄥ皠鍣ㄦ帹娉�.mp4"></video><p><br></p>';
+ // // html = html.parserdom(this.oldPattern, this.newPattern);
+ // html = this.parserdom(html);
+ // console.log(html, "html");
+
+ // this.loading = false;
+ },
+ // parser
+ parserdom(html) {
+ // 鍒涘缓涓�涓柊鐨凞OM瑙ｆ瀽鍣�
+ var parser = new DOMParser();
+ // 灏嗗瓧绗︿覆瑙ｆ瀽涓烘枃妗ｅ璞�
+ var doc = parser.parseFromString(html, "text/html");
+
+ // 瀹氫箟瑕佹浛鎹㈢殑鏂版棫URL
+ var oldUrlBase = "http://192.168.191.181:8095/profile/upload";
+ var newUrlBase = "http://218.108.11.22:8093/profile-api/upload";
+
+ // 鑾峰彇鎵�鏈夌殑video鍏冪礌
+ var videos = doc.querySelectorAll("video");
+
+ // 閬嶅巻鎵�鏈夌殑video鍏冪礌骞舵浛鎹rc灞炴��
+ videos.forEach(function (video) {
+ var src = video.getAttribute("src");
+ if (src.startsWith(oldUrlBase)) {
+ video.setAttribute("src", src.replace(oldUrlBase, newUrlBase));
+ }
+ });
+
+ // 灏嗕慨鏀瑰悗鐨勬枃妗ｈ浆鎹㈠洖瀛楃涓�
+ var newContent = doc.body.innerHTML;
+ return newContent;
+ },
submitForm(formName) {
let tgs = [];
this.dynamicTags.forEach((item) => {
tgs.push(item.tagname);
});
- this.ruleForm.campus = this.ruleForm.campus.join(",");
+ if (this.ruleForm.campus) {
+ this.ruleForm.campus = this.ruleForm.campus.join(",");
+ }
this.ruleForm.labelInfo = tgs.length != 0 ? tgs.join(", ") : "";
this.ruleForm.otherdata = JSON.stringify(this.variablelist);
this.ruleForm.hetype = 1;
@@ -623,54 +671,59 @@
this.ruleForm.suitway.length != 0
? this.ruleForm.suitway.join(",")
: "";
+
addrichText({
- content: this.content,
+ content: this.parserdom(this.content),
fileName: this.generateRandomHtmlFilename(),
}).then((res) => {
this.ruleForm.richText = res.msg;
- this.ruleForm.htmlRichText = this.replaceIpAndPort(res.msg);
- this.ruleForm.htmlRichText = this.removePathSegment(this.ruleForm.htmlRichText,'prod-api');
- console.log(this.ruleForm.htmlRichText,'this.ruleForm.htmlRichText');
+ console.log(this.ruleForm.richText, "this.ruleForm.richText");
+ // 澶勭悊鍐呯綉html
+ addrichText({
+ // content: this.content,
+ fileName: this.generateRandomHtmlFilename(),
+ }).then((resf) => {
+ this.ruleForm.htmlRichText = resf.msg.replace(
+ this.newPattern,
+ this.oldPattern
+ );
+ console.log(this.ruleForm.htmlRichText, "this.ruleForm.htmlRichText");
- if (this.id) {
- this.ruleForm.isoperation = 2;
- compilelibrary(this.ruleForm).then((res) => {
- this.$modal.msgSuccess("缂栬緫鎴愬姛");
- this.confirmillness();
- this.$router.go(-1);
- });
- } else {
- this.ruleForm.isoperation = 1;
- compilelibrary(this.ruleForm).then((res) => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.confirmillness(res.data);
- this.$router.go(-1);
- });
- }
+ if (this.id) {
+ this.ruleForm.isoperation = 2;
+ compilelibrary(this.ruleForm).then((res) => {
+ if (res.code == 200) {
+ this.$modal.msgSuccess("缂栬緫鎴愬姛");
+ this.confirmillness();
+ this.$router.go(-1);
+ }
+ });
+ } else {
+ this.ruleForm.isoperation = 1;
+ compilelibrary(this.ruleForm).then((res) => {
+ if (res.code == 200) {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.confirmillness(res.data);
+ this.$router.go(-1);
+ }
+ });
+ }
+ });
});
},
- replaceIpAndPort(path) {
- // 姝ｅ垯琛ㄨ揪寮忓尮閰岻P鍦板潃鍜岀鍙�
- const ipPortRegex = /(\b(?:\d{1,3}\.){3}\d{1,3}(?::\d+)?)/;
- // 鏇挎崲涓烘寚瀹氱殑IP鍦板潃鍜岀鍙�
- return path.replace(ipPortRegex, "192.168.191.181:8095");
- },
- removePathSegment(url, segment) {
- // 浣跨敤姝ｅ垯琛ㄨ揪寮忓叏灞�鍖归厤骞舵浛鎹㈡帀鎸囧畾鐨勮矾寰勬
- return url.replace(new RegExp('/' + segment + '/?', 'g'), '/');
-},
+
generateRandomHtmlFilename() {
- // 鐢熸垚涓�涓�0鍒�1涔嬮棿鐨勯殢鏈烘暟锛屽苟灏嗗叾杞崲涓哄瓧绗︿覆
- let randomNumber = Math.random().toString();
- // 绉婚櫎鍓嶉潰鐨�0鍜屽皬鏁扮偣
- randomNumber = randomNumber.substring(6);
- // 纭繚鐢熸垚鐨勯殢鏈烘暟鏄竴瀹氶暱搴︾殑锛屼緥濡�8浣�
- while (randomNumber.length < 8) {
- randomNumber = '0' + randomNumber;
- }
- // 鎷兼帴涓�.html鍚庣紑
- return randomNumber + '.html';
-},
+ // 鐢熸垚涓�涓�0鍒�1涔嬮棿鐨勯殢鏈烘暟锛屽苟灏嗗叾杞崲涓哄瓧绗︿覆
+ let randomNumber = Math.random().toString();
+ // 绉婚櫎鍓嶉潰鐨�0鍜屽皬鏁扮偣
+ randomNumber = randomNumber.substring(6);
+ // 纭繚鐢熸垚鐨勯殢鏈烘暟鏄竴瀹氶暱搴︾殑锛屼緥濡�8浣�
+ while (randomNumber.length < 8) {
+ randomNumber = "0" + randomNumber;
+ }
+ // 鎷兼帴涓�.html鍚庣紑
+ return randomNumber + ".html";
+ },
// 淇濆瓨鐤剧梾
confirmillness(guid) {
@@ -877,7 +930,11 @@
console.log("涓婁紶鎴愬姛");
//鎷兼帴鍑轰笂浼犵殑鍥剧墖鍦ㄦ湇鍔″櫒鐨勫畬鏁村湴鍧�
let imgUrl = res.url;
- imgUrl=this.replaceIpAndPort(imgUrl)
+ console.log(res.url);
+
+ imgUrl = imgUrl.replace(this.newPattern, this.oldPattern);
+ console.log(imgUrl, "imgUrl");
+
let type = imgUrl.substring(imgUrl.lastIndexOf(".") + 1);
this.fileName = this.getFileNameFromPath(res.url);
@@ -941,17 +998,18 @@
console.log(res);
console.log(file);
},
- // 涓婁紶鍥剧墖鎴愬姛
+ // 涓婁紶word鎴愬姛
uploadEditorSuccessword(res, file) {
- console.log("涓婁紶鎴愬姛");
- const data = null;
+ console.log("涓婁紶word鏂囦欢鎴愬姛");
console.log(res, file, "word");
+ let fileurl = res.url.replace(this.newPattern, this.oldPattern);
axios
- .get(res.url)
+ .get(fileurl)
.then((response) => {
console.log(response.data, "鏁版嵁"); // 杈撳嚭鑾峰彇鍒扮殑鏂囦欢鍐呭
- this.content = response.data;
- this.texturl = res.url;
+ this.$nextTick(() => {
+ this.content = response.data;
+ });
this.fileName = this.getFileNameFromPath(response.url);
console.log(this.fileName, "this.fileName");
})
@@ -972,6 +1030,7 @@
console.error("Failed to fetch file:", error);
});
},
+ // 澶勭悊url
},
};
</script>
@@ -980,6 +1039,7 @@
.Questionnairemanagement {
// display: flex;
}
+
.sidecolumn {
// width: 300px;
// min-height: 100vh;
@@ -994,6 +1054,7 @@
-webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
0 0 6px 0 rgba(0, 0, 0, 0.04);
}
+
.leftvlue {
// display: flex;
// flex: 1;
@@ -1003,20 +1064,25 @@
border: 1px solid #dcdfe6;
-webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
0 0 6px 0 rgba(0, 0, 0, 0.04);
+
.mulsz {
font-size: 20px;
}
+
.leftvlue-jbxx {
margin-bottom: 50px;
font-size: 20px;
+
span {
position: absolute;
right: 80px;
}
}
+
.demo-cascader {
margin-right: 20px;
}
+
.PreviewTemplate {
color: #02a7f0;
cursor: pointer;
@@ -1024,6 +1090,7 @@
margin: 0 20px;
}
}
+
.xinz-inf {
font-size: 18px;
white-space: nowrap;
@@ -1035,6 +1102,7 @@
.el-tag + .el-tag {
margin-left: 10px;
}
+
.button-new-tag {
margin-left: 10px;
height: 32px;
@@ -1042,12 +1110,14 @@
padding-top: 0;
padding-bottom: 0;
}
+
.input-new-tag {
width: 90px;
margin-left: 10px;
vertical-align: bottom;
}
}
+
.preview-left {
margin: 20px;
// margin: 20px;
@@ -1056,41 +1126,51 @@
border: 1px solid #dcdfe6;
-webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
0 0 6px 0 rgba(0, 0, 0, 0.04);
+
.topic-dev {
margin-bottom: 25px;
font-size: 20px !important;
+
.dev-text {
margin-bottom: 10px;
}
}
}
+
.addtopic {
margin-top: 30px;
}
+
.presentation {
margin: 20px 0;
display: flex;
+
.presentation-left {
width: 50%;
height: 500px;
+
.button-textxg {
color: #024df0;
}
+
.button-textsc {
color: #f52727;
}
}
+
.presentation-right {
width: 50%;
height: 500px;
padding: 20px;
font-size: 18px;
border: 1px solid #909091;
+
span {
padding: 0 35px;
margin-right: 10px;
border-bottom: 1px solid #909091;
}
+
.headline {
font-size: 20px;
border-left: 3px solid #41a1be;
@@ -1099,6 +1179,7 @@
}
}
}
+
::v-deep .addtopic-input {
input {
background: #02a7f0;
@@ -1106,25 +1187,31 @@
width: 150px;
}
}
+
::v-deep.el-step.is-vertical .el-step__title {
font-size: 25px;
}
+
::v-deep.el-input--medium {
font-size: 18px !important;
}
+
::v-deep.ruleFormaa.el-select {
display: inline-block;
position: relative;
width: 700px;
}
+
.el-select__tags {
font-size: 20px;
max-width: 888px !important;
}
+
::v-deep.el-radio__inner {
width: 22px;
height: 22px;
}
+
// ::v-deep.topic-dev.el-radio__label {
// font-size: 24px;
// }
@@ -1133,19 +1220,23 @@
font-size: 24px;
}
}
+
::v-deep.el-checkbox-group {
span {
font-size: 24px;
}
}
+
.editor {
line-height: normal !important;
height: 600px;
margin-bottom: 80px;
}
+
.ql-snow .ql-tooltip[data-mode="link"]::before {
content: "璇疯緭鍏ラ摼鎺ュ湴鍧�:";
}
+
.ql-snow .ql-tooltip.ql-editing a.ql-action::after {
border-right: 0px;
content: "淇濆瓨";
@@ -1160,14 +1251,17 @@
.ql-snow .ql-picker.ql-size .ql-picker-item::before {
content: "14px";
}
+
.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="small"]::before,
.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="small"]::before {
content: "10px";
}
+
.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="large"]::before,
.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="large"]::before {
content: "18px";
}
+
.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="huge"]::before,
.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="huge"]::before {
content: "32px";
@@ -1177,26 +1271,32 @@
.ql-snow .ql-picker.ql-header .ql-picker-item::before {
content: "鏂囨湰";
}
+
.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
content: "鏍囬1";
}
+
.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
content: "鏍囬2";
}
+
.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
content: "鏍囬3";
}
+
.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
content: "鏍囬4";
}
+
.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
content: "鏍囬5";
}
+
.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
content: "鏍囬6";
@@ -1206,10 +1306,12 @@
.ql-snow .ql-picker.ql-font .ql-picker-item::before {
content: "鏍囧噯瀛椾綋";
}
+
.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="serif"]::before,
.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="serif"]::before {
content: "琛嚎瀛椾綋";
}
+
.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="monospace"]::before,
.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
content: "绛夊瀛椾綋";
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index e5f808d..31108b5 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -256,7 +256,7 @@
<el-form-item label="cron琛ㄨ揪寮忥細">{{ form.cronExpression }}</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="涓嬫鎵ц鏃堕棿锛�">{{ parseTime(form.nextValidTime) }}</el-form-item>
+ <el-form-item label="涓嬫鎵ц鏃堕棿锛�">{{ formatTime(form.nextValidTime) }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="璋冪敤鐩爣鏂规硶锛�">{{ form.invokeTarget }}</el-form-item>
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index 60bee1d..a4d99e9 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -119,7 +119,7 @@
</el-table-column>
<el-table-column label="鎵ц鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 8a9b17a..b32f92a 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -113,7 +113,7 @@
<el-table-column label="鎿嶄綔淇℃伅" align="center" prop="msg" />
<el-table-column label="鐧诲綍鏃ユ湡" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.loginTime) }}</span>
+ <span>{{ formatTime(scope.row.loginTime) }}</span>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index ad613c9..e52b7bd 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -42,7 +42,7 @@
<el-table-column label="鎿嶄綔绯荤粺" align="center" prop="os" />
<el-table-column label="鐧诲綍鏃堕棿" align="center" prop="loginTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.loginTime) }}</span>
+ <span>{{ formatTime(scope.row.loginTime) }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index c1b5377..0fc0ab3 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -121,7 +121,7 @@
</el-table-column>
<el-table-column label="鎿嶄綔鏃ユ湡" align="center" prop="operTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.operTime) }}</span>
+ <span>{{ formatTime(scope.row.operTime) }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -175,7 +175,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎿嶄綔鏃堕棿锛�">{{ parseTime(form.operTime) }}</el-form-item>
+ <el-form-item label="鎿嶄綔鏃堕棿锛�">{{ formatTime(form.operTime) }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="寮傚父淇℃伅锛�" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
diff --git a/src/views/outsideChainwt.vue b/src/views/outsideChainwt.vue
index fca9f11..56d0f30 100644
--- a/src/views/outsideChainwt.vue
+++ b/src/views/outsideChainwt.vue
@@ -4,8 +4,13 @@
<div class="preview-left">
<div class="toptitle">
<div class="title">{{ taskname ? taskname : "闂嵎" }}</div>
- <div style="font-size: 22px; margin-bottom: 20px; line-height: 1.5;">
- {{ kcb }}
+ <div style="font-size: 22px; margin-bottom: 20px; line-height: 1.5">
+ {{
+ kcb
+ ? kcb
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
+ }}
+ <!-- 浜茬埍鐨勬偅鑰�/瀹跺睘鎮ㄥソ锛屼负浜嗘洿濂界殑浜嗚В鎮ㄥ嚭闄㈠悗鐨勫悍澶嶆儏鍐碉紝缁欐偍閫傚綋鍙婃椂鐨勫仴搴锋寚瀵硷紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤鍑洪櫌闅忚闂嵎璋冩煡銆� -->
</div>
</div>
<el-divider></el-divider>
@@ -17,21 +22,21 @@
>
<div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 1">
<div class="dev-text">
- {{ index + 1 }}銆�<span>{{ item.scriptContent }} <span style="color: #3BA2F7;">[鍗曢�塢</span></span>
+ {{ index + 1 }}銆�<span style="line-height: 1.5"
+ >{{ item.scriptContent }}
+ <span style="color: #3ba2f7">[鍗曢�塢</span></span
+ >
</div>
<div class="dev-xx">
<el-radio-group
- class="radio-group"
+ class="custom-radio"
v-model="item.scriptResult"
@change="handleOptionChange($event, index, item)"
>
<el-radio
- :class="{
- 'radio-option': true,
- 'radio-option-first': index === 0,
- }"
border
v-for="(items, index) in item.svyLibTemplateTargetoptions"
+ :class="items.isabnormal ? 'red-star' : ''"
:key="index"
:label="items.optioncontent"
>{{ items.optioncontent }}</el-radio
@@ -45,22 +50,22 @@
<!-- 澶氶�� -->
<div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 2">
<div class="dev-text">
- {{ index + 1 }}銆�<span>{{ item.scriptContent }} <span style="color: #3BA2F7;">[澶氶�塢</span></span>
+ {{ index + 1 }}銆�<span style="line-height: 1.5"
+ >{{ item.scriptContent }}
+ <span style="color: #3ba2f7">[澶氶�塢</span></span
+ >
</div>
<div class="dev-xx">
<el-checkbox-group
- class="radio-group"
+ class="custom-radio"
v-model="item.scriptResult"
@change="updateScore($event, index, item)"
>
<el-checkbox
- :class="{
- 'radio-option': true,
- 'radio-option-first': index === 0,
- }"
border
@change="$forceUpdate()"
v-for="(items, indexs) in item.svyLibTemplateTargetoptions"
+ :class="items.isabnormal ? 'red-star' : ''"
:key="indexs"
:label="items.optioncontent"
>
@@ -75,12 +80,15 @@
<!-- 濉┖ -->
<div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 4">
<div class="dev-text">
- {{ index + 1 }}銆�<span>{{ item.scriptContent }}<span style="color: #3BA2F7;">[闂瓟]</span></span>
+ {{ index + 1 }}銆�<span style="line-height: 1.5"
+ >{{ item.scriptContent
+ }}<span style="color: #3ba2f7">[闂瓟]</span></span
+ >
</div>
<div class="dev-xx">
<el-input
type="textarea"
- :rows="2"
+ :rows="3"
placeholder="璇疯緭鍏ョ瓟妗�"
v-model="item.scriptResult"
clearable
@@ -90,14 +98,21 @@
</div>
</div>
<div class="bottom-fixed">
- <el-button type="primary" style="width: 100%;" @click="cache(true)">鎻愪氦闂嵎</el-button>
+ <el-button
+ type="primary"
+ style="width: 80%; font-size: 20px"
+ @click="cache(true)"
+ >鎻愪氦闂嵎</el-button
+ >
</div>
</div>
</div>
<div class="CONTENT" v-else>
- <div class="preview-left" style="margin-top: 100px">
+ <div class="preview-lefts">
<div
style="
+ text-align: center;
+ padding-top: 50px;
font-size: 24px;
color: #175997;
font-weight: 600;
@@ -106,7 +121,13 @@
>
鎰熻阿鎮ㄧ殑閰嶅悎!
</div>
- <div style="font-size: 20px">{{ revisitAfter }}</div>
+ <div style="font-size: 20px">
+ {{
+ jsy
+ ? jsy
+ : "鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒"
+ }}
+ </div>
</div>
</div>
<!-- <el-dialog
@@ -114,7 +135,7 @@
width="50%"
>
<div>
- <el-alert :title="revisitAfter" type="success"> </el-alert>
+ <el-alert :title="jsy" type="success"> </el-alert>
</div>
</el-dialog> -->
</div>
@@ -133,95 +154,95 @@
return {
taskid: 355,
patid: 265823,
- kcb:'',
+ kcb: "",
questionList: [
- // {
- // scriptType: 1,
- // scriptContent: "鎮ㄧ殑骞撮緞鑼冨洿鏄紵",
- // scriptResult: null,
- // svyLibTemplateTargetoptions: [
- // { optioncontent: "18-25", value: "18-25" },
- // { optioncontent: "26-35", value: "26-35" },
- // { optioncontent: "36-45", value: "36-45" },
- // { optioncontent: "46-55", value: "46-55" },
- // { optioncontent: "56+", value: "56+" },
- // ],
- // required: true,
- // },
- // {
- // scriptType: 1,
- // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
- // scriptResult: null,
- // svyLibTemplateTargetoptions: [
- // { optioncontent: "瀛︾敓", value: "student" },
- // { optioncontent: "鏁欏笀", value: "teacher" },
- // { optioncontent: "宸ョ▼甯�", value: "engineer" },
- // { optioncontent: "鍖荤敓", value: "doctor" },
- // { optioncontent: "鍏朵粬", value: "other" },
- // ],
- // required: false,
- // },
- // {
- // scriptType: 2,
- // scriptContent: "鎮ㄦ劅鍏磋叮鐨勬椿鍔ㄦ湁鍝簺锛�",
- // scriptResult: [],
- // svyLibTemplateTargetoptions: [
- // { optioncontent: "鏃呮父", value: "travel" },
- // { optioncontent: "闃呰", value: "reading" },
- // { optioncontent: "杩愬姩", value: "sports" },
- // { optioncontent: "闊充箰", value: "music" },
- // { optioncontent: "鐢靛奖", value: "movies" },
- // ],
- // required: false,
- // },
- // {
- // scriptType: 1,
- // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
- // scriptResult: null,
- // svyLibTemplateTargetoptions: [
- // { optioncontent: "瀛︾敓", value: "student" },
- // { optioncontent: "鏁欏笀", value: "teacher" },
- // { optioncontent: "宸ョ▼甯�", value: "engineer" },
- // { optioncontent: "鍖荤敓", value: "doctor" },
- // { optioncontent: "鍏朵粬", value: "other" },
- // ],
- // required: false,
- // },
- // {
- // scriptType: 1,
- // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
- // scriptResult: null,
- // svyLibTemplateTargetoptions: [
- // { optioncontent: "瀛︾敓", value: "student" },
- // { optioncontent: "鏁欏笀", value: "teacher" },
- // { optioncontent: "宸ョ▼甯�", value: "engineer" },
- // { optioncontent: "鍖荤敓", value: "doctor" },
- // { optioncontent: "鍏朵粬", value: "other" },
- // ],
- // required: false,
- // },
- // {
- // scriptType: 1,
- // scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
- // scriptResult: null,
- // svyLibTemplateTargetoptions: [
- // { optioncontent: "瀛︾敓", value: "student" },
- // { optioncontent: "鏁欏笀", value: "teacher" },
- // { optioncontent: "宸ョ▼甯�", value: "engineer" },
- // { optioncontent: "鍖荤敓", value: "doctor" },
- // { optioncontent: "鍏朵粬", value: "other" },
- // ],
- // required: false,
- // },
- // {
- // scriptType: 4,
- // scriptContent: "鎮ㄧ殑濮撳悕鏄粈涔堬紵",
- // scriptResult: "name",
- // required: true,
- // scriptResult: null,
- // },
+ {
+ scriptType: 1,
+ scriptContent: "鎮ㄧ殑骞撮緞鑼冨洿鏄紵",
+ scriptResult: null,
+ svyLibTemplateTargetoptions: [
+ { optioncontent: "18-25", value: "18-25", isabnormal: true },
+ { optioncontent: "26-35", value: "26-35" },
+ { optioncontent: "36-45", value: "36-45" },
+ { optioncontent: "46-55", value: "46-55" },
+ { optioncontent: "56+", value: "56+" },
+ ],
+ required: true,
+ },
+ {
+ scriptType: 1,
+ scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
+ scriptResult: null,
+ svyLibTemplateTargetoptions: [
+ { optioncontent: "瀛︾敓", value: "student" },
+ { optioncontent: "鏁欏笀", value: "teacher" },
+ { optioncontent: "宸ョ▼甯�", value: "engineer" },
+ { optioncontent: "鍖荤敓", value: "doctor" },
+ { optioncontent: "鍏朵粬", value: "other" },
+ ],
+ required: false,
+ },
+ {
+ scriptType: 2,
+ scriptContent: "鎮ㄦ劅鍏磋叮鐨勬椿鍔ㄦ湁鍝簺锛�",
+ scriptResult: [],
+ svyLibTemplateTargetoptions: [
+ { optioncontent: "鏃呮父", value: "travel", isabnormal: true },
+ { optioncontent: "闃呰", value: "reading", isabnormal: true },
+ { optioncontent: "杩愬姩", value: "sports", isabnormal: true },
+ { optioncontent: "闊充箰", value: "music" },
+ { optioncontent: "鐢靛奖", value: "movies" },
+ ],
+ required: false,
+ },
+ {
+ scriptType: 1,
+ scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
+ scriptResult: null,
+ svyLibTemplateTargetoptions: [
+ { optioncontent: "瀛︾敓", value: "student" },
+ { optioncontent: "鏁欏笀", value: "teacher" },
+ { optioncontent: "宸ョ▼甯�", value: "engineer" },
+ { optioncontent: "鍖荤敓", value: "doctor" },
+ { optioncontent: "鍏朵粬", value: "other" },
+ ],
+ required: false,
+ },
+ {
+ scriptType: 1,
+ scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
+ scriptResult: null,
+ svyLibTemplateTargetoptions: [
+ { optioncontent: "瀛︾敓", value: "student" },
+ { optioncontent: "鏁欏笀", value: "teacher" },
+ { optioncontent: "宸ョ▼甯�", value: "engineer", isabnormal: true },
+ { optioncontent: "鍖荤敓", value: "doctor" },
+ { optioncontent: "鍏朵粬", value: "other" },
+ ],
+ required: false,
+ },
+ {
+ scriptType: 1,
+ scriptContent: "鎮ㄧ殑鑱屼笟鏄粈涔堬紵",
+ scriptResult: null,
+ svyLibTemplateTargetoptions: [
+ { optioncontent: "瀛︾敓", value: "student" },
+ { optioncontent: "鏁欏笀", value: "teacher" },
+ { optioncontent: "宸ョ▼甯�", value: "engineer" },
+ { optioncontent: "鍖荤敓", value: "doctor" },
+ { optioncontent: "鍏朵粬", value: "other" },
+ ],
+ required: false,
+ },
+ {
+ scriptType: 4,
+ scriptContent: "鎮ㄧ殑濮撳悕鏄粈涔堬紵",
+ scriptResult: "name",
+ required: true,
+ scriptResult: null,
+ },
],
- revisitAfter: null,
+ jsy: null,
dialogVisible: false,
Endornot: true,
accomplish: false,
@@ -291,7 +312,7 @@
(res) => {
if (res.code == 200) {
this.questionList = res.data.script;
- this.revisitAfter = res.data.revisitAfter;
+ this.jsy = res.data.jsy;
this.kcb = res.data.kcb;
// 澶勭悊棰樼洰鏀堕泦缁撴灉鏍煎紡
this.questionList.forEach((item) => {
@@ -334,7 +355,7 @@
form.serviceSubtaskDetailList = arr;
Submitaquestionnaire(form).then((res) => {
if (res.code == 200) {
- if (this.revisitAfter) {
+ if (this.jsy) {
this.dialogVisible = true;
}
this.accomplish = true;
@@ -411,7 +432,7 @@
padding: 0;
.CONTENT {
.title {
- color: #3769F3;
+ color: #3769f3;
font-size: 22px;
font-weight: bold;
margin-bottom: 20px;
@@ -426,6 +447,7 @@
border-radius: 5px;
// margin: 20px;
padding: 10px;
+ height: 100%;
// background: #ffff;
border: 1px solid #dcdfe6;
-webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
@@ -438,12 +460,73 @@
}
}
}
-.radio-group {
+.preview-lefts {
+ margin: 10px;
+ background-color: #fff;
+ border-radius: 5px;
+ // margin: 20px;
+ padding: 10px;
+ height: 95vh; // background: #ffff;
+ border: 1px solid #dcdfe6;
+ -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
+ 0 0 6px 0 rgba(0, 0, 0, 0.04);
+ .topic-dev {
+ margin-bottom: 25px;
+ font-size: 20px !important;
+ .dev-text {
+ margin-bottom: 10px;
+ }
+ }
+}
+.red-star {
+ position: relative;
+ padding-right: 15px;
+}
+.red-star {
+ ::v-deep.el-radio__label {
+ position: relative;
+ padding-right: 10px; /* 鏍规嵁闇�瑕佽皟鏁� */
+ }
+ ::v-deep.el-radio__label::after {
+ content: "*";
+ color: red;
+ position: absolute;
+ right: -5px; /* 鏍规嵁闇�瑕佽皟鏁� */
+ top: 0;
+ }
+ ::v-deep.el-checkbox__label {
+ position: relative;
+ padding-right: 10px; /* 鏍规嵁闇�瑕佽皟鏁� */
+ }
+ ::v-deep.el-checkbox__label::after {
+ content: "*";
+ color: red;
+ position: absolute;
+ right: -5px; /* 鏍规嵁闇�瑕佽皟鏁� */
+ top: 0;
+ }
+}
+::v-deep.el-checkbox-group {
+ font-size: 0;
display: flex;
- flex-wrap: wrap;
- gap: 10px; /* 璁剧疆閫夐」涔嬮棿鐨勯棿闅� */
- align-items: start; /* 纭繚閫夐」涓婁笅瀵归綈 */
- padding: 10px 0; /* 涓烘暣涓粍璁剧疆涓婁笅闂撮殧 */
+ flex-direction: column;
+ margin: 5px 0;
+}
+::v-deep.el-checkbox.is-bordered + .el-checkbox.is-bordered {
+ margin-left: 0;
+}
+
+::v-deep.el-radio-group {
+ display: flex;
+ flex-direction: column;
+ margin: 5px 0;
+}
+::v-deep.el-radio.is-bordered + .el-radio.is-bordered {
+ /* margin-left: 10px; */
+ margin-left: 0;
+}
+::v-deep.custom-radio .el-radio {
+ margin: 2px 0;
}
.radio-option {
@@ -463,6 +546,7 @@
bottom: 0;
left: 0;
width: 100%;
+ text-align: center;
padding: 10px 0; /* 鏍规嵁闇�瑕佽皟鏁村唴杈硅窛 */
background: #fff; /* 鏍规嵁闇�瑕佽皟鏁磋儗鏅鑹� */
box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1); /* 鍙�夌殑闃村奖鏁堟灉 */
@@ -482,12 +566,15 @@
font-size: 20px;
}
::v-deep.el-radio--medium.is-bordered {
- padding: 5px 20px 0px 10px;
- border-radius: 4px;
- height: 36px;
+ padding: 5px 20px 0px 10px;
+ border-radius: 4px;
+ height: 36px;
}
::v-deep.el-checkbox.is-bordered.el-checkbox--medium .el-checkbox__label {
- line-height: 17px;
- font-size: 20px;
+ line-height: 17px;
+ font-size: 20px;
+}
+::v-deep.el-checkbox {
+ margin-right: 0px;
}
</style>
diff --git a/src/views/patient/medtechnician/index.vue b/src/views/patient/medtechnician/index.vue
index 9317a85..e5bda87 100644
--- a/src/views/patient/medtechnician/index.vue
+++ b/src/views/patient/medtechnician/index.vue
@@ -226,7 +226,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -237,7 +237,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -248,7 +248,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
diff --git a/src/views/patient/patient/PatientChart.vue b/src/views/patient/patient/PatientChart.vue
index 5e77196..ac1d085 100644
--- a/src/views/patient/patient/PatientChart.vue
+++ b/src/views/patient/patient/PatientChart.vue
@@ -252,7 +252,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.archivetime) }}</span>
+ <span>{{ formatTime(scope.row.archivetime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/patient/patient/authRole.vue b/src/views/patient/patient/authRole.vue
index ab5e72f..7efe5ad 100644
--- a/src/views/patient/patient/authRole.vue
+++ b/src/views/patient/patient/authRole.vue
@@ -29,11 +29,11 @@
<el-table-column label="鏉冮檺瀛楃" align="center" prop="roleKey" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
-
+
<pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
<el-form label-width="100px">
@@ -114,4 +114,4 @@
},
},
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue
index 659c808..054c244 100644
--- a/src/views/patient/patient/hospital.vue
+++ b/src/views/patient/patient/hospital.vue
@@ -167,7 +167,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.endtime) }}</span>
+ <span>{{ formatTime(scope.row.endtime) }}</span>
</template>
</el-table-column>
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index f8a68f5..69a6d28 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -298,6 +298,9 @@
prop="createTime"
width="160"
>
+ <template slot-scope="scope">
+ <span>{{ formatTime(scope.row.createTime) }}</span>
+ </template>
</el-table-column>
<el-table-column
label="鏇存柊鏃ユ湡"
@@ -306,7 +309,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.archivetime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -437,7 +440,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue
index 0aa2c3e..a35facd 100644
--- a/src/views/patient/patient/outpatient.vue
+++ b/src/views/patient/patient/outpatient.vue
@@ -156,7 +156,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
diff --git a/src/views/patient/patient/physical.vue b/src/views/patient/patient/physical.vue
index 2440772..5ae808e 100644
--- a/src/views/patient/patient/physical.vue
+++ b/src/views/patient/patient/physical.vue
@@ -257,7 +257,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -267,7 +267,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue
index 6853899..e917a31 100644
--- a/src/views/patient/patient/profile/index.vue
+++ b/src/views/patient/patient/profile/index.vue
@@ -374,7 +374,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
diff --git a/src/views/patient/physical/index.vue b/src/views/patient/physical/index.vue
index e1b5b4a..8d06a79 100644
--- a/src/views/patient/physical/index.vue
+++ b/src/views/patient/physical/index.vue
@@ -251,7 +251,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -262,7 +262,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -273,7 +273,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index a08b14c..3f8df23 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -176,6 +176,26 @@
</div>
</div>
</el-form-item>
+ <el-row>
+ <el-col :span="12"
+ ><el-form-item label="寮�鍦虹櫧" prop="kcb">
+ <el-input
+ type="textarea"
+ :rows="3"
+ v-model="form.kcb"
+ placeholder="璇疯緭鍏ュ紑鍦虹櫧"
+ /> </el-form-item
+ ></el-col>
+ <el-col :span="12"
+ ><el-form-item label="缁撴潫璇�" prop="jsy">
+ <el-input
+ type="textarea"
+ :rows="3"
+ v-model="form.jsy"
+ placeholder="璇疯緭鍏ョ粨鏉熻"
+ /> </el-form-item
+ ></el-col>
+ </el-row>
</el-form>
</div>
</div>
@@ -286,6 +306,7 @@
</el-option>
</el-select>
</el-col>
+
<el-col :span="1.5">
<el-button
type="primary"
@@ -293,7 +314,7 @@
icon="el-icon-plus"
size="medium"
:disabled="!patientqueryParams.allhosp"
- @click="handleAddpatient"
+ @click="handleQuery"
>鏂板</el-button
>
</el-col>
@@ -369,6 +390,18 @@
@keyup.enter.native="handleQuery"
></el-input>
</el-form-item>
+ <el-select
+ v-model="patientqueryParams.topica"
+ placeholder="璇烽�夋嫨鎮ｈ�呮潵婧�"
+ >
+ <el-option
+ v-for="item in source"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
<el-form-item>
<el-button
@@ -651,6 +684,7 @@
patientqueryParams: {
pageNum: 1, //
pageSize: 10,
+ topica:0,//0鍏ㄩ儴1绉戝2鐥呭尯
},
topicoptions: [{ children: [{ children: [] }] }],
showSearch: true, //
@@ -718,6 +752,8 @@
templatename: "",
templateid: null,
libtemplateid: null,
+ kcb:'浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�',
+ jsy:'鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒',
},
taskoptions: [
{
@@ -733,6 +769,21 @@
label: "浣撴鐥呬汉",
},
],
+ source: [
+ {
+ value: 0,
+ label: "鎵�鏈夋偅鑰�",
+ },
+ {
+ value: 1,
+ label: "绉戝鎮ｈ��",
+ },
+ {
+ value: 2,
+ label: "鐥呭尯鎮ｈ��",
+ },
+ ],
+
tasktypes: [
{
value: 1,
@@ -1030,7 +1081,7 @@
this.Tasktemplate = row;
this.questionList = row.svyTemplateLibScripts;
getQtemplateobj({ svyid: row.svyid }).then((res) => {
- if (res.code==200) {
+ if (res.code == 200) {
this.questionList = res.rows[0].svyTemplateLibScripts;
this.previewtf = true;
}
@@ -1128,7 +1179,6 @@
handleUpdate() {},
handleDelete() {},
handleExport() {},
-
// 閫夋嫨鎮ｈ�呰〃鏁版嵁
handleSelectionChange(selection) {
console.log("澶氶�夋偅鑰�");
@@ -1189,6 +1239,18 @@
},
getList() {},
handleQuery() {
+ if (this.patientqueryParams.topica == 0) {
+ this.patientqueryParams.leavehospitaldistrictcodes =
+ store.getters.leavehospitaldistrictcodes;
+ this.patientqueryParams.leaveldeptcodes = store.getters.leaveldeptcodes;
+ } else if (topica == 1) {
+ this.patientqueryParams.leavehospitaldistrictcodes = null;
+ this.patientqueryParams.leaveldeptcodes = store.getters.leaveldeptcodes;
+ } else if (topica == 2) {
+ this.patientqueryParams.leavehospitaldistrictcodes =
+ store.getters.leavehospitaldistrictcodes;
+ this.patientqueryParams.leaveldeptcodes = null;
+ }
this.handleAddpatient();
},
resetQuery() {},
@@ -1222,6 +1284,8 @@
templatename: "",
templateid: null,
libtemplateid: null,
+ kcb:'浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�',
+ jsy:'鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒',
};
this.questionList = [];
if (this.id) {
diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue
index eeef602..d4087fd 100644
--- a/src/views/patient/questionnaire/index.vue
+++ b/src/views/patient/questionnaire/index.vue
@@ -236,7 +236,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -247,7 +247,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -258,7 +258,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
diff --git a/src/views/patient/subsequent/index.vue b/src/views/patient/subsequent/index.vue
index 5980a04..a48448d 100644
--- a/src/views/patient/subsequent/index.vue
+++ b/src/views/patient/subsequent/index.vue
@@ -240,7 +240,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -251,7 +251,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -262,7 +262,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
diff --git a/src/views/repositoryai/matching/index.vue b/src/views/repositoryai/matching/index.vue
index 747d114..7f17e17 100644
--- a/src/views/repositoryai/matching/index.vue
+++ b/src/views/repositoryai/matching/index.vue
@@ -207,7 +207,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/shortmessage/messagebank/index.vue b/src/views/shortmessage/messagebank/index.vue
index cab0334..00a10f8 100644
--- a/src/views/shortmessage/messagebank/index.vue
+++ b/src/views/shortmessage/messagebank/index.vue
@@ -192,7 +192,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template> </el-table-column
><el-table-column
label="鍙戦�佹椂闂�"
@@ -201,7 +201,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/shortmessage/taglibrary/index.vue b/src/views/shortmessage/taglibrary/index.vue
index 77e57b6..ea9a5c1 100644
--- a/src/views/shortmessage/taglibrary/index.vue
+++ b/src/views/shortmessage/taglibrary/index.vue
@@ -149,7 +149,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/system/category/index.vue b/src/views/system/category/index.vue
index 43bed80..7bbdc61 100644
--- a/src/views/system/category/index.vue
+++ b/src/views/system/category/index.vue
@@ -168,7 +168,7 @@
</template>
</el-table-column>
</el-table>
-
+
<pagination
v-show="total>0"
:total="total"
@@ -264,7 +264,7 @@
this.loading = true;
listCategory(this.queryParams).then(response => {
this.categoryList = response.rows;
-
+
console.log(this.categoryList);
this.total = response.total;
this.loading = false;
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index f580b98..3493924 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -116,7 +116,7 @@
<el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 74149b4..c9aa9f4 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -104,7 +104,7 @@
width="200"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 324bb64..10f8ae4 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -109,7 +109,7 @@
<el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -399,4 +399,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 6ca5457..2019f46 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -126,7 +126,7 @@
<el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -344,4 +344,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 57b56e5..d895775 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -72,12 +72,12 @@
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
+ <el-button
size="mini"
type="text"
icon="el-icon-edit"
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 444bf63..58094c5 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -92,7 +92,7 @@
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 147aa33..ba247c0 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -72,7 +72,7 @@
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -196,4 +196,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index fb3b5ef..7fe1866 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -115,7 +115,7 @@
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -602,4 +602,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index b2b072f..cd708e7 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -37,7 +37,7 @@
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index ab5e72f..7efe5ad 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -29,11 +29,11 @@
<el-table-column label="鏉冮檺瀛楃" align="center" prop="roleKey" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
-
+
<pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
<el-form label-width="100px">
@@ -114,4 +114,4 @@
},
},
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 7322ae1..23cce5e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -228,7 +228,7 @@
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
+ <span>{{ formatTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -304,7 +304,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
<treeselect
v-model="form.depts"
@@ -314,8 +314,42 @@
placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬"
/>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
+ <el-form-item label="閫傜敤绉戝" prop="region">
+ <el-cascader
+ style="width: 478px"
+ v-model="form.leaveldeptcodes"
+ :options="deptOptions"
+ :props="props"
+ :show-all-levels="false"
+ clearable
+ >
+ <template slot-scope="{ node, data }">
+ <span>{{ data.label }}</span>
+ <span v-if="!node.isLeaf">
+ ({{ data.children.length }})
+ </span>
+ </template>
+ </el-cascader>
+ </el-form-item>
+ <el-form-item label="閫傜敤闄㈠尯" prop="region">
+ <el-cascader
+ style="width: 478px"
+ v-model="form.leavehospitaldistrictcodes"
+ :options="deptOptions"
+ :props="props"
+ :show-all-levels="false"
+ clearable
+ >
+ <template slot-scope="{ node, data }">
+ <span>{{ data.label }}</span>
+ <span v-if="!node.isLeaf">
+ ({{ data.children.length }})
+ </span>
+ </template>
+ </el-cascader>
+ </el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
@@ -548,6 +582,7 @@
children: "children",
label: "label",
},
+ props: { multiple: true, value: "id", label: "label" },
// 鐢ㄦ埛瀵煎叆鍙傛暟
upload: {
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鐢ㄦ埛瀵煎叆锛�
@@ -754,7 +789,8 @@
const userId = row.userId || this.ids;
getUser(userId).then((response) => {
this.form = response.data;
-
+ this.form.leaveldeptcodes = JSON.parse(this.form.hospInfo);
+ this.form.leavehospitaldistrictcodes = JSON.parse(this.form.deptInfo);
this.postOptions = response.posts;
this.roleOptions = response.roles;
this.$set(this.form, "postIds", response.postIds);
@@ -787,6 +823,15 @@
},
/** 鎻愪氦鎸夐挳 */
submitForm: function () {
+ this.form.hospInfo = JSON.stringify(this.form.leaveldeptcodes);
+ this.form.deptInfo = JSON.stringify(this.form.leavehospitaldistrictcodes);
+ this.form.leaveldeptcodes = this.form.leaveldeptcodes.map(
+ (subArr) => subArr[subArr.length - 1]
+ );
+ this.form.leavehospitaldistrictcodes = this.form.leavehospitaldistrictcodes.map(
+ (subArr) => subArr[subArr.length - 1]
+ );
+
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.userId != undefined) {
diff --git a/vue.config.js b/vue.config.js
index 481b81d..0c8cfd6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,6 +37,7 @@
[process.env.VUE_APP_BASE_API]: {
target: `http://192.168.1.10:8095`,
// target:`http://localhost:8095`,
+ // target: `http://192.168.101.135:8095`,
// target: `http://192.168.101.166:8093`,
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.3