项目初始化

src/api/user.js

@@ -16,14 +16,6 @@ export function getInfo(token) {
   });
 }
 
-// 修改密码
-export function fixdata(data) {
-  return request({
-    url: "/ecloud-user-center/web/updtPwd",
-    method: "post",
-    data
-  });
-}
 // 忘记密码获取短信验证码
 export function forgetpaSms(data) {
   return request({
@@ -38,20 +30,4 @@ export function forgetpass(data) {
     method: "post",
     data
   });
-}
-// 个人中心查询用户信息
-export function QueryUserInfo(data) {
-  return request({
-    url: "/ecloud-user-center/web/user/QueryUserInfo",
-    method: "post",
-    data
-  });
-}
-// 个人中心修改用户信息
-export function UserCentUpdt(data) {
-  return request({
-    url: "/ecloud-user-center/web/user/UserCentUpdt ",
-    method: "post",
-    data
-  });
 }

src/router/index.js

@@ -38,7 +38,7 @@ export const constantRoutes = [
   {
     path: "/forgetpass",
     name: 'forgetpass',
-    component: () => import( "@/views/forgetpass/index"),
+    component: () => import("@/views/forgetpass/index"),
   },
   {
     path: "/",
@@ -49,15 +49,7 @@ export const constantRoutes = [
         path: "/homePage/dashboard",
         component: () => import("@/views/dashboard/index"),
         name: "Dashboard",
-        meta: { title: "首页", icon: "dashboard"},
-        hidden: true
-      },
-      {
-        // 个人中心
-        path: "/personalCenter",
-        component: () => import("@/views/page/personalCenter/index"),
-        name: "PersonalCenter",
-        meta: { title: "个人中心", icon: "dashboard" },
+        meta: { title: "首页", icon: "dashboard" },
         hidden: true
       },
       {
@@ -67,14 +59,6 @@ export const constantRoutes = [
         name: "NoticeDetail",
         meta: { title: "公告详情", icon: "dashboard" },
         hidden: true
-      },
-      {
-        // 修改密码
-        path: "/fixPass",
-        component: () => import("@/views/page/fixpass/index"),
-        name: "fixPass",
-        meta: { title: "修改密码", icon: "dashboard" },
-        hidden: true
       }
     ]
   },

src/styles/global.scss

@@ -28,18 +28,6 @@ li {
   list-style: none;
 }
 
-// 左边侧边栏
-.sidebar-logo-container {
-  background-color: #fff;
-}
-
-.common-box {
-  padding: 20px;
-  background-color: #fff;
-  border-radius: 6px;
-  overflow-y: auto;
-}
-
 .overflow {
   overflow: hidden;
   white-space: nowrap;
@@ -70,23 +58,47 @@ a {
   align-items: center;
 }
 
-// .el-scrollbar__bar.is-vertical {
-//   width: 10px;
-// }
+/*定义滚动条的样式*/
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+/*定义滚动条滑块的样式*/
+::-webkit-scrollbar-thumb {
+  background: #ccc;
+  border-radius: 10px;
+}
+
+/*定义滚动条轨道的背景颜色*/
+::-webkit-scrollbar-track {
+  background: #f1f1f1;
+}
+
+// 表格样式
+.el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
+  background: #F9FAFE;
+}
 
 .el-table {
 
+  th.el-table__cell.is-leaf,
+  td.el-table__cell {
+    border-bottom: none;
+  }
+
   .el-table__header-wrapper,
   .el-table__fixed-header-wrapper {
     th {
       word-break: break-word;
-      background-color: #f8f8f9;
+      background-color: #ECEFF6;
+      ;
       color: #515a6e;
-      height: 40px;
-      font-size: 13px;
+      height: 45px;
     }
   }
 
+
   // 滚动条的宽度
   .el-table__body-wrapper::-webkit-scrollbar {
     width: 10px; // 横向滚动条
@@ -102,10 +114,6 @@ a {
   .el-table__body-wrapper {
     position: relative;
 
-    .el-button [class*="el-icon-"]+span {
-      margin-left: 1px;
-    }
-
     .el-table__empty-text {
       display: inline-block;
       line-height: 25px;
@@ -129,8 +137,16 @@ a {
   color: #666;
 }
 
+//------------------------------公共样式开始-----------------------------------------
+// 公共div外部样式
+.common-box {
+  padding: 20px;
+  background-color: #fff;
+  border-radius: 6px;
+  overflow-y: auto;
+}
 
-// 富文本编辑器样式------------------------------开始-----------------------------------------
+// 富文本编辑器样式
 .editor-css {
   ul {
     li {
@@ -142,13 +158,11 @@ a {
     li {
       list-style: decimal;
     }
-
   }
 }
 
 // 面包屑导航
 .app-breadcrumb.el-breadcrumb {
-  font-size: 14px;
   line-height: 40px;
   margin-left: 20px;
   color: #616161;
@@ -157,22 +171,14 @@ a {
     color: $bg_color;
     cursor: text;
   }
-  .el-breadcrumb__separator{
+
+  .el-breadcrumb__separator {
     color: #898989;
   }
 }
 
-/*定义滚动条的样式*/
-::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-  }
-  /*定义滚动条滑块的样式*/
-  ::-webkit-scrollbar-thumb {
-  background: #ccc;
-  border-radius: 10px;
-  }
-  /*定义滚动条轨道的背景颜色*/
-  ::-webkit-scrollbar-track {
-  background: #f1f1f1;
-  }
+// 按钮湖蓝色------新增按钮
+.lake-Blue {
+  background: #52C8CC;
+  border: #52C8CC;
+}

src/styles/sidebar.scss

@@ -14,6 +14,11 @@
     margin-left: 0 !important;
   }
 
+  // 左边侧边栏
+  .sidebar-logo-container {
+    background-color: #fff;
+  }
+
   .sidebar-container {
     transition: width 0.28s;
     width: $sideBarWidth !important;

src/views/components/dicEle.vue

@@ -14,19 +14,14 @@
         ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          @click="getData('search')"
-          >查询
-        </el-button>
-        <el-button icon="el-icon-refresh" @click="reset()">清空</el-button>
+        <el-button type="primary" @click="getData('search')">查询 </el-button>
+        <el-button @click="reset()">重置</el-button>
       </el-form-item>
       <el-form-item>
         <el-button
           v-if="status != 'code'"
+          class="lake-Blue"
           type="primary"
-          plain
           icon="el-icon-plus"
           @click="handleAddOrEdit(null, null, 'create', 1)"
           >新增
@@ -44,7 +39,7 @@
       :load="load"
     >
       <template slot="empty">
-        <img src="../../assets/nopage.png" alt />
+        <img src="@/assets/nopage.png" alt />
         <p>暂无数据</p>
       </template>
       <el-table-column label="字典编码" v-if="status === 'code'">
@@ -113,10 +108,10 @@
           <el-button
             v-if="scope.row.invdFlag == '0'"
             @click.native="handleAddOrEdit(scope.$index, scope.row, 'update')"
-            style="color: #3c64dc"
+            style="color: #52c8cc"
             type="text"
             icon="el-icon-edit"
-            >修改</el-button
+            >编辑</el-button
           >
 
           <el-button
@@ -258,7 +253,7 @@ export default {
       listLoading: false,
       temp: {},
       textMap: {
-        update: "修改",
+        update: "编辑",
         create: "添加"
       },
       dialogFormVisible: false, //是否对话框

src/views/page/dataService/code/index.vue

@@ -65,29 +65,23 @@
             ref="table"
             v-loading="listLoading"
             :data="prefixData.prefix"
-            element-loading-text="Loading"
-            border
+            element-loading-text="加载中"
             fit
-            highlight-current-row
+            stripe
             @selection-change="selectRow"
           >
             <template slot="empty">
-              <img src="../../../../assets/nopage.png" alt />
+              <img src="@/assets/nopage.png" alt />
               <p>暂无数据</p>
             </template>
-            <el-table-column
-              type="selection"
-              width="45"
-              align="center"
-            ></el-table-column>
+            <el-table-column type="selection" width="45"></el-table-column>
             <el-table-column
               fixed
-              align="center"
               type="index"
               label="序号"
               width="60"
             ></el-table-column>
-            <el-table-column label="标识位" width="300" header-align="center">
+            <el-table-column label="标识位" width="300">
               <template #header>
                 <span style="color: red; margin-right: 4px">*</span>
                 <span>标识位</span>
@@ -116,7 +110,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="前缀" width="350" header-align="center">
+            <el-table-column label="前缀" width="350">
               <template #header>
                 <span style="color: red; margin-right: 4px">*</span>
                 <span>前缀</span>
@@ -151,7 +145,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="前缀说明" header-align="center">
+            <el-table-column label="前缀说明">
               <template slot-scope="scope">
                 <el-form-item label-width="0">
                   <el-input v-model="scope.row.codeDscr"></el-input>

src/views/page/dataService/dic/index.vue

@@ -15,9 +15,13 @@ export default {
 
   created() {},
 
-  methods: {},
+  methods: {}
 };
 </script>
 
-<style scoped>
+<style tyle="scss" scoped>
+::v-deep .el-table th.el-table__cell.is-leaf,
+::v-deep .el-table td.el-table__cell {
+  border-bottom: 1px solid #ebeef5 !important;
+}
 </style>

src/views/page/fixpass/index.vue

@@ -1,176 +0,0 @@
-<template>
-  <div class="common-box">
-    <el-tabs v-model="activeName">
-      <el-tab-pane label="修改密码" name="fixPass">
-        <el-col :span="10" class="col">
-          <el-form label-width="100px" :model="form" :rules="passRules" ref="Form">
-            <el-form-item label="原始密码" prop="initPwd">
-              <el-input
-                v-model.trim="form.initPwd"
-                type="password"
-                placeholder="请输入原始密码"
-                :show-password="isshow"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="新密码" prop="newPwd">
-              <el-input
-                v-model.trim="form.newPwd"
-                type="password"
-                placeholder="请输入新密码"
-                :show-password="isshow"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="确认新密码" prop="surePwd">
-              <el-input
-                v-model.trim="form.surePwd"
-                type="password"
-                :show-password="isshow"
-                placeholder="请确认新密码"
-              ></el-input>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="handleSubmit" style="margin-top: 10px"
-                >提交</el-button
-              >
-            </el-form-item>
-          </el-form>
-        </el-col>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-<script>
-import { fixdata } from "@/api/user";
-import md5 from "md5";
-import sha1 from "js-sha1";
-import { errno } from "errno";
-export default {
-  data() {
-    var validatePass = async (rules, value, callback) => {
-      // const reg = /^([a-z0-9\@]){6,20}$/i;
-      // if (reg.test(value)) {
-      //   callback();
-      // } else {
-      //   callback(new Error("可输入6-20位字母、数字和符合@的组合"));
-      // }
-      // const reg = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*])[\da-zA-Z~!@#$%^&*]{8,16}$/
-      const reg = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*.\/,;'])[\da-zA-Z~!@#$%^&*.\/,;']{8,16}$/
-      if (reg.test(value)) {
-        callback();
-      } else {
-        callback(new Error("必须包含数字、英文字母、特殊符号且8-16位"));
-      }
-    };
-    var validatenewPass = async (rules, value, callback) => {
-      const reg = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*.\/,;'])[\da-zA-Z~!@#$%^&*.\/,;']{8,16}$/
-      if (reg.test(value)) {
-        callback();
-      } else {
-        callback(new Error("必须包含数字、英文字母、特殊符号且8-16位"));
-      }
-    };
-    var validatesurePass = (rules, value, callback) => {
-      if (value === this.form.newPwd) {
-        callback();
-      } else {
-        callback(new Error("请保持两次输入一致"));
-      }
-    };
-    return {
-      isshow: true,
-      form: {},
-      activeName: "fixPass",
-      passRules: {
-        initPwd: [
-          {
-            required: true,
-            message: "请输入原始密码",
-            trigger: "blur",
-          },
-          {
-            validator: validatePass,
-            trigger: "blur",
-          },
-        ],
-        newPwd: [
-          {
-            required: true,
-            message: "请输入新密码",
-            trigger: "blur",
-          },
-          {
-            validator: validatenewPass,
-            trigger: "blur",
-          },
-        ],
-        surePwd: [
-          {
-            required: true,
-            message: "请确认新密码",
-            trigger: "blur",
-          },
-          {
-            validator: validatesurePass,
-            trigger: "blur",
-          },
-        ],
-      },
-      yspass:"",
-      newpass:"",
-      surenewpass:""
-    };
-  },
-  methods: {
-    handleSubmit() {
-      this.$refs["Form"].validate((valid) => {
-        if (valid) {
-          this.$confirm("确认提交", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          }).then(() => {
-            if(this.form.initPwd){
-              this.yspass = this.form.initPwd
-              this.form.initPwd = md5(sha1(this.form.initPwd).toUpperCase()).toUpperCase();
-            }
-            if(this.form.newPwd){
-              this.newpass = this.form.newPwd
-              this.form.newPwd = md5(sha1(this.form.newPwd).toUpperCase()).toUpperCase();
-            }
-            if (this.form.surePwd) {
-              this.surenewpass = this.form.surePwd
-              this.form.surePwd = md5(
-                sha1(this.form.surePwd).toUpperCase()
-              ).toUpperCase();
-            }
-            fixdata(this.form).then((res) => {
-              if (res.success == true) {
-                this.$message.success("修改密码成功");
-                this.form={};
-                let aa = this.$store.getters.visitedViews;
-                let bb = this.$route.path;
-                let view = aa.filter(function (obj) {
-                    return obj.path == bb;
-                });
-                this.$store.dispatch("tagsView/delView", view[0]);
-                this.$router.replace({ name: "Dashboard" });
-              } else {
-                this.$message.error("修改密码失败");
-              }
-            }).catch(() => {
-                this.form.initPwd = this.yspass;
-                 this.form.newPwd = this.newpass ;
-                 this.form.surePwd = this.surenewpass;
-            });
-          });
-        }
-      });
-    },
-  },
-};
-</script>
-<style scoped>
-.common-box ::v-deep .col {
-  padding: 20px;
-}
-</style>

src/views/page/mission/index.vue

@@ -38,10 +38,8 @@
               />
             </el-select>
           </el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch1()"
-            >查询</el-button
-          >
-          <el-button icon="el-icon-refresh" @click="empty1()">清空</el-button>
+          <el-button type="primary" @click="handleSearch1()">查询</el-button>
+          <el-button @click="empty1()">重置</el-button>
         </el-form>
         <el-table
           show-overflow-tooltip
@@ -49,28 +47,25 @@
           v-loading="Loading"
           :data="getOverview"
           element-loading-text="加载中..."
-          border
-          fit
-          highlight-current-row
           :row-class-name="tableRowClassName"
         >
           <template slot="empty">
             <img src="@/assets/nopage.png" alt />
             <p>暂无数据</p>
           </template>
-          <el-table-column fixed="left" type="index" label="序号" align="center" />
-          <el-table-column label="任务" prop="taskName" align="center" />
-          <el-table-column label="任务描述" width="280px" prop="taskText" align="center" />
-          <el-table-column label="业务类型" prop="taskType" align="center" />
-          <el-table-column label="发起人" prop="initrUserName" align="center" />
-          <el-table-column label="发起时间" prop="initrTime" align="center" />
-          <el-table-column label="任务状态" prop="dspoStas" align="center" width="90">
+          <el-table-column fixed="left" type="index" label="序号" align="center"/>
+          <el-table-column label="任务" prop="taskName" />
+          <el-table-column label="任务描述" width="280px" prop="taskText" />
+          <el-table-column label="业务类型" prop="taskType" />
+          <el-table-column label="发起人" prop="initrUserName" />
+          <el-table-column label="发起时间" prop="initrTime" />
+          <el-table-column label="任务状态" prop="dspoStas" width="90">
             <template slot-scope="scope">
-                <span v-if="scope.row.dspoStas == 0">待办</span>
-                <span v-if="scope.row.dspoStas == 1">已办</span>
+              <span v-if="scope.row.dspoStas == 0">待办</span>
+              <span v-if="scope.row.dspoStas == 1">已办</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" fixed="right" label="操作" width="100px" border>
+          <el-table-column fixed="right" label="操作" width="100px">
             <template slot-scope="scope">
               <el-button
                 @click.native="handleInfo(scope.row)"
@@ -128,39 +123,34 @@
               />
             </el-select>
           </el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch2()"
-            >查询</el-button
-          >
-          <el-button icon="el-icon-refresh" @click="empty2()">清空</el-button>
+          <el-button type="primary" @click="handleSearch2()">查询</el-button>
+          <el-button @click="empty2()">重置</el-button>
         </el-form>
         <el-table
           show-overflow-tooltip
           style="width: 100%"
           v-loading="Loading"
           :data="getDolist"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
+          element-loading-text="加载中"
           :row-class-name="tableRowClassName"
         >
           <template slot="empty">
             <img src="@/assets/nopage.png" alt />
             <p>暂无数据</p>
           </template>
-          <el-table-column fixed="left" type="index" label="序号" align="center" />
-          <el-table-column label="任务" prop="taskName" align="center" />
-          <el-table-column label="任务描述" width="280px" prop="taskText" align="center" />
-          <el-table-column label="业务类型" prop="taskType" align="center" />
-          <el-table-column label="发起人" prop="initrUserName" align="center" />
-          <el-table-column label="发起时间" prop="initrTime" align="center" />
-          <el-table-column label="任务状态" prop="dspoStas" align="center" width="90">
+          <el-table-column fixed="left" type="index" label="序号" />
+          <el-table-column label="任务" prop="taskName" />
+          <el-table-column label="任务描述" width="280px" prop="taskText" />
+          <el-table-column label="业务类型" prop="taskType" />
+          <el-table-column label="发起人" prop="initrUserName" />
+          <el-table-column label="发起时间" prop="initrTime" />
+          <el-table-column label="任务状态" prop="dspoStas" width="90">
             <template slot-scope="scope">
-                <span v-if="scope.row.dspoStas == 0">待办</span>
-                <span v-if="scope.row.dspoStas == 1">已办</span>
+              <span v-if="scope.row.dspoStas == 0">待办</span>
+              <span v-if="scope.row.dspoStas == 1">已办</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" fixed="right" label="操作" width="100px" border>
+          <el-table-column fixed="right" label="操作" width="100px">
             <template slot-scope="scope">
               <el-button
                 @click.native="handleInfo(scope.row)"
@@ -218,39 +208,36 @@
               />
             </el-select>
           </el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch3()"
-            >查询</el-button
-          >
-          <el-button icon="el-icon-refresh" @click="empty3()">清空</el-button>
+          <el-button type="primary" @click="handleSearch3()">查询</el-button>
+          <el-button @click="empty3()">重置</el-button>
         </el-form>
         <el-table
           show-overflow-tooltip
           style="width: 100%"
           v-loading="Loading"
           :data="getInitiated"
-          element-loading-text="Loading"
-          border
+          element-loading-text="加载中"
           fit
-          highlight-current-row
+          stripe
           :row-class-name="tableRowClassName"
         >
           <template slot="empty">
             <img src="@/assets/nopage.png" alt />
             <p>暂无数据</p>
           </template>
-          <el-table-column fixed="left" type="index" label="序号" align="center" />
-          <el-table-column label="任务" prop="taskName" align="center" />
-          <el-table-column label="任务描述" width="280px" prop="taskText" align="center" />
-          <el-table-column label="业务类型" prop="taskType" align="center" />
-          <el-table-column label="发起人" prop="initrUserName" align="center" />
-          <el-table-column label="发起时间" prop="initrTime" align="center" />
-          <el-table-column label="任务状态" prop="dspoStas" align="center" width="90">
+          <el-table-column fixed="left" type="index" label="序号" />
+          <el-table-column label="任务" prop="taskName" />
+          <el-table-column label="任务描述" width="280px" prop="taskText" />
+          <el-table-column label="业务类型" prop="taskType" />
+          <el-table-column label="发起人" prop="initrUserName" />
+          <el-table-column label="发起时间" prop="initrTime" />
+          <el-table-column label="任务状态" prop="dspoStas" width="90">
             <template slot-scope="scope">
-                <span v-if="scope.row.dspoStas == 0">待办</span>
-                <span v-if="scope.row.dspoStas == 1">已办</span>
+              <span v-if="scope.row.dspoStas == 0">待办</span>
+              <span v-if="scope.row.dspoStas == 1">已办</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" fixed="right" label="操作" width="100px" border>
+          <el-table-column fixed="right" label="操作" width="100px">
             <template slot-scope="scope">
               <el-button
                 @click.native="handleInfo(scope.row)"
@@ -308,39 +295,36 @@
               />
             </el-select>
           </el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch4()"
-            >查询</el-button
-          >
-          <el-button icon="el-icon-refresh" @click="empty4()">清空</el-button>
+          <el-button type="primary" @click="handleSearch4()">查询</el-button>
+          <el-button @click="empty4()">重置</el-button>
         </el-form>
         <el-table
           show-overflow-tooltip
           style="width: 100%"
           v-loading="Loading"
           :data="getProcessed"
-          element-loading-text="Loading"
-          border
+          element-loading-text="加载中"
           fit
-          highlight-current-row
+          stripe
           :row-class-name="tableRowClassName"
         >
           <template slot="empty">
             <img src="@/assets/nopage.png" alt />
             <p>暂无数据</p>
           </template>
-          <el-table-column fixed="left" type="index" label="序号" align="center" />
-          <el-table-column label="任务" prop="taskName" align="center" />
-          <el-table-column label="任务描述" width="280px" prop="taskText" align="center" />
-          <el-table-column label="业务类型" prop="taskType" align="center" />
-          <el-table-column label="发起人" prop="initrUserName" align="center" />
-          <el-table-column label="发起时间" prop="initrTime" align="center" />
-          <el-table-column label="任务状态" prop="dspoStas" align="center" width="90">
+          <el-table-column fixed="left" type="index" label="序号" />
+          <el-table-column label="任务" prop="taskName" />
+          <el-table-column label="任务描述" width="280px" prop="taskText" />
+          <el-table-column label="业务类型" prop="taskType" />
+          <el-table-column label="发起人" prop="initrUserName" />
+          <el-table-column label="发起时间" prop="initrTime" />
+          <el-table-column label="任务状态" prop="dspoStas" width="90">
             <template slot-scope="scope">
-                <span v-if="scope.row.dspoStas == 0">待办</span>
-                <span v-if="scope.row.dspoStas == 1">已办</span>
+              <span v-if="scope.row.dspoStas == 0">待办</span>
+              <span v-if="scope.row.dspoStas == 1">已办</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" fixed="right" label="操作" width="100px" border>
+          <el-table-column fixed="right" label="操作" width="100px">
             <template slot-scope="scope">
               <el-button
                 @click.native="handleInfo(scope.row)"
@@ -372,7 +356,7 @@ import { tasksDetail } from "@/api/mission/index";
 import { getQueryDic } from "@/api/system/dic";
 export default {
   components: {
-    ylPagination,
+    ylPagination
   },
   data() {
     return {
@@ -382,7 +366,7 @@ export default {
         initrUserName: "",
         taskType: "",
         size: 10,
-        current: 1,
+        current: 1
       },
       activeName: "first",
       Loading: false,
@@ -393,7 +377,7 @@ export default {
       getOverview: [],
       getDolist: [],
       getInitiated: [],
-      getProcessed: [],
+      getProcessed: []
     };
   },
   methods: {
@@ -403,11 +387,11 @@ export default {
       });
     },
     // 待办显示灰色
-    tableRowClassName({row, rowIndex}) {
-      if(row.dspoStas=='0'){
-        return 'warning-row';
+    tableRowClassName({ row, rowIndex }) {
+      if (row.dspoStas == "0") {
+        return "warning-row";
       }
-      return ''
+      return "";
     },
     // 清空
     empty1() {
@@ -426,21 +410,21 @@ export default {
       this.$refs.formSearch1.resetFields();
       this.fetchData4();
     },
-    handleSearch1(){
+    handleSearch1() {
       this.formSearch1.current = "1";
-      this.fetchData1()
+      this.fetchData1();
     },
-    handleSearch2(){
+    handleSearch2() {
       this.formSearch1.current = "1";
-      this.fetchData2()
+      this.fetchData2();
     },
-    handleSearch3(){
+    handleSearch3() {
       this.formSearch1.current = "1";
-      this.fetchData3()
+      this.fetchData3();
     },
-    handleSearch4(){
+    handleSearch4() {
       this.formSearch1.current = "1";
-      this.fetchData4()
+      this.fetchData4();
     },
     // 0待办，1已处理，2我发起，3任务概览
     fetchData1() {
@@ -448,8 +432,8 @@ export default {
       this.formSearch1.taskStas = "3";
       let formSearch2 = JSON.parse(JSON.stringify(this.formSearch1));
       let qwe = [];
-      let qq1 = Date.parse(formSearch2.initrTime[0]+" 00:00:00") + "";
-      let qq2 = Date.parse(formSearch2.initrTime[1]+" 23:59:59") + "";
+      let qq1 = Date.parse(formSearch2.initrTime[0] + " 00:00:00") + "";
+      let qq2 = Date.parse(formSearch2.initrTime[1] + " 23:59:59") + "";
       qwe.push(qq1, qq2);
       if (formSearch2.initrTime.length != 0) {
         formSearch2.initrTime = qwe;
@@ -481,8 +465,8 @@ export default {
       this.formSearch1.taskStas = "0";
       let formSearch2 = JSON.parse(JSON.stringify(this.formSearch1));
       let qwe = [];
-      let qq1 = Date.parse(formSearch2.initrTime[0]+" 00:00:00") + "";
-      let qq2 = Date.parse(formSearch2.initrTime[1]+" 23:59:59") + "";
+      let qq1 = Date.parse(formSearch2.initrTime[0] + " 00:00:00") + "";
+      let qq2 = Date.parse(formSearch2.initrTime[1] + " 23:59:59") + "";
       qwe.push(qq1, qq2);
       if (formSearch2.initrTime.length != 0) {
         formSearch2.initrTime = qwe;
@@ -503,8 +487,8 @@ export default {
       this.formSearch1.taskStas = "2";
       let formSearch2 = JSON.parse(JSON.stringify(this.formSearch1));
       let qwe = [];
-      let qq1 = Date.parse(formSearch2.initrTime[0]+" 00:00:00") + "";
-      let qq2 = Date.parse(formSearch2.initrTime[1]+" 23:59:59") + "";
+      let qq1 = Date.parse(formSearch2.initrTime[0] + " 00:00:00") + "";
+      let qq2 = Date.parse(formSearch2.initrTime[1] + " 23:59:59") + "";
       qwe.push(qq1, qq2);
       if (formSearch2.initrTime.length != 0) {
         formSearch2.initrTime = qwe;
@@ -525,8 +509,8 @@ export default {
       this.formSearch1.taskStas = "1";
       let formSearch2 = JSON.parse(JSON.stringify(this.formSearch1));
       let qwe = [];
-      let qq1 = Date.parse(formSearch2.initrTime[0]+" 00:00:00") + "";
-      let qq2 = Date.parse(formSearch2.initrTime[1]+" 23:59:59") + "";
+      let qq1 = Date.parse(formSearch2.initrTime[0] + " 00:00:00") + "";
+      let qq2 = Date.parse(formSearch2.initrTime[1] + " 23:59:59") + "";
       qwe.push(qq1, qq2);
       if (formSearch2.initrTime.length != 0) {
         formSearch2.initrTime = qwe;
@@ -562,9 +546,9 @@ export default {
       const aa = JSON.parse(row.taskArgs);
       this.$router.push({
         name: row.routePath,
-        query: { itemData: JSON.stringify(row) },
+        query: { itemData: JSON.stringify(row) }
       });
-      
+
       // if(row.taskType==='药品采购'){
       //   this.$router.push({
       //     name: "drugApprove",
@@ -586,12 +570,12 @@ export default {
       //     // query: { itemData: JSON.stringify(row.orgId) }
       //   });
       // }
-    },
+    }
   },
   mounted() {
     this.fetchData1();
     this.getMiData();
-  },
+  }
 };
 </script>
 

src/views/page/personalCenter/index.vue

@@ -1,265 +0,0 @@
-<template>
-  <div>
-    <!-- 我的信息 -->
-    <div class="content">
-      <el-tabs v-model="activeInfoName">
-        <!-- 个人信息 -->
-        <el-tab-pane label="个人信息" name="info">
-          <el-form  ref="dataForm" :rules="rules" :model="temp1" label-width="100px">
-            <el-form-item label="用户编码：" prop="loginId">
-              <el-input style="width: 40%; margin-right: 40px"
-              v-model.trim="temp1.loginId" readonly></el-input>
-            </el-form-item>
-            <el-form-item label="用户名：" prop="userName">
-              <el-input style="width: 40%; margin-right: 40px" 
-              placeholder="请输入用户名"
-              v-model.trim="temp1.userName"></el-input>
-            </el-form-item>
-            <!-- <el-form-item label="机构：" prop="orgName">
-              <el-input style="width: 40%; margin-right: 40px" 
-              v-model="temp1.orgName"></el-input>
-            </el-form-item> -->
-            <!-- <el-form-item label="年龄：" prop="age">
-              <el-input style="width: 40%; margin-right: 40px" 
-              v-model.trim="temp1.age"
-              placeholder="请输入"></el-input>
-            </el-form-item> -->
-            <!-- <el-form-item label="性别：" prop="gend">
-              <el-select 
-              style="width: 40%; margin-right: 40px" 
-              v-model="temp1.gend"
-              placeholder="请选择性别"
-              >
-                <el-option
-                  v-for="item in shiOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item> -->
-            <el-form-item label="联系方式：" prop="coninfo">
-              <el-input style="width: 40%; margin-right: 40px" 
-              v-model.trim="temp1.coninfo"
-              placeholder="请输入联系方式"></el-input>
-            </el-form-item>
-            <!-- <el-form-item label="身份证号：" prop="idCard">
-              <el-input style="width: 40%; margin-right: 40px" 
-              v-model.trim="temp1.idCard"
-              placeholder="请输入身份证号"></el-input>
-            </el-form-item> -->
-            <el-form-item label="邮箱号：" prop="email">
-              <el-input style="width: 40%; margin-right: 40px" 
-              v-model.trim="temp1.email"
-              maxlength="40"
-              placeholder="请输入邮箱号"></el-input>
-            </el-form-item>
-            <!-- <el-form-item label="部门：" prop="dept">
-              <el-input style="width: 40%; margin-right: 40px" 
-              v-model.trim="temp1.dept"
-              placeholder="请输入部门"></el-input>
-            </el-form-item>
-            <el-form-item label="所学专业：" prop="proftech">
-              <el-input style="width: 40%; margin-right: 40px" 
-              v-model.trim="temp1.proftech"
-              placeholder="请输入所学专业"></el-input>
-            </el-form-item>
-            <el-form-item label="职称：" prop="profttl">
-              <el-input style="width: 40%; margin-right: 40px" 
-              v-model.trim="temp1.profttl"
-              placeholder="请输入职称"></el-input>
-            </el-form-item> -->
-          </el-form>
-        
-          <div style="margin-top:40px;margin-left:10%">
-            <el-button type="primary" @click="handleClick()"
-            style="width: 10%;">提交</el-button>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getInfo,QueryUserInfo,UserCentUpdt } from "@/api/user";
-export default {
-  data() {
-    return {
-      // 个人信息的状态
-      activeInfoName: "info",
-      // 个人信息
-      temp1: {
-        userName:"",
-        loginId:"",
-        age:"",
-        gend:"",
-        coninfo:"",
-        email:"",
-      },
-      shiOptions: [
-        { value: "0", label: "男" },
-        { value: "1", label: "女" },
-      ],
-      rules: {
-        userName: [
-          {
-            required: true,
-            message: "用户名称不能为空",
-            trigger: "blur",
-          },
-          {
-            min: 2,
-            max: 20,
-            message: "用户名称长度必须介于 2 和 20 之间",
-            trigger: "blur",
-          },
-        ],
-        age: [
-          {
-            required: true,
-            message: "年龄不能为空",
-            trigger: "blur",
-          },
-          {
-            pattern: /^(?:[1-9][0-9]?|1[01][0-9]|120)$/,
-            message: "请输入正确的格式",
-            trigger: "blur",
-          },
-        ],
-        idCard: [
-          {
-            required: true,
-            message: "身份证号不能为空",
-            trigger: "blur",
-          },
-          {
-            pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
-            message: "请输入正确的身份证格式",
-            trigger: "blur",
-          },
-        ],
-        email: [
-          {
-            required: true,
-            message: "邮箱不能为空",
-            trigger: "blur",
-          },
-          {
-            pattern: /^([a-zA-Z0-9]+[-_\.]?)+@[a-zA-Z0-9]+\.[a-z]+$/,
-            message: "请输入正确的邮箱格式",
-            trigger: "blur",
-          },
-        ],
-        gend: [
-          {
-            required: false,
-            message: "性别不能为空",
-            trigger: "change",
-          },
-        ],
-        coninfo: [
-          {
-            required: true,
-            message: "联系方式不能为空",
-            trigger: "blur",
-          },
-          {
-            pattern: /^1(?:3\d|4[4-9]|5[0-35-9]|6[67]|7[013-8]|8\d|9\d)\d{8}$/,
-            message: "请输入正确的格式",
-            trigger: "blur",
-          },
-        ],
-        dept: [
-          {
-            required: false,
-            message: "部门不能为空",
-            trigger: "blur",
-          },
-        ],
-        proftech: [
-          {
-            required: false,
-            message: "所学专业不能为空",
-            trigger: "blur",
-          },
-        ],
-        profttl: [
-          {
-            required: false,
-            message: "职称不能为空",
-            trigger: "blur",
-          },
-        ],
-      },
-      loginId:"",
-    };
-  },
-
-  created() {
-    this.getInfoList();
-  },
-
-  methods: {
-    // 获取个人信息列表
-    getInfoList() {
-      getInfo().then((response) => {
-        let data = response.data.userContext;
-        this.temp1.loginId = data.loginId;
-        QueryUserInfo({id:data.loginId}).then((res) => {
-          this.temp1.userName = res.data.userName
-          // this.temp1.age = res.data.age
-          this.temp1.gend = res.data.gend
-          this.temp1.coninfo = res.data.coninfo
-          this.temp1.email = res.data.email
-        });
-      });
-    },
-    // 提交
-    handleClick(){
-      this.$refs["dataForm"].validate((valid) => {
-        if (valid) {
-          this.$confirm("确认提交", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          }).then(() => {
-            UserCentUpdt(this.temp1).then((res)=>{
-              this.$message.success("修改成功");
-              localStorage.clear();
-              this.$store.dispatch('user/resetToken');
-              this.$router.push(`/login`);
-              // let aa = this.$store.getters.visitedViews;
-              // let bb = this.$route.path;
-              // let view = aa.filter(function (obj) {
-              //   return obj.path == bb;
-              // });
-              // this.$store.dispatch("tagsView/delView", view[0]);
-              // this.$router.push("/homePage/dashboard");
-            }).catch((e)=>{
-            })
-          });
-        }
-      });
-    }
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.content {
-  width: 100%;
-  height: 100vh;
-  background: #fff no-repeat;
-  background-attachment: fixed;
-  box-sizing: border-box;
-  background-size: 100% 100%;
-}
-::v-deep .el-tabs{
-  margin: 20px;
-}
-::v-deep .el-textarea__inner{
-  max-height: 150px;
-}
-</style>

src/views/page/system/function/compontents/funTree.vue

@@ -3,7 +3,7 @@
     <div style="margin-bottom: 20px">
       <el-button
         type="primary"
-        plain
+        class="lake-Blue"
         icon="el-icon-plus"
         @click="handleAddOrEdit('menu', null, 'create')"
         >新增</el-button
@@ -15,11 +15,11 @@
       :data="menuData"
       row-key="id"
       :expand-row-keys="defaultKeys"
-      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" 
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       @expand-change="rowClick"
     >
       <template slot="empty">
-        <img src="../../../../../assets/nopage.png" alt />
+        <img src="@/assets/nopage.png" alt />
         <p>暂无数据</p> </template
       ><el-table-column prop="remark" label="名称"></el-table-column>
       <el-table-column prop="icon" label="图标">
@@ -41,7 +41,7 @@
       </el-table-column>
       <el-table-column prop="id" label="编码"></el-table-column>
       <el-table-column prop="sort" label="排序"></el-table-column>
-      <el-table-column align="center" fixed="right" label="操作" width="300">
+      <el-table-column fixed="right" label="操作" width="300">
         <template slot-scope="scope">
           <el-button
             v-if="
@@ -53,7 +53,8 @@
             type="text"
             icon="el-icon-plus"
             >新增菜单</el-button
-          ><el-button
+          >
+          <el-button
             v-if="
               scope.row.menuType == 'MENU' &&
               (!scope.row.children ||
@@ -68,10 +69,10 @@
           <el-button
             v-if="scope.row.menuType == 'MENU'"
             @click.native="update('menu', scope.row)"
-            style="color: #3C64DC"
+            style="color: #52c8cc"
             type="text"
             icon="el-icon-edit"
-            >修改</el-button
+            >编辑</el-button
           >
           <el-button
             v-if="scope.row.menuType == 'MENU'"
@@ -85,10 +86,10 @@
           <el-button
             v-if="scope.row.menuType == 'BUTTON'"
             @click.native="update('button', scope.row)"
-            style="color: #3C64DC"
+            style="color: #52c8cc"
             type="text"
             icon="el-icon-edit"
-            >修改</el-button
+            >编辑</el-button
           >
           <el-button
             v-if="scope.row.menuType == 'BUTTON'"
@@ -158,14 +159,10 @@ export default {
     defaultMenu: {
       //默认选中菜单
       type: Array,
-      default: [],
-    },
-  },
-  watch: {
-    // defaultMenu(newV, oldV) {
-    //   this.getMenuData();
-    // },
+      default: []
+    }
   },
+  watch: {},
   data() {
     return {
       // 菜单还是按钮
@@ -176,24 +173,24 @@ export default {
       dialogFormVisible: false, //是否对话框
       dialogStatus: "",
       textMap: {
-        update: "修改",
-        create: "添加",
+        update: "编辑",
+        create: "添加"
       },
       temp: {}, //菜单表单提交
       rules: {
         menuId: [
-          { required: true, message: "请输入菜单编码", trigger: "blur" },
+          { required: true, message: "请输入菜单编码", trigger: "blur" }
         ],
         menuName: [
-          { required: true, message: "请输入菜单名称", trigger: "blur" },
+          { required: true, message: "请输入菜单名称", trigger: "blur" }
         ],
         oprtId: [
-          { required: true, message: "请输入按钮编码", trigger: "blur" },
+          { required: true, message: "请输入按钮编码", trigger: "blur" }
         ],
         oprtName: [
-          { required: true, message: "请输入按钮名称", trigger: "blur" },
-        ],
-      },
+          { required: true, message: "请输入按钮名称", trigger: "blur" }
+        ]
+      }
     };
   },
   created() {
@@ -242,7 +239,7 @@ export default {
                 name: item2.name,
                 redirect: item2.redirect,
                 router: item2.router,
-                hidden: item2.hidden,
+                hidden: item2.hidden
               };
               data.push(item1);
             }
@@ -256,7 +253,7 @@ export default {
                 menuType: item2.menuType,
                 remark: item1.menuName,
                 parentId: item1.parentId,
-                sort: item1.sort,
+                sort: item1.sort
               };
               data.push(item1);
             }
@@ -348,7 +345,7 @@ export default {
           menuName: row.remark,
           sort: row.sort,
           type: "del",
-          parentId: row.parentId,
+          parentId: row.parentId
         };
       } else {
         this.temp = {
@@ -358,14 +355,14 @@ export default {
           oprtName: row.remark,
           // sort: row.sort,
           type: "del",
-          parentId: row.parentId,
+          parentId: row.parentId
         };
       }
 
       this.$confirm("确认提交", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       }).then(() => {
         if (type == "menu") {
           setFun(this.temp).then((response) => {
@@ -396,7 +393,7 @@ export default {
           this.$confirm("确认提交", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
-            type: "warning",
+            type: "warning"
           }).then(() => {
             if (this.dialogStatus === "create") {
               this.$emit("commitMenu", this.temp, "create", this.statue);
@@ -420,7 +417,7 @@ export default {
             menuName: row.remark,
             sort: row.sort,
             type: "updt",
-            parentId: row.parentId,
+            parentId: row.parentId
           };
         } else {
           this.temp = {
@@ -429,7 +426,7 @@ export default {
             oprtId: row.id,
             oprtName: row.remark,
             type: "updt",
-            parentId: row.parentId,
+            parentId: row.parentId
           };
         }
       } else {
@@ -440,7 +437,7 @@ export default {
             menuName: "",
             sort: "",
             type: "add",
-            parentId: row ? row.id : 0,
+            parentId: row ? row.id : 0
           };
         } else {
           this.temp = {
@@ -449,7 +446,7 @@ export default {
             oprtId: "",
             oprtName: "",
             type: "add",
-            parentId: row ? row.id : 0,
+            parentId: row ? row.id : 0
           };
         }
       }
@@ -458,10 +455,14 @@ export default {
       this.$nextTick(() => {
         this.$refs["dataForm"].clearValidate();
       });
-    },
-  },
+    }
+  }
 };
 </script>
 
-<style scoped>
+<style type="scss" scoped >
+::v-deep .el-table th.el-table__cell.is-leaf,
+::v-deep .el-table td.el-table__cell {
+  border-bottom: 1px solid #ebeef5 !important;
+}
 </style>

src/views/page/system/log/index.vue

@@ -48,63 +48,47 @@
           />
         </el-select>
       </el-form-item>
-      <div style="margin-bottom:20px">
-      <el-button type="primary" icon="el-icon-search" @click="fetchData()"
-        >查询</el-button
-      >
-      <el-button icon="el-icon-refresh" @click="empty()">清空</el-button>
+      <div style="margin-bottom: 20px">
+        <el-button type="primary" @click="fetchData()">查询</el-button>
+        <el-button @click="empty()">重置</el-button>
       </div>
     </el-form>
 
-
-  <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane
-      :label="item.label"
-      :name="item.id"
-      v-for="item in tabs"
-      :key="item.id"
-    >
-    <el-table
-      v-loading="Loading"
-      :data="getData"
-      element-loading-text="Loading"
-      border
-      fit
-      highlight-current-row  
-    >
-      <template slot="empty">
-        <img src="../../../../assets/nopage.png" alt />
-        <p>暂无数据</p>
-      </template>
-      <el-table-column
-        fixed
-        align="center"
-        type="index"
-        label="序号"
-        width="60"
-      />
-      <el-table-column prop="oprtType" label="操作类型" align="center" />
-      <el-table-column prop="oprtActi" label="操作动作" align="center">
-      </el-table-column>
-      <el-table-column label="操作人" width="200" align="center" prop="opter" />
-      <!-- <el-table-column prop="oprtObj" label="操作对象" align="center" /> -->
-      <el-table-column
-        align="center"
-        label="操作时间"
-        width="200"
-        prop="oprtTime"
-      />
-    </el-table>
-    <!--分页-->
-    <yl-pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="formSearch.current"
-      :limit.sync="formSearch.size"
-      @pagination="fetchData"
-    />
-    </el-tab-pane>
-  </el-tabs>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane
+        :label="item.label"
+        :name="item.id"
+        v-for="item in tabs"
+        :key="item.id"
+      >
+        <el-table
+          v-loading="Loading"
+          :data="getData"
+          element-loading-text="加载中"
+          fit
+          stripe
+        >
+          <template slot="empty">
+            <img src="@/assets/nopage.png" alt />
+            <p>暂无数据</p>
+          </template>
+          <el-table-column fixed type="index" label="序号" width="60" />
+          <el-table-column prop="oprtType" label="操作类型" />
+          <el-table-column prop="oprtActi" label="操作动作"> </el-table-column>
+          <el-table-column label="操作人" width="200" prop="opter" />
+          <!-- <el-table-column prop="oprtObj" label="操作对象" /> -->
+          <el-table-column label="操作时间" width="200" prop="oprtTime" />
+        </el-table>
+        <!--分页-->
+        <yl-pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="formSearch.current"
+          :limit.sync="formSearch.size"
+          @pagination="fetchData"
+        />
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
@@ -113,7 +97,7 @@ import { getLogData, getLogType } from "@/api/system/log";
 import ylPagination from "@/components/yl-pagination";
 export default {
   components: {
-    ylPagination,
+    ylPagination
   },
 
   data() {
@@ -122,16 +106,16 @@ export default {
       tabs: [
         {
           id: "drugs",
-          label: "药品",
+          label: "药品"
         },
         {
           id: "consumables",
-          label: "耗材",
+          label: "耗材"
         },
         {
           id: "equipment",
-          label: "设备",
-        },
+          label: "设备"
+        }
       ],
       tab: "drugs",
       activeName: "drugs",
@@ -144,16 +128,16 @@ export default {
         opter: "",
         oprtType: "",
         oprtActi: "",
-        prodType:"",
+        prodType: "",
         current: 1,
-        size: 10,
+        size: 10
       },
       TypeData: [],
       ActionData: [
         { value: "0", label: "新增" },
-        { value: "1", label: "修改" },
-        { value: "2", label: "删除" },
-      ],
+        { value: "1", label: "编辑" },
+        { value: "2", label: "删除" }
+      ]
     };
   },
   methods: {
@@ -166,7 +150,7 @@ export default {
     },
     fetchData() {
       this.Loading = true;
-      this.formSearch.prodType = this.tab
+      this.formSearch.prodType = this.tab;
       getLogData(
         this.formSearch
         // tableType: "hosp",
@@ -194,13 +178,13 @@ export default {
     // 标签页
     handleClick(tab) {
       this.tab = tab.name;
-      this.fetchData()
-    },
+      this.fetchData();
+    }
   },
   mounted() {
     this.oprtTypeData();
     this.fetchData();
-  },
+  }
 };
 </script>
 

src/views/page/system/notice/components/roles.vue

@@ -15,10 +15,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          @click="getData(true, 'search')"
+        <el-button type="primary" @click="getData(true, 'search')"
           >查询</el-button
         >
       </el-form-item>
@@ -32,31 +29,20 @@
         @selection-change="handleSelectionChange"
         v-loading="listLoading"
         :data="list"
-        element-loading-text="Loading"
-        border
+        element-loading-text="加载中"
         fit
-        highlight-current-row
+        stripe
       >
         <template slot="empty">
-          <img src="../../../../../assets/nopage.png" alt />
+          <img src="@/assets/nopage.png" alt />
           <p>暂无数据</p>
         </template>
-        <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-          reserve-selection
-        >
+        <el-table-column type="selection" width="55" reserve-selection>
         </el-table-column>
-        <el-table-column
-          align="center"
-          type="index"
-          label="序号"
-          width="60"
-        ></el-table-column>
-        <el-table-column label="角色编码" align="center" prop="id" />
+        <el-table-column type="index" label="序号" width="60"></el-table-column>
+        <el-table-column label="角色编码" prop="id" />
 
-        <el-table-column label="角色名称" align="center" prop="name" />
+        <el-table-column label="角色名称" prop="name" />
       </el-table>
     </div>
 
@@ -81,14 +67,14 @@ import ylPagination from "@/components/yl-pagination";
 
 export default {
   components: {
-    ylPagination,
+    ylPagination
   },
 
   props: {
     checkRole: {
       type: Array,
-      default: [],
-    },
+      default: []
+    }
   },
 
   data() {
@@ -102,8 +88,8 @@ export default {
         roleName: "",
         current: 1,
         size: 10,
-        roleId: "",
-      },
+        roleId: ""
+      }
     };
   },
 
@@ -151,7 +137,7 @@ export default {
             response.data.records.forEach((item) => {
               this.list.push({
                 id: item.roleId,
-                name: item.roleName,
+                name: item.roleName
               });
             });
           }
@@ -164,8 +150,8 @@ export default {
         .catch((err) => {
           this.listLoading = false;
         });
-    },
-  },
+    }
+  }
 };
 </script>
 

src/views/page/system/notice/components/users.vue

@@ -15,10 +15,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          @click="getData(true, 'search')"
+        <el-button type="primary" @click="getData(true, 'search')"
           >查询
         </el-button>
       </el-form-item>
@@ -31,30 +28,19 @@
         @selection-change="handleSelectionChange"
         v-loading="listLoading"
         :data="list"
-        element-loading-text="Loading"
-        border
+        element-loading-text="加载中"
         fit
-        highlight-current-row
+        stripe
       >
         <template slot="empty">
-          <img src="../../../../../assets/nopage.png" alt />
+          <img src="@/assets/nopage.png" alt />
           <p>暂无数据</p>
         </template>
-        <el-table-column
-          align="center"
-          type="selection"
-          width="55"
-          reserve-selection
-        >
+        <el-table-column type="selection" width="55" reserve-selection>
         </el-table-column>
-        <el-table-column
-          align="center"
-          type="index"
-          label="序号"
-          width="60"
-        ></el-table-column>
-        <el-table-column label="用户编码" align="center" prop="id" />
-        <el-table-column label="用户名称" align="center" prop="name" />
+        <el-table-column type="index" label="序号" width="60"></el-table-column>
+        <el-table-column label="用户编码" prop="id" />
+        <el-table-column label="用户名称" prop="name" />
       </el-table>
     </div>
 
@@ -80,13 +66,13 @@ import ylPagination from "@/components/yl-pagination";
 
 export default {
   components: {
-    ylPagination,
+    ylPagination
   },
   props: {
     checkUser: {
       type: Array,
-      default: [],
-    },
+      default: []
+    }
   },
 
   watch: {},
@@ -102,8 +88,8 @@ export default {
         userName: "",
         current: 1,
         size: 10,
-        userId: "",
-      },
+        userId: ""
+      }
     };
   },
   created() {
@@ -149,7 +135,7 @@ export default {
             response.data.records.forEach((item) => {
               this.list.push({
                 id: item.userId,
-                name: item.userName,
+                name: item.userName
               });
             });
           }
@@ -162,8 +148,8 @@ export default {
         .catch((err) => {
           this.listLoading = false;
         });
-    },
-  },
+    }
+  }
 };
 </script>
 

src/views/page/system/notice/index.vue

@@ -20,19 +20,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          @click="getData('search')"
-        >
-          查询
-        </el-button>
-        <el-button icon="el-icon-refresh" @click="reset()">清空</el-button>
+        <el-button type="primary" @click="getData('search')"> 查询 </el-button>
+        <el-button @click="reset()">重置</el-button>
       </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
-          plain
+          class="lake-Blue"
           icon="el-icon-plus"
           @click="handleAddOrEdit(0, null, 'create')"
         >
@@ -50,37 +44,29 @@
         <el-table
           v-loading="listLoading"
           :data="list"
-          element-loading-text="Loading"
-          border
+          element-loading-text="加载中"
           fit
-          highlight-current-row
+          stripe
         >
           <template slot="empty">
-            <img src="../../../../assets/nopage.png" alt />
+            <img src="@/assets/nopage.png" alt />
             <p>暂无数据</p>
           </template>
           <el-table-column
             fixed
-            align="center"
             type="index"
             label="序号"
             width="60"
           ></el-table-column>
-          <el-table-column label="公告标题" align="center" prop="msgTitle" />
-          <el-table-column label="公告类型" align="center" width="200">
+          <el-table-column label="公告标题" prop="msgTitle" />
+          <el-table-column label="公告类型" width="200">
             <template slot-scope="scope">{{
               reversedMessage(scope.row.msgType)
             }}</template>
           </el-table-column>
-          <el-table-column
-            label="发布者"
-            align="center"
-            width="200"
-            prop="msgPubdUser"
-          />
+          <el-table-column label="发布者" width="200" prop="msgPubdUser" />
           <el-table-column
             v-if="activeName == '1'"
-            align="center"
             label="发布时间"
             width="200"
           >
@@ -89,26 +75,21 @@
             </template>
           </el-table-column>
 
-          <el-table-column
-            align="center"
-            fixed="right"
-            label="操作"
-            width="180"
-          >
+          <el-table-column fixed="right" label="操作" width="180">
             <template slot-scope="scope">
               <el-button
                 v-if="activeName == '0'"
                 icon="el-icon-edit"
-                style="color: #409eff"
+                style="color: #52C8CC;"
                 :disabled="scope.row.state === 'deleted'"
                 type="text"
                 @click="handleAddOrEdit(scope.$index, scope.row, 'update')"
-                >修改
+                >编辑
               </el-button>
 
               <el-button
                 icon="el-icon-delete"
-                style="color: #f56c6c"
+                style="color: #CE4745;"
                 :disabled="scope.row.state === 'deleted'"
                 type="text"
                 @click="handleDelete(scope.row, 'deleted')"
@@ -333,7 +314,7 @@ export default {
         msgStas: 0
       },
       textMap: {
-        update: "修改",
+        update: "编辑",
         create: "添加"
       },
       //   tab栏

src/views/page/system/role/index.vue

@@ -15,14 +15,13 @@
         ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleSearch()"
-          >查询</el-button
-        ><el-button icon="el-icon-refresh" @click="reset()">清空</el-button>
+        <el-button type="primary" @click="handleSearch()">查询</el-button
+        ><el-button @click="reset()">重置</el-button>
       </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
-          plain
+          class="lake-Blue"
           icon="el-icon-plus"
           @click="handleAddOrEdit(0, null, 'create')"
           >新增
@@ -35,46 +34,42 @@
       <el-table
         v-loading="listLoading"
         :data="list"
-        element-loading-text="Loading"
-        border
+        element-loading-text="加载中"
         fit
-        highlight-current-row
+        stripe
       >
         <template slot="empty">
-          <img src="../../../../assets/nopage.png" alt />
+          <img src="@/assets/nopage.png" alt />
           <p>暂无数据</p>
         </template>
         <el-table-column
           fixed
-          align="center"
           type="index"
           label="序号"
           width="60"
         ></el-table-column>
-        <el-table-column label="角色编码" align="center" prop="roleId" />
+        <el-table-column label="角色编码" prop="roleId" />
 
-        <el-table-column label="角色名称" align="center" prop="roleName" />
+        <el-table-column label="角色名称" prop="roleName" />
 
-        <el-table-column align="center" label="说明" :v-if="true" prop="dscr" />
+        <el-table-column label="说明" :v-if="true" prop="dscr" />
 
-        <el-table-column align="center" fixed="right" label="操作">
+        <el-table-column fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
               icon="el-icon-edit"
-              style="color: #409eff"
+              style="color: #52c8cc"
               type="text"
               @click="handleAddOrEdit(scope.$index, scope.row, 'update')"
-              >修改</el-button
+              >编辑</el-button
             >
-
             <el-button
               icon="el-icon-delete"
-              style="color: #f56c6c"
+              style="color: #ce4745"
               type="text"
               @click="handleDelete(scope.row, 'deleted')"
               >删除</el-button
             >
-
             <el-button
               icon="el-icon-setting"
               style="color: #e6a23c"
@@ -196,7 +191,7 @@ export default {
       dialogFormVisible: false, //是否对话框
       dialogStatus: "",
       textMap: {
-        update: "修改",
+        update: "编辑",
         create: "添加"
       },
       temp: {},

src/views/page/system/users/components/organization.vue

@@ -27,10 +27,8 @@
         </el-select>
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="getData(true)"
-          >查询
-        </el-button>
-        <el-button icon="el-icon-refresh" @click="reset(true)">清空 </el-button>
+        <el-button type="primary" @click="getData(true)">查询 </el-button>
+        <el-button @click="reset(true)">重置 </el-button>
       </el-form-item>
     </el-form>
     <!--列表-->
@@ -40,13 +38,12 @@
         row-key="id"
         v-loading="listLoading"
         :data="list"
-        element-loading-text="Loading"
-        border
+        element-loading-text="加载中"
         fit
-        highlight-current-row
+        stripe
       >
         <template slot="empty">
-          <img src="../../../../../assets/nopage.png" alt />
+          <img src="@/assets/nopage.png" alt />
           <p>暂无数据</p>
         </template>
         <el-table-column width="50">
@@ -56,15 +53,10 @@
             >
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          type="index"
-          label="序号"
-          width="60"
-        ></el-table-column>
-        <el-table-column label="机构编码" align="center" prop="orgId" />
-        <el-table-column label="机构名称" align="center" prop="orgName" />
-        <!-- <el-table-column label="机构类型" align="center" prop="orgType">
+        <el-table-column type="index" label="序号" width="60"></el-table-column>
+        <el-table-column label="机构编码" prop="orgId" />
+        <el-table-column label="机构名称" prop="orgName" />
+        <!-- <el-table-column label="机构类型" prop="orgType">
           <template #default="{ row }">
               <span v-if="row.orgType == '2'">医疗机构</span>
               <span v-if="row.orgType == '4'">供应商</span>
@@ -96,17 +88,17 @@ import { getQueryDic } from "@/api/system/dic";
 
 export default {
   components: {
-    ylPagination,
+    ylPagination
   },
   props: {
     checkOrg: {
       type: Array,
-      default: [],
+      default: []
     },
     orgRadio: {
       type: String,
-      default: "",
-    },
+      default: ""
+    }
   },
 
   watch: {},
@@ -123,26 +115,25 @@ export default {
         current: 1,
         size: 10,
         orgId: "",
-        orgType:"",
+        orgType: ""
       },
       facType: {
         dicCode: "orgType"
       },
-      orgData:[],
-
+      orgData: []
     };
   },
   created() {
     this.getData();
-    this.getQual()
+    this.getQual();
   },
   methods: {
     // 关闭
     close() {
       this.$emit("orgClose", false);
     },
-     // 重置页面
-     reset() {
+    // 重置页面
+    reset() {
       this.listQuery.orgName = "";
       this.listQuery.orgId = "";
       this.listQuery.orgType = "";
@@ -172,13 +163,13 @@ export default {
     },
     // 字典查询
     getQual() {
-      getQueryDic(this.facType).then(res => {
+      getQueryDic(this.facType).then((res) => {
         if (res.success == true) {
           this.orgData = res.data;
         }
       });
     }
-  },
+  }
 };
 </script>
 

src/views/page/system/users/index.vue

@@ -38,18 +38,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          @click="getData('search')"
-          >查询
-        </el-button>
-        <el-button icon="el-icon-refresh" @click="reset()">清空</el-button>
+        <el-button type="primary" @click="getData('search')">查询 </el-button>
+        <el-button @click="reset()">重置</el-button>
       </el-form-item>
       <el-form-item>
         <el-button
+          class="lake-Blue"
           type="primary"
-          plain
           icon="el-icon-plus"
           @click="handleAddOrEdit(0, null, 'create')"
           >新增
@@ -60,79 +55,55 @@
     <div>
       <el-table
         v-loading="listLoading"
+        element-loading-text="加载中"
         :data="list"
-        element-loading-text="Loading"
-        border
         fit
-        highlight-current-row
+        stripe
       >
         <template slot="empty">
-          <img src="../../../../assets/nopage.png" alt />
+          <img src="@/assets/nopage.png" alt />
           <p>暂无数据</p>
         </template>
         <el-table-column
           fixed
-          align="center"
           type="index"
           label="序号"
           width="60"
         ></el-table-column>
-        <el-table-column label="用户编码" align="center" prop="loginId" />
-        <el-table-column label="用户名称" align="center" prop="userName" />
-        <el-table-column label="联系方式" align="center" prop="coninfo" />
-        <el-table-column align="center" label="年龄" width="80" prop="age" />
-        <el-table-column align="center" label="性别" width="80" prop="gend" />
-        <!-- <el-table-column
-          align="center"
-          label="所属机构"
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.orgName }}</span>
-          </template>
-        </el-table-column> -->
-        <el-table-column
-          align="center"
-          label="创建时间"
-          width="140"
-          prop="crteTime"
-        />
-        <el-table-column
-          align="center"
-          label="修改时间"
-          width="140"
-          prop="lstUpdTime"
-        />
-        <el-table-column align="center" label="说明" prop="dscr" />
+        <el-table-column label="用户编码" prop="loginId" />
+        <el-table-column label="用户名称" prop="userName" />
+        <el-table-column label="联系方式" width="120" prop="coninfo" />
+        <el-table-column label="年龄" width="80" prop="age" />
+        <el-table-column label="性别" width="80" prop="gend" />
+        <el-table-column label="创建时间" width="140" prop="crteTime" />
+        <el-table-column label="修改时间" width="140" prop="lstUpdTime" />
+        <el-table-column label="说明" prop="dscr" />
 
-        <el-table-column align="center" fixed="right" label="操作" width="250">
+        <el-table-column fixed="right" label="操作" width="250">
           <template
             slot-scope="scope"
             v-if="scope.row.loginId !== 'super-admin'"
           >
             <el-button
-              icon="el-icon-edit"
-              style="color: #409eff"
+              style="color: #52c8cc"
               type="text"
               @click="handleAddOrEdit(scope.$index, scope.row, 'update')"
-              >修改</el-button
+              >编辑</el-button
             >
-
             <el-button
-              icon="el-icon-delete"
-              style="color: #f56c6c"
+              style="color: #ce4745"
               type="text"
               @click="handleDelete(scope.row, 'deleted')"
               >删除</el-button
             >
-
             <el-dropdown
               @command="(command) => handleCommand(command, scope.row)"
             >
               <span class="el-dropdown-link">
                 <el-button
-                  style="color: #505152; margin-left: 10px"
-                  type="text"
                   icon="el-icon-d-arrow-right"
+                  style="color: #505152"
+                  type="text"
                   >更多
                 </el-button>
               </span>
@@ -353,7 +324,7 @@ export default {
       dialogFormVisible: false, //是否对话框
       dialogStatus: "",
       textMap: {
-        update: "修改",
+        update: "编辑",
         create: "添加"
       },
       temp: {