diff --git a/src/assets/images/bitton.jpg b/src/assets/images/bitton.jpg
new file mode 100644
index 0000000..c1f76cb
Binary files /dev/null and b/src/assets/images/bitton.jpg differ
diff --git a/src/assets/images/right.jpg b/src/assets/images/right.jpg
new file mode 100644
index 0000000..6ed61f9
Binary files /dev/null and b/src/assets/images/right.jpg differ
diff --git a/src/views/manage/components/PathReview.vue b/src/views/manage/components/PathReview.vue
index c805d7c..31537b8 100644
--- a/src/views/manage/components/PathReview.vue
+++ b/src/views/manage/components/PathReview.vue
@@ -203,6 +203,7 @@
                         <div class="tabtexts">
                             <div class="tabtitle">
                                 {{ item.taskTypeName }}-{{ item.taskPartitionDictName }}
+                                <span v-if="!item.conditionSatisfyStatus" style="color: red">(不符合条件)</span>
                             </div>
                             <div class="tabtext" style="height: 50px;line-height: 30px;">
                                 <div class="lefttext">
@@ -350,7 +351,7 @@ export default {
     },
     methods: {
         changeswitch(e) {
-            if (e) {
+            if (!e) {
                 this.routelist = this.allroutelist.filter(item => item.conditionSatisfyStatus);
             } else {
                 this.routelist = this.allroutelist
@@ -396,7 +397,7 @@ export default {
                 });
                 getRouteNodeInfo(this.$route.query.signRecordId).then(res => {
                     this.allroutelist = res.data
-                    this.routelist = res.data
+                    this.routelist = this.allroutelist.filter(item => item.conditionSatisfyStatus);
                     this.tab = 2
                     loading.close();
                 }).catch(err => {
diff --git a/src/views/manage/components/Scriptpreviewopen.vue b/src/views/manage/components/Scriptpreviewopen.vue
index 48a5e3d..dc37be5 100644
--- a/src/views/manage/components/Scriptpreviewopen.vue
+++ b/src/views/manage/components/Scriptpreviewopen.vue
@@ -169,329 +169,6 @@ export default {
         nodes: [],
         edges: [],
       },
-      // form: {
-      //   nodes: [{
-      //     color
-      //       :
-      //       "#FA8C16",
-      //     id
-      //       :
-      //       "655c5165",
-      //     index
-      //       :
-      //       0,
-      //     label
-      //       :
-      //       "自我介绍确认",
-      //     nodetype
-      //       :
-      //       "startNode",
-      //     shape
-      //       :
-      //       "flow-circle",
-      //     size
-      //       :
-      //       "72*72",
-      //     type
-      //       :
-      //       "node",
-      //     x
-      //       :
-      //       441.5124969482422,
-      //     y
-      //       :
-      //       60.79999542236328,
-      //   }, {
-      //     color
-      //       :
-      //       "#1890ff",
-      //     id
-      //       :
-      //       "8660695d",
-      //     index
-      //       :
-      //       1,
-      //     label
-      //       :
-      //       "家属是否能代打",
-      //     size
-      //       :
-      //       "100*50",
-      //     type
-      //       :
-      //       "node",
-      //     x
-      //       :
-      //       242.5124969482422,
-      //     y
-      //       :
-      //       183.5999984741211,
-      //   },
-      //   {
-      //     color
-      //       :
-      //       "#1890ff",
-      //     id
-      //       :
-      //       "59c9ceed",
-      //     index
-      //       :
-      //       2,
-      //     label
-      //       :
-      //       "常规节点",
-      //     size
-      //       :
-      //       "100*50",
-      //     type
-      //       :
-      //       "node",
-      //     x
-      //       :
-      //       606.5124969482422,
-      //     y
-      //       :
-      //       187.5999984741211,
-      //   }, {
-      //     color
-      //       :
-      //       "#722ED1",
-      //     id
-      //       :
-      //       "16f4c8ba",
-      //     index
-      //       :
-      //       5,
-      //     label
-      //       :
-      //       "你好，我这边是#机构#的工作人员",
-      //     shape
-      //       :
-      //       "flow-capsule",
-      //     size
-      //       :
-      //       "200*48",
-      //     type
-      //       :
-      //       "node",
-      //     x
-      //       :
-      //       433.5124969482422,
-      //     y
-      //       :
-      //       125.5999984741211,
-      //   }, {
-      //     color
-      //       :
-      //       "#722ED1",
-      //     id
-      //       :
-      //       "e4839dcc",
-      //     index
-      //       :
-      //       6,
-      //     label
-      //       :
-      //       "好的是这样的",
-      //     shape
-      //       :
-      //       "flow-capsule",
-      //     size
-      //       :
-      //       "80*48",
-      //     type
-      //       :
-      //       "node",
-      //     x
-      //       :
-      //       233.5124969482422,
-      //     y
-      //       :
-      //       251.5999984741211,
-      //   }, {
-      //     color
-      //       :
-      //       "#1890ff",
-      //     id
-      //       :
-      //       "392ca0b8",
-      //     index
-      //       :
-      //       7,
-      //     label
-      //       :
-      //       "家属不能代打",
-      //     size
-      //       :
-      //       "100*50",
-      //     type
-      //       :
-      //       "node",
-      //     x
-      //       :
-      //       55.51249694824219,
-      //     y
-      //       :
-      //       299.5999984741211
-      //   }, {
-      //     color
-      //       :
-      //       "#1890ff",
-      //     id
-      //       :
-      //       "6bcab22d",
-      //     index
-      //       :
-      //       8,
-      //     label
-      //       :
-      //       "家属能代打",
-      //     size
-      //       :
-      //       "100*50",
-      //     type
-      //       :
-      //       "node",
-      //     x
-      //       :
-      //       384.5124969482422,
-      //     y
-      //       :
-      //       307.5999984741211
-      //   },
-      //   {
-      //     color
-      //       :
-      //       "#722ED1",
-      //     id
-      //       :
-      //       "dc5de91f",
-      //     index
-      //       :
-      //       11,
-      //     label
-      //       :
-      //       "好的 麻烦转告一下",
-      //     shape
-      //       :
-      //       "flow-capsule",
-      //     size
-      //       :
-      //       "200*48",
-      //     type
-      //       :
-      //       "node",
-      //     x
-      //       :
-      //       55.51249694824219,
-      //     y
-      //       :
-      //       366.5
-
-      //   }],
-      //   edges: [{
-      //     id: "b04d23c7",
-      //     index
-      //       :
-      //       3,
-      //     label
-      //       :
-      //       "是本人",
-      //     shape
-      //       :
-      //       "flow-polyline-round",
-      //     source
-      //       :
-      //       "655c5165",
-      //     sourceAnchor
-      //       :
-      //       1,
-      //     target
-      //       :
-      //       "59c9ceed",
-      //     targetAnchor
-      //       :
-      //       0,
-      //   }, {
-      //     id
-      //       :
-      //       "7894068d",
-      //     index
-      //       :
-      //       4,
-      //     label
-      //       :
-      //       "是家属",
-      //     shape
-      //       :
-      //       "flow-polyline-round",
-      //     source
-      //       :
-      //       "655c5165",
-      //     sourceAnchor
-      //       :
-      //       3,
-      //     target
-      //       :
-      //       "8660695d",
-      //     targetAnchor
-      //       :
-      //       0,
-      //   }, {
-      //     id
-      //       :
-      //       "6aa429cc",
-      //     index
-      //       :
-      //       9,
-      //     label
-      //       :
-      //       "能带大",
-      //     shape
-      //       :
-      //       "flow-polyline-round",
-      //     source
-      //       :
-      //       "8660695d",
-      //     sourceAnchor
-      //       :
-      //       3,
-      //     target
-      //       :
-      //       "392ca0b8",
-      //     targetAnchor
-      //       :
-      //       0,
-      //   },
-      //   {
-      //     id
-      //       :
-      //       "02bfc4d0",
-      //     index
-      //       :
-      //       10,
-      //     label
-      //       :
-      //       "不能代打",
-      //     shape
-      //       :
-      //       "flow-polyline-round",
-      //     source
-      //       :
-      //       "8660695d",
-      //     sourceAnchor
-      //       :
-      //       1,
-      //     target
-      //       :
-      //       "6bcab22d",
-      //     targetAnchor
-      //       :
-      //       0
-      //   }
-      //   ]
-
-      // },
       // 节点属性表单
       nodeAttributeForm: {
         label: "",
diff --git a/src/views/manage/components/Taskprocess.vue b/src/views/manage/components/Taskprocess.vue
index 8158738..2db50fb 100644
--- a/src/views/manage/components/Taskprocess.vue
+++ b/src/views/manage/components/Taskprocess.vue
@@ -13,7 +13,6 @@
               ref="formlist"
               :model="formlist"
               label-width="110px"
-              :rules="rulesphone"
             >
               <el-form-item label="电话" prop="patientPhone">
                 <el-input
@@ -91,9 +90,7 @@
         <!-- 问卷模板处理 -->
         <div
           class="right"
-          v-if="
-            $route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'
-          "
+          v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
         >
           <div
             class="sport"
@@ -233,14 +230,19 @@
         <!-- 电话外呼 -->
         <div class="right" v-if="$route.query.taskNodeType == 'PHONE_OUTBOUND'">
           <div class="sport">
-            <span
-              ><hamburger
-                @toggleClick="toggleSideBar"
-                id="hamburger-container"
-                :is-active="sidebar.opened"
-                class="hamburger-container"
-                style="display: inline-block" /></span
-            >话术预览
+            <img
+              src="@/assets/images/right.jpg"
+              class="login-code-img"
+              v-if="isshow == true"
+              @click="toggleSideBar"
+            />
+            <img
+              src="@/assets/images/bitton.jpg"
+              class="login-code-img"
+              v-if="isshow == false"
+              @click="toggleSideBar"
+            />
+            话术预览
           </div>
           <Scriptpreview
             :phoneNodeContent="formlist.phoneNodeContent"
@@ -266,10 +268,7 @@
           ref="questiondata"
           v-if="$route.query.taskNodeType == 'QUESTIONNAIRE_SCALE'"
         >
-          <el-form-item
-            label="任务处理信息"
-            prop="routeHandleRemark"
-          >
+          <el-form-item label="任务处理信息" prop="routeHandleRemark">
             <el-input
               type="textarea"
               placeholder="请输入任务处理信息"
@@ -282,27 +281,20 @@
           :inline="true"
           class="demo-form-inline"
           :model="formlist"
-          :rules="rules"
+          :rules="rulesphone"
           ref="formlist"
           v-if="$route.query.taskNodeType == 'PHONE_OUTBOUND'"
         >
           <el-form-item label="是否接通" prop="phone">
-            <el-radio
-              v-model="formlist.phoneConnectStatus"
-              label="CONNECTED"
+            <el-radio v-model="formlist.phoneConnectStatus" label="CONNECTED"
               >已接通</el-radio
             >
-            <el-radio
-              v-model="formlist.phoneConnectStatus"
-              label="NOTCONNECTED"
+            <el-radio v-model="formlist.phoneConnectStatus" label="NOTCONNECTED"
               >未接通</el-radio
             >
           </el-form-item>
 
-          <el-form-item
-            label="任务处理信息"
-            prop="routeHandleRemark"
-          >
+          <el-form-item label="任务处理信息" prop="routeHandleRemark">
             <el-input
               type="textarea"
               placeholder="请输入任务处理信息"
@@ -315,7 +307,6 @@
   </div>
 </template>
   <script>
-import { mapGetters } from 'vuex'
 
 import message from "../../system/components/message.vue";
 import Scriptpreview from "../../system/components/Scriptpreviewopen.vue";
@@ -403,12 +394,6 @@ export default {
       parentDictCode: "",
     };
   },
-  computed: {
-    ...mapGetters([
-      'sidebar',
-    ]),
-
-  },
   created() {
     this.id = this.$route.query.manageRouteId;
     this.info();
@@ -416,7 +401,7 @@ export default {
     this.infolistword();
     if (this.$route.query.taskNodeType == "QUESTIONNAIRE_SCALE") {
       this.activeName = "first"
-        this.questioninfo();
+      this.questioninfo();
     } else if (this.$route.query.taskNodeType == "PHONE_OUTBOUND") {
       this.activeName = "four"
       selectPhonePush(this.$route.query.manageRouteNodeId).then((response) => {
@@ -443,10 +428,7 @@ export default {
   },
   methods: {
     toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
       this.isshow = !this.isshow
-      console.log(9999999)
-
     },
     // 左侧列表
     infoleft() {
@@ -689,7 +671,6 @@ export default {
               (this.form.routeHandleRemark = this.formlist.routeHandleRemark);
             this.form.phoneConnectStatus = this.formlist.phoneConnectStatus;
             this.form.visitRecordId = this.$route.query.visitRecordId;
-
             this.form.phoneDialMethod = this.formlist.phoneDialMethod
             this.form.phoneMessageTemplateCode = this.formlist.phoneMessageTemplateCode
             this.form.phoneMessageTemplateContent = this.formlist.phoneMessageTemplateContent
@@ -697,7 +678,7 @@ export default {
             this.form.patientPhone = this.formlist.patientPhone
             var formlists = JSON.parse(JSON.stringify(this.form));
             console.log(formlists)
-            // return;
+            return;
             addPatientQuestionResult(formlists).then((response) => {
               this.$confirm("保存成功, 是否返回上一页?", "提示", {
                 confirmButtonText: "确定",
@@ -734,6 +715,12 @@ export default {
 };
   </script>
   <style lang="scss" scoped>
+::v-deep {
+  #vue-g6-editor #page canvas {
+    width: 100% !important;
+    height: 100% !important;
+  }
+}
 ::v-deep .el-form-item {
   display: inline-block;
 }
@@ -764,7 +751,7 @@ export default {
 .tk {
   ::v-deep .el-textarea__inner {
     margin: 20px 0 10px 30px;
-    width: 35% !important;
+    width: 55% !important;
     height: 100px;
   }
 }
@@ -847,15 +834,9 @@ export default {
       padding: 10px 50px 10px 10px;
       font-size: 20px;
       font-weight: 600;
-      .hamburger-container {
-        height: 100%;
-        cursor: pointer;
-        transition: background 0.3s;
-        -webkit-tap-highlight-color: transparent;
-
-        &:hover {
-          background: rgba(0, 0, 0, 0.025);
-        }
+      .login-code-img {
+        top: 10px;
+        position: relative;
       }
     }
 
diff --git a/src/views/manage/components/cardlist.vue b/src/views/manage/components/cardlist.vue
index 4b7883c..2f451cf 100644
--- a/src/views/manage/components/cardlist.vue
+++ b/src/views/manage/components/cardlist.vue
@@ -3,8 +3,49 @@
         <div v-for="item in patientInfoList" :key="item.id">
             <div class="carditem">
                 <div class="top">
-                    <img src="../../../assets/manage/nvtouxiang.png" alt="" class="img" />
-                    <!-- <img src="../../../assets/manage/touxiang.png" alt="" class="img" /> -->
+                    <!-- <img src="../../../assets/manage/nvtouxiang.png" alt="" class="img" /> -->
+                    <img src="../../../assets/manage/touxiang.png" alt="" class="img" />
+                    <div class="name">
+                        张三
+                    </div>
+                    <div class="agesex">
+                        女
+                        <span style="padding: 0 3px;">|</span>
+                        64岁
+                        <!-- <span class="zy">在院</span> -->
+                        <!-- <span class="cy">出院</span> -->
+                        <span class="yzy">预住院</span>
+                        <!-- <span class="mz">门诊</span> -->
+                    </div>
+                    <div class="diagnosis">
+                        诊断名称：
+                    </div>
+                </div>
+                <div class="bottom">
+                    <div class="formitem">
+                        医生：李四
+                    </div>
+                    <div class="formitem">
+                        科室：心血管内科
+                    </div>
+                    <div class="formitem">
+                        就诊时间：2024-06-27
+                    </div>
+                    <div class="formitem flex">
+                        <span>
+                            康复计划执行率：
+                        </span>
+                        <el-progress :percentage="0" :format="format"></el-progress>
+                    </div>
+                    <div class="formitem flex">
+                        <span>
+                            康复计划完成率：
+                        </span>
+                        <el-progress :percentage="100" :format="format"></el-progress>
+                    </div>
+                    <div class="formitem">
+                        下次任务：
+                    </div>
                 </div>
             </div>
         </div>
@@ -29,7 +70,11 @@ export default {
     },
     mounted() {
     },
-    methods: {},
+    methods: {
+        format(percentage) {
+            return percentage === 100 ? `${percentage}%(3/3)` : `${percentage}%(3/3)`;
+        }
+    }
 }
 </script>
 <style lang="scss" scoped>
@@ -46,16 +91,130 @@ export default {
         min-height: 200px;
         border: 1px solid #DCDFE6;
         border-radius: 10px;
+        font-size: 14px;
+        font-weight: 600;
 
-        .top {
-            height: 80px;
-            background-color: #F7F8FA;
+        .bottom {
+            height: 160px;
+            padding: 0 6px;
+
+            .formitem {
+                height: 26px;
+                line-height: 26px;
+                font-size: 12px;
+                color: #756A5E;
+                font-weight: 550;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                overflow: hidden;
+                overflow: hidden;
+            }
+
+            .flex {
+                display: flex;
+                align-items: center;
+
+                ::v-deep .el-progress-bar {
+                    flex: 1;
+                }
+
+                ::v-deep .el-progress__text {
+                    font-size: 12px !important;
+                    flex: 0.8;
+                    text-align: right;
+                }
+
+                span {
+                    flex: 0.8;
+                    max-width: 50%;
+                }
+
+                ::v-deep .el-progress {
+                    flex: 1;
+                    display: flex;
+                    align-items: center;
+                }
+            }
         }
 
-        .img {
-            margin: 10px 0 0 10px;
-            width: 50px;
-            height: 50px;
+        .top {
+            height: 100px;
+            background-color: #F7F8FA;
+            position: relative;
+            border-radius: 10px 10px 0 0;
+
+            .img {
+                margin: 10px 0 0 10px;
+                width: 50px;
+                height: 50px;
+            }
+
+            .agesex {
+                position: absolute;
+                right: 10px;
+                top: 16px;
+
+                //预住院
+                .yzy {
+                    background-color: #E8F4EC;
+                    color: #2FB844;
+                    border: 1.5px solid #2FB844;
+                    border-radius: 2px;
+                    padding: 3px 5px;
+                    margin-left: 4px;
+                }
+
+                //门诊
+                .mz {
+                    background-color: #DFE4F6;
+                    color: #2D56FB;
+                    border: 1.5px solid #2D56FB;
+                    border-radius: 2px;
+                    padding: 3px 5px;
+                    margin-left: 4px;
+                }
+
+                // 在院
+                .zy {
+                    background-color: #DEEDF4;
+                    color: #1D98C6;
+                    border: 1.5px solid #1D98C6;
+                    border-radius: 2px;
+                    padding: 3px 5px;
+                    margin-left: 4px;
+                }
+
+                // 出院
+                .cy {
+                    background-color: #DEEFEE;
+                    color: #2A9A82;
+                    border: 1.5px solid #2A9A82;
+                    border-radius: 2px;
+                    padding: 3px 5px;
+                    margin-left: 4px;
+                }
+            }
+
+            .diagnosis {
+                position: absolute;
+                color: #756A5E;
+                font-weight: 550;
+                left: 70px;
+                top: 42px;
+                font-size: 12px;
+                height: 48px;
+                display: -webkit-box;
+                -webkit-line-clamp: 3;
+                -webkit-box-orient: vertical;
+                overflow: hidden;
+                padding-right: 4px;
+            }
+
+            .name {
+                position: absolute;
+                left: 70px;
+                top: 16px;
+            }
         }
     }
 }
diff --git a/src/views/system/components/Scriptpreviewopen.vue b/src/views/system/components/Scriptpreviewopen.vue
index b6c10a2..b1e40fd 100644
--- a/src/views/system/components/Scriptpreviewopen.vue
+++ b/src/views/system/components/Scriptpreviewopen.vue
@@ -317,14 +317,10 @@ export default {
   },
   methods: {
     getlist() {
-      // console.log(this.$route.query)
-      // console.log(this.phoneNodeContent,'this.form = JSON.parse(this.phoneNodeContent)')
-      // getFlowScheme(this.$route.query.id).then(res => {
-      // this.form = JSON.parse(this.$route.query.id)
+
       if(this.phoneNodeContent){
         this.form = JSON.parse(this.phoneNodeContent);
       this.editor.getCurrentPage().read(this.form);
-      // })
       }
     },
     // 初始化