root 1 سال پیش
والد
کامیت
36e8f8ffae

+ 21 - 33
src/renderer/components/ManageScaleUser.vue

@@ -1,31 +1,17 @@
 <template>
   <div class="main_right_height">
-    <div>
-      <el-row>
-        <el-col :span="1">&nbsp;</el-col>
-        <el-col :span="22">
-          <span class="musicTitle">量表测试记录</span>
-          <el-divider></el-divider>
-        </el-col>
-        <el-col :span="1">&nbsp;</el-col>
-      </el-row>
-    </div>
+    <TopDes :flag="false" topDesFont="量表测评记录"></TopDes>
     <div>
       <el-row>
         <el-col :span="1">&nbsp;</el-col>
         <el-col :span="6">
-          <div style="margin-top: 15px; margin-bottom: 15px">
+          <div style="margin-top: 15px; margin-bottom: 15px" class="xl_input">
             <el-input
               placeholder="请输入量表名称"
               v-model="nameSearch"
-              class="input-with-select"
-              clearable
+              prefix-icon="el-icon-search"
+              @input="searchEle"
             >
-              <el-button
-                slot="append"
-                @click="searchEle"
-                icon="el-icon-search"
-              ></el-button>
             </el-input>
           </div>
         </el-col>
@@ -37,8 +23,12 @@
         <el-col :span="22">
           <el-table
             :data="tableData"
-            :header-cell-style="{ background: head_style }"
-            border
+            :header-cell-style="{
+              background: '#66B497',
+              color: '#FFFFFF',
+              'letter-spacing': '4px',
+            }"
+            :row-class-name="tableRowClassName"
             style="width: 100%"
           >
             <el-table-column align="center" prop="name" label="量表名称">
@@ -58,7 +48,7 @@
         <el-col :span="1"> &nbsp;</el-col>
       </el-row>
     </div>
-    <p align="center" style='margin-bottom:40px' >
+    <p align="center" style="margin-bottom: 40px">
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -69,6 +59,7 @@
       >
       </el-pagination>
     </p>
+    <FootDes></FootDes>
   </div>
 </template>
 <script>
@@ -129,6 +120,14 @@ export default {
       });
     },
     handleDelete(index, row) {},
+    tableRowClassName({ rowIndex }) {
+      if (rowIndex % 2 === 0) {
+        return "warning-row";
+      } else if (rowIndex % 2 === 1) {
+        return "success-row";
+      }
+      return "success-row";
+    },
   },
 };
 </script>
@@ -137,17 +136,6 @@ export default {
   height: 100vh !important;
   display: block !important;
   overflow-y: auto !important;
-  background:#ffffff;
-}
-.xl_d_button,
-.xl_d_button:hover,
-.xl_d_button:focus {
-  background: rgb(87, 172, 187);
-  opacity: 1;
-  /* border-radius: 18px; */
-  /* font-size: 14px; */
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #ffffff;
+  background: #ffffff;
 }
 </style>

+ 33 - 32
src/renderer/components/ManageScaleUserRecord.vue

@@ -58,29 +58,39 @@
             size="small"
             @click="download(1, 1)"
             class="xl_d_button"
-            :disabled="(multipleSelection.length === 0)&&disableFlag"
+            :disabled="multipleSelection.length === 0 && disableFlag"
           >
             批量下载(原始数据)</el-button
           >
-          <el-button size="small" :disabled="(tableData.length === 0)&&disableFlag" @click="download(1, 2)" class="xl_d_button">
+          <el-button
+            size="small"
+            :disabled="tableData.length === 0 && disableFlag"
+            @click="download(1, 2)"
+            class="xl_d_button"
+          >
             全部下载(原始数据)</el-button
           >
           <el-button
             size="small"
             @click="download(2, 1)"
             class="xl_d_button"
-            :disabled="(multipleSelection.length === 0)&&disableFlag"
+            :disabled="multipleSelection.length === 0 && disableFlag"
           >
             批量下载</el-button
           >
-          <el-button size="small" :disabled="(tableData.length === 0)&&disableFlag" class="xl_d_button" @click="download(2, 2)">
+          <el-button
+            size="small"
+            :disabled="tableData.length === 0 && disableFlag"
+            class="xl_d_button"
+            @click="download(2, 2)"
+          >
             全部下载</el-button
           >
         </el-col>
         <el-col :span="1">&nbsp;</el-col>
       </el-row>
     </div>
-    <div>
+    <div style="margin-top: 16px;">
       <el-row>
         <el-col :span="1"> &nbsp;</el-col>
         <el-col :span="22">
@@ -88,8 +98,12 @@
             :data="tableData"
             style="width: 100%"
             @selection-change="handleSelectionChange"
-            border
-            :header-cell-style="{ background: head_style }"
+            :header-cell-style="{
+              background: '#66B497',
+              color: '#FFFFFF',
+              'letter-spacing': '4px',
+            }"
+            :row-class-name="tableRowClassName"
           >
             <el-table-column type="selection" align="center" width="55">
             </el-table-column>
@@ -116,7 +130,7 @@
         <el-col :span="1"> &nbsp;</el-col>
       </el-row>
     </div>
-    <p align="center" style='margin-bottom:40px'>
+    <p align="center" style="margin-bottom: 40px">
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -148,7 +162,7 @@ export default {
       tableData: [],
       multipleSelection: [],
       flag: "",
-      disableFlag:true
+      disableFlag: true,
     };
   },
   mounted() {
@@ -160,7 +174,7 @@ export default {
     goBack() {
       this.$router.go(-1);
     },
-    
+
     //批量下载
     download(val, value) {
       //获取数组集合
@@ -218,7 +232,7 @@ export default {
         this.startDate = this.fomatterDate(this.value1[0]);
         this.endDate = this.fomatterDate(this.value1[1]);
       }
-      this.pageNum=1;
+      this.pageNum = 1;
       this.queryEle();
     },
     //格式化时间格式
@@ -341,6 +355,14 @@ export default {
       // });
     },
     handleDelete(index, row) {},
+    tableRowClassName({ rowIndex }) {
+      if (rowIndex % 2 === 0) {
+        return "warning-row";
+      } else if (rowIndex % 2 === 1) {
+        return "success-row";
+      }
+      return "success-row";
+    }
   },
 };
 </script>
@@ -357,25 +379,4 @@ export default {
   border-collapse: separate;
   border-spacing: 0;
 }
-.xl_d_button,
-.xl_d_button:hover,
-.xl_d_button:focus {
-  background: rgb(87, 172, 187);
-  opacity: 1;
-  /* border-radius: 18px; */
-  /* font-size: 14px; */
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #ffffff;
-  margin-bottom: 20px;
-}
-.xl_d_button.is-disabled,
-.xl_d_button.is-disabled:focus,
-.xl_d_button.is-disabled:hover {
-  color: #c0c4cc;
-  cursor: not-allowed;
-  background-image: none;
-  background-color: rgb(87, 172, 187);
-  border-color: #ebeef5;
-}
 </style>

+ 0 - 8
src/renderer/components/MusicRelax.vue

@@ -573,14 +573,6 @@ export default {
 };
 </script>
 <style>
-.el-table .warning-row {
-  background: #f5f5f5;
-}
-
-.el-table .success-row {
-  background: #ffffff;
-}
-
 .el-table--enable-row-hover
   /deep/
   .el-table__body

+ 2 - 0
src/renderer/components/ScaleListResult.vue

@@ -308,6 +308,7 @@ export default {
   margin-right: 15px;
 }
 .main_right_height {
+  background: #ffffff;
   height: 95vh !important;
   display: block !important;
   overflow-y: auto !important;
@@ -348,6 +349,7 @@ export default {
   background: #eaeaea;
   opacity: 1;
   border-radius: 30px 30px 30px 30px;
+  margin-bottom: 16px;
 }
 
 .card .img_card {

+ 1 - 50
src/renderer/components/TestResults.vue

@@ -523,56 +523,7 @@ export default {
     },
     //返回上一级
     goBack() {
-      let userType = sessionStorage.getItem("f7a42fe7211f98ac7a60a285ac3a9528");
-      let testPlanId = this.$route.query.testPlanId || "";
-      let comes = this.$route.query.come || ""; //1-来自量表测试,2-来自测试记录列表页,3-来自管理端量表测试报告,4-来自管理端测试报告进入的量表报告
-
-      if (userType == "1") {
-        if (testPlanId) {
-          this.$router.push({
-            name: "TaskInTestPlan",
-            query: {
-              testPlanId: testPlanId,
-            },
-          });
-        } else if (comes == 1) {
-          //返回量表首页
-          this.$router.push("/welcome/mainTable");
-        } else if (comes == 2) {
-          // 返回测试记录列表页
-          this.$router.push({
-            path: "/welcome/PersonalCenter",
-          });
-        }
-      } else {
-        //返回认知任务
-        if (this.$route.query.type == 1) {
-          this.$router.push({
-            path: "/ContainerSys/SearchCognitiveTaskRecord",
-            query: {
-              phone: this.$route.query.phone,
-              type: 1,
-              institutionNo: sessionStorage.getItem(
-                "f7a42fe7211f98ac7a60a285ac3a9527"
-              ),
-            },
-          });
-        }
-        //返回量表
-        if (this.$route.query.type == 0) {
-          console.log("6666");
-          this.$router.push({
-            path: "/ContainerSys/SearchScaleRecord",
-            query: {
-              phone: this.$route.query.phone,
-              type: 0,
-              institutionNo: sessionStorage.getItem(
-                "f7a42fe7211f98ac7a60a285ac3a9527"
-              ),
-            },
-          });
-        }
-      }
+      this.$router.go(-1)
     },
     drawLine() {
       this.$nextTick(() => {

+ 0 - 23
src/renderer/components/psychologicalClinic.vue

@@ -470,14 +470,6 @@ export default {
   margin: 0 5px;
 }
 
-.el-table .warning-row {
-  background: #f5f5f5;
-}
-
-.el-table .success-row {
-  background: #ffffff;
-}
-
 .el-table--enable-row-hover
   /deep/
   .el-table__body
@@ -485,19 +477,4 @@ export default {
   > td.el-table__cell {
   background: rgba(223, 246, 237, 1) !important;
 }
-
-::v-deep .el-pager li.active,
-::v-deep .el-pager li:hover {
-  background: #f0f0f0;
-  color: #262626;
-}
-
-::v-deep .el-pager li {
-  background: none;
-  color: #8c8c8c;
-}
-
-::v-deep .el-pagination .btn-next, ::v-deep .el-pagination .btn-prev {
-  background: none;
-}
 </style>

+ 10 - 7
src/utils/public.css

@@ -30,12 +30,13 @@
     background: #ffffff;
 }
 
+
 .el-table--enable-row-hover /deep/ .el-table__body tr:hover>td.el-table__cell {
     background: rgba(223, 246, 237, 1) !important;
 }
 
-::v-deep .el-pager li.active,
-::v-deep .el-pager li:hover {
+.el-pager li.active,
+.el-pager li:hover {
     background: #f0f0f0;
     color: #262626;
 }
@@ -45,13 +46,13 @@
     border-right: 0px solid #EBEEF5;
 }
 
-::v-deep .el-pager li {
+.el-pager li {
     background: none;
     color: #8c8c8c;
 }
 
-::v-deep .el-pagination .btn-next,
-::v-deep .el-pagination .btn-prev {
+.el-pagination .btn-next,
+.el-pagination .btn-prev {
     background: none;
 }
 
@@ -76,7 +77,8 @@
     font-family: PingFang SC;
     font-weight: 400;
 }
-.xl_d_button:hover{
+
+.xl_d_button:hover {
     background: #0FB577;
     opacity: 1;
     border-radius: 18px;
@@ -89,6 +91,7 @@
     font-family: PingFang SC;
     font-weight: 400;
 }
+
 .xl_input /deep/.el-input__inner {
     width: 35.4vw;
     line-height: 64px;
@@ -98,4 +101,4 @@
     box-sizing: border-box;
     font-weight: 400;
     color: #929292;
-  }
+}