From 94ea746d16231c3e0aefaa73a76df79b7d93ab8f Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Thu, 14 Sep 2023 18:48:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=B1=BB=E5=88=AB,=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home.vue                       | 56 ++++++++++++++++++-----
 src/views/basic-dictionary/GuideType.vue | 58 ++++++++++++++++++++----
 src/views/common-settings/ItemType.vue   |  9 +++-
 src/views/user-list/UserList.vue         | 15 +++++-
 4 files changed, 112 insertions(+), 26 deletions(-)

diff --git a/src/views/Home.vue b/src/views/Home.vue
index 42929f5..1ea04ab 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -13,9 +13,34 @@
           />
           <div class="maintitle">神豚体检管理系统</div>
           <div style="margin-left: 5%">
+            <!-- <el-menu
+              router=""
+              :default-active="activeIndex"
+              class="el-menu-demo"
+              mode="horizontal"
+              @select="handleSelect"
+              style="
+                color: rgb(114, 105, 105);
+                font-weight: 700;
+                font-size: 18px;
+              "
+            >
+              <el-submenu index="2">
+                <img
+                  class="iconimg"
+                     style="width: 20px; line-height: 150px; padding-top: 5px"
+                  src="@/assets/images/usericon.png"
+                  alt=""
+                />
+                <template slot="title">用户权限管理</template>
+                <el-menu-item index="organization-units">科室设置</el-menu-item>
+                <el-menu-item index="2-2">选项2</el-menu-item>
+                <el-menu-item index="2-3">选项3</el-menu-item>
+              </el-submenu>
+            </el-menu> -->
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link">
                 <span style="margin-top: 10px">
@@ -28,7 +53,6 @@
                 </span>
                 用用户权限管理</span
               >
-              <!-- <span>     <img src="@/assets/images/users.png" alt="" style="width:20px;height:20px"></span> -->
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="organization-units"
                   >科室设置</el-dropdown-item
@@ -50,7 +74,7 @@
           >
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link" style="margin-left: 10px">
                 <img
@@ -124,7 +148,7 @@
           <div class="feesettings" style="margin-left: 20px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link">
                 <img
@@ -156,7 +180,7 @@
           <div class="commonsettings" style="margin-left: 20px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link">
                 <img
@@ -211,7 +235,7 @@
           <div class="examinationregistration" style="margin-left: 20px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
               class="dropdowncolor"
             >
               <span class="el-dropdown-link">
@@ -252,7 +276,7 @@
           <div class="physicalexamination" style="margin-left: 10px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link">体检</span>
               <el-dropdown-menu slot="dropdown">
@@ -269,7 +293,7 @@
           <div style="margin-left: 10px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link">体检查询</span>
               <el-dropdown-menu slot="dropdown" style="width: 170px">
@@ -293,7 +317,7 @@
           <div class="physicalexamination" style="margin-left: 15px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link"> 客户报表 </span>
               <el-dropdown-menu slot="dropdown">
@@ -334,7 +358,7 @@
           <div class="physicalexamination" style="margin-left: 15px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link"> 工作量统计 </span>
               <el-dropdown-menu slot="dropdown">
@@ -358,7 +382,7 @@
           <div class="physicalexamination" style="margin-left: 15px">
             <el-dropdown
               @command="handleCommand"
-              style="color: rgb(121, 114, 113); font-weight: 700"
+              style="color: rgb(114, 105, 105); font-weight: 700"
             >
               <span class="el-dropdown-link"> 收费 </span>
               <el-dropdown-menu slot="dropdown">
@@ -751,6 +775,9 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-menu--horizontal > .el-submenu .el-submenu__title {
+  font-size: 16px;
+}
 .dropdowncolor {
   font-size: 12px;
 }
@@ -868,10 +895,15 @@ export default {
   font-weight: 700;
   color: #000;
 }
-
+::v-deep .el-dropdown-menu item:not(.is-disabled) {
+  color: #fff;
+}
 .el-header {
   height: 70px;
 }
+::v-deep .el-select-dropdown {
+  background: #ccc;
+}
 .operateimg {
   position: relative;
   left: 0;
diff --git a/src/views/basic-dictionary/GuideType.vue b/src/views/basic-dictionary/GuideType.vue
index 23cd30d..02b238e 100644
--- a/src/views/basic-dictionary/GuideType.vue
+++ b/src/views/basic-dictionary/GuideType.vue
@@ -285,32 +285,59 @@
     </div>
     <!-- 按钮区域 -->
     <div style="margin-left: 10px; margin-top: 7%">
-      <el-button type="" @click="guideadd" style="width: 100px;color:#2BCA84;font-weight: 700;">新增</el-button>
+      <el-button
+        type=""
+        @click="guideadd"
+        style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
+        >新增</el-button
+      >
       <div style="margin-top: 10px">
-        <el-button type="" @click="editandmofin" style="width: 100px;color:#2BCA84;font-weight: 700;"
+        <el-button
+          type=""
+          @click="editandmofin"
+          style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
           >编辑</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" @click="confirmdeltion" style="width: 100px;color:#2BCA84;font-weight: 700;"
+        <el-button
+          type=""
+          @click="confirmdeltion"
+          style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
           >删除</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" @click="topping" style="width: 100px;color:#2BCA84;font-weight: 700;"
+        <el-button
+          type=""
+          @click="topping"
+          style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
           >置顶</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" @click="setlow" style="width: 100px;color:#2BCA84;font-weight: 700;">置底</el-button>
+        <el-button
+          type=""
+          @click="setlow"
+          style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
+          >置底</el-button
+        >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" :disabled="isshow" @click="assertion"
-         style="width: 100px;color:#2BCA84;font-weight: 700;" >排序</el-button
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="assertion"
+          style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
+          >排序</el-button
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="" :disabled="isshow" @click="cancellation" style="width: 100px;color:#2BCA84;font-weight: 700;"
+        <el-button
+          type=""
+          :disabled="isshow"
+          @click="cancellation"
+          style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
           >取消</el-button
         >
       </div>
@@ -322,14 +349,24 @@
           name="用户信息"
           style="width: 100px; margin-left: 0px"
         >
-          <el-button type="" style="width: 100px;color:#2BCA84;font-weight: 700;">导出</el-button>
+          <el-button
+            type=""
+            style="width: 100px; color: #349d2f; font-weight: 700; height: 35px"
+            >导出</el-button
+          >
         </download-excel>
       </div>
       <div style="margin-top: 10px">
         <el-button
           type=""
           v-print="{ id: 'printTest', extraHead: '用户信息' }"
-          style="margin-left: 0px;width: 100px;color:#2BCA84;font-weight: 700;"
+          style="
+            margin-left: 0px;
+            width: 100px;
+            color:#349D2F;
+            font-weight: 700;
+            height: 35px;
+          "
           >打印</el-button
         >
       </div>
@@ -795,6 +832,7 @@ export default {
 </script>
 <style scoped>
 .cardboder {
+  margin-left: -12px;
   margin-top: -15px;
   border-radius: 12px;
 }
diff --git a/src/views/common-settings/ItemType.vue b/src/views/common-settings/ItemType.vue
index 251bd16..39a76ac 100644
--- a/src/views/common-settings/ItemType.vue
+++ b/src/views/common-settings/ItemType.vue
@@ -65,8 +65,8 @@
           :close-on-click-modal="false"
         >
           <el-cascader
-            :options="options"
-            :props="{ checkStrictly: true }"
+            :options="itemtypedata"
+            :props="{ checkStrictly: true, value: 'id', label: 'displayName' }"
             clearable
           ></el-cascader>
           <el-form
@@ -181,6 +181,7 @@ import { getapi } from "@/api/api";
 export default {
   data() {
     return {
+      itemtypedata: [],
       rules: {
         displayName: [
           { required: true, message: "请输入名称", trigger: "blur" },
@@ -286,6 +287,10 @@ export default {
         this.form = res.data;
         console.log(res);
       });
+      getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => {
+        this.itemtypedata = res.data;
+        console.log(res, "222222222222222222");
+      });
     },
     // 删除
     deleates(node, data) {
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index 60e02be..7e64d30 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card>
+    <el-card class="orgindcard">
       <div class="publiccss">用户管理</div>
       <el-button type="primary" @click="newlyincreased" style="margin-top: 20px"
         >新增</el-button
@@ -1031,4 +1031,15 @@ export default {
   },
 };
 </script>
-<style lang="less" scoped></style>
+<style  scoped>
+::v-deep .el-card {
+  margin-top: -15px;
+  /* background-color: #000; */
+  border-radius: 15px;
+}
+/* ::v-deep .el-card__body {
+ 
+  margin-top: -15px;
+  border-radius: 15px;
+} */
+</style>