Merge remote-tracking branch 'origin/master'

refined-manager-ui/admin/src/App.vue

 <template>
   <div id="app">
-    <router-view/>
+    <router-view />
   </div>
 </template>
+<style lang="less" scoped>
+/deep/.el-table th {
+  background: #fafafa !important;
+  color: rgba(0, 0, 0, 0.85) !important;
+}
+/deep/.el-table .cell {
+  font-size: 14px;
+}
+/deep/.el-table th,
+/deep/.el-table tr {
+  height: 54px;
+  text-align: center;
+}
+/deep/.el-drawer__header {
+  border-bottom: 1px solid #f0f0f0;
+  margin-bottom: 0;
+  padding-bottom: 20px;
+  color: #000;
+}
+</style>

refined-manager-ui/admin/src/assets/less/base.css

@@ -281,6 +281,7 @@ a {
   background: linear-gradient(90deg, #1845c6, #2999ff) !important;
 }
 .layout-menu-wrapper .layout-logo {
+  width: 335px;
   font-size: 20px;
   font-weight: bold;
 }
@@ -311,16 +312,17 @@ a {
   background-color: #1890ff !important;
 }
 .layout-header .layout-submenu-wrapper {
-  width: 95% !important;
+  width: 98% !important;
   margin: 0 auto !important;
   margin-top: 20px !important;
   border-top-left-radius: 8px;
   border-top-right-radius: 8px;
+  padding-left: 0px !important;
 }
 .page.active {
-  width: 95% !important;
+  width: 98% !important;
   margin: 0 auto !important;
-  padding: 20px !important;
+  padding: 10px !important;
   padding-top: 0 !important;
 }
 .page {
@@ -329,3 +331,11 @@ a {
   border-bottom-left-radius: 8px;
   border-bottom-right-radius: 8px;
 }
+.el-button--primary {
+  background: linear-gradient(90deg, #5ab6ff 0%, #2e9aff 100%) !important;
+  color: #fff !important;
+}
+.el-button {
+  height: 32px;
+  line-height: 8px;
+}

refined-manager-ui/admin/src/assets/less/base.less

@@ -321,6 +321,7 @@ a {
   background: linear-gradient(90deg, #1845c6, #2999ff) !important;
 }
 .layout-menu-wrapper .layout-logo {
+  width: 335px;
   font-size: 20px;
   font-weight: bold;
 }
@@ -351,16 +352,17 @@ a {
   background-color: #1890ff !important;
 }
 .layout-header .layout-submenu-wrapper {
-  width: 95% !important;
+  width: 98% !important;
   margin: 0 auto !important;
   margin-top: 20px !important;
   border-top-left-radius: 8px;
   border-top-right-radius: 8px;
+  padding-left: 0px !important;
 }
 .page.active {
-  width: 95% !important;
+  width: 98% !important;
   margin: 0 auto !important;
-  padding: 20px !important;
+  padding: 10px !important;
   padding-top: 0 !important;
 }
 .page {
@@ -369,3 +371,11 @@ a {
   border-bottom-left-radius: 8px;
   border-bottom-right-radius: 8px;
 }
+.el-button--primary {
+  background: linear-gradient(90deg, #5ab6ff 0%, #2e9aff 100%) !important;
+  color: #fff !important;
+}
+.el-button {
+  height: 32px;
+  line-height: 8px;
+}

refined-manager-ui/admin/src/components/DataTable.vue

@@ -25,7 +25,7 @@
       :width="column.width"
       :sortable="column.sortable"
       :show-overflow-tooltip="column.tooltip"
-      :align="column.align || 'left'"
+      :align="column.align || 'center'"
       :formatter="column.formatter"
       :reserve-selection="column.reserveSelection"
       :subColumns="column.subColumns"
@@ -38,7 +38,7 @@
         :label="sunColumn.label"
         :width="sunColumn.width"
         :sortable="sunColumn.sortable"
-        :align="sunColumn.align || 'left'"
+        :align="sunColumn.align || 'center'"
         :formatter="sunColumn.formatter"
       />
     </el-table-column>

refined-manager-ui/admin/src/components/DataTreeTable.vue

@@ -18,7 +18,7 @@
         :label="column.label"
         :width="column.width"
         :show-overflow-tooltip="column.tooltip"
-        :align="column.align || 'left'"
+        :align="column.align || 'center'"
         :formatter='column.formatter'
       >
       </el-table-column>

refined-manager-ui/admin/src/components/Header.vue

@@ -272,7 +272,7 @@ export default {
     line-height: 50px;
     font-size: 14px;
     color: #eee;
-    background: #1848c8;
+    // background: #1848c8;
     .layout-logo {
       height: 50px;
       .el-icon-menu {
@@ -288,6 +288,7 @@ export default {
 
     .menu-list {
       li {
+        width: 120px;
         a {
           display: block;
           padding: 0 12px;
@@ -326,6 +327,7 @@ export default {
       white-space: nowrap;
       overflow: auto;
       li {
+        margin-right: 10px;
         a {
           display: block;
           padding: 0 10px;

refined-manager-ui/admin/src/components/HeaderSite.vue

@@ -43,9 +43,9 @@
   </div>
 </template>
 <script>
- //import { getSiteTree } from "@/services/businessMatter";
+//import { getSiteTree } from "@/services/businessMatter";
 import session from "@/assets/utils/session";
- //import Cookie from "js-cookie";
+//import Cookie from "js-cookie";
 export default {
   data() {
     return {
@@ -111,12 +111,12 @@ export default {
         process.env.VUE_APP_SITETREE_URL == "undefined"
           ? "http://192.168.0.98:11078/base/site/siteTree"
           : process.env.VUE_APP_SITETREE_URL;
-      console.log(url)
+      console.log(url);
       this.$get(url).then((res) => {
         const { siteTree } = res.data;
         this.sitelist = siteTree;
         let arr = [];
-        const treeFn = function (e) {
+        const treeFn = function(e) {
           e.forEach((element) => {
             arr.push(element);
             if (element.children && element.children.length > 0) {
@@ -155,11 +155,11 @@ export default {
   position: relative;
 }
 .ant-dropdown-link {
-  padding: 0 20px;
   font-size: 14px;
-  min-width: 200px;
+  min-width: 150px;
   color: #eee;
   display: inline-block;
+  margin-top: 2px;
 }
 .select-site {
   position: fixed;

refined-manager-ui/admin/src/components/SearchForm.vue

@@ -325,13 +325,12 @@ export default {
           ) {
             //支持模糊查询,收尾增加百分号
             val = val.trim();
-            if(val.charAt(0)!='%'){
-              val = "%" + val
+            if (val.charAt(0) != "%") {
+              val = "%" + val;
             }
-            if(val.charAt(val.length-1)!='%'){
-                val =val + "%";
+            if (val.charAt(val.length - 1) != "%") {
+              val = val + "%";
             }
-
           }
         });
         newData[item] = this.decodeVal(val);
@@ -379,10 +378,18 @@ export default {
     width: 140px;
   }
 }
-
+.el-form--inline .el-form-item {
+  margin-right: 0;
+}
+.el-form-item {
+  margin-bottom: 10px !important;
+  margin-right: 0;
+  margin-left: 10px;
+}
 @media screen and (max-width: 800px) {
   .search-form-wapper {
     .el-form-item {
+      margin-bottom: 10px !important;
       width: 100%;
       .el-form-item__label {
         min-width: 70px;
@@ -397,4 +404,3 @@ export default {
   }
 }
 </style>
-

refined-manager-ui/admin/src/components/Table.vue

@@ -4,9 +4,9 @@
   <div class="layout-table" :loading="data.loading">
     <div class="table-head flex flex-pack-justify">
       <div class="table-head-left flex flex-align-center">
-        <slot name="breadcrumb">
+        <!-- <slot name="breadcrumb">
           <Breadcrumb style="margin-left: 10px" />
-        </slot>
+        </slot> -->
         <div class="buttons">
           <el-row>
             <slot name="table-head-left"></slot>
@@ -213,7 +213,7 @@
       v-if="!isShowButton('notPagination') ? false : data.pageInfo.totalResult"
     >
       <Pagination
-        style="float: left"
+        style="float: right"
         :total="data.pageInfo.totalResult"
         :prePageResult="data.pageInfo.prePageResult"
       />
@@ -325,10 +325,10 @@ export default {
 }
 .layout-table {
   .table-head {
-    margin-bottom: 10px;
+    // margin-bottom: 10px;
     //padding-bottom: 12px;
     // padding-top: 7px;
-    border-bottom: 1px solid #ededed;
+    // border-bottom: 1px solid #ededed;
     .el-breadcrumb {
       margin-right: 30px;
     }
@@ -349,7 +349,6 @@ export default {
   }
   .table-form {
     padding-top: 10px;
-    margin-top: 10px;
     overflow: hidden;
   }
   .search-form-wapper {

refined-manager-ui/admin/src/components/tools/TableButtons.vue

 <template>
   <span>
-    <el-button v-if='!noEdit'  type="text" icon="el-icon-edit"  size='mini' @click='$emit("edit", row)'  title="编辑">编辑</el-button>
+    <el-button
+      v-if="!noEdit"
+      type="text"
+      icon="el-icon-edit"
+      size="mini"
+      @click="$emit('edit', row)"
+      title="编辑"
+      >编辑</el-button
+    >
     <span>&nbsp;</span>
-    <el-button v-if='!noView' type="text" icon="el-icon-view"  size='mini' @click='$emit("view", row)'  title="查看">查看</el-button>
-     <span>&nbsp;</span>
-    <Confirm @confirm='$emit("del", row.id)' message='确定要删除该条记录吗？'>
-      <el-button v-if='!noDel' type="text" icon="el-icon-delete" size='mini'  title="删除">删除</el-button>
+    <el-button
+      v-if="!noView"
+      type="text"
+      icon="el-icon-view"
+      size="mini"
+      @click="$emit('view', row)"
+      title="查看"
+      >查看</el-button
+    >
+    <span>&nbsp;</span>
+    <Confirm @confirm="$emit('del', row.id)" message="确定要删除该条记录吗？">
+      <el-button
+        v-if="!noDel"
+        type="text"
+        icon="el-icon-delete"
+        size="mini"
+        title="删除"
+        style="margin-left: 0;margin-right: 5px;color: #FA4D4C;"
+        >删除</el-button
+      >
     </Confirm>
   </span>
 </template>
 
 <script>
-import Confirm from '@/components/Confirm.vue';
+import Confirm from "@/components/Confirm.vue";
 export default {
   props: {
     noEdit: {
       type: Boolean,
-      default: false
+      default: false,
     },
     noDel: {
       type: Boolean,
-      default: false
+      default: false,
     },
     noAdd: {
       type: Boolean,
-      default: false
+      default: false,
     },
     noView: {
       type: Boolean,
-      default: false
+      default: false,
     },
     row: {
       type: Object,
       required: true,
-      default: () => {}
+      default: () => {},
     },
   },
   components: {
     Confirm,
   },
-  methods: {
-
-  },
+  methods: {},
   data() {
-    return {
-
-    }
-  }
-}
+    return {};
+  },
+};
 </script>
-
-

refined-manager-ui/admin/src/views/Home.vue

@@ -16,7 +16,5 @@ export default {
 <style lang="less" scoped>
 .page-home {
   margin-top: 20px !important;
-  border-top-left-radius: 8px;
-  border-top-right-radius: 8px;
 }
 </style>

refined-manager-ui/admin/src/views/Layout.vue

 <template>
-    <div :style="menuPageCss" class="pages page-layout">
-        <LayoutHeader v-if="menuPage!=='left'"></LayoutHeader>
-        <LayoutHeaderLeft @toggle="toggle" :isOpen="isOpen" v-if="menuPage==='left'" />
-        <router-view :class="{'active': !isOpen}" />
-    </div>
+  <div :style="menuPageCss" class="pages page-layout">
+    <LayoutHeader v-if="menuPage !== 'left'"></LayoutHeader>
+    <LayoutHeaderLeft
+      @toggle="toggle"
+      :isOpen="isOpen"
+      v-if="menuPage === 'left'"
+    />
+    <router-view :class="{ active: !isOpen }" />
+  </div>
 </template>
 <script>
 import LayoutHeader from "../components/Header";
@@ -13,54 +17,53 @@ const isPC = /(iPhone|iPad|iPod|iOS|Android)/i.test(navigator.userAgent);
 const MenuPage = "top";
 
 export default {
-    components: {
-        LayoutHeader,
-        LayoutHeaderLeft,
+  components: {
+    LayoutHeader,
+    LayoutHeaderLeft,
+  },
+  data() {
+    return {
+      isOpen: isPC,
+      menuPage: MenuPage,
+    };
+  },
+  computed: {
+    menuPageCss() {
+      //左面和顶面菜单切换时，动态计划相关css参数
+      return {
+        "--padding-top": this.menuPage === "left" ? "60px" : "0px",
+        "--margin-left": this.menuPage === "left" ? "200px" : "0px",
+      };
     },
-    data() {
-        return {
-            isOpen: isPC,
-            menuPage: MenuPage,
-        };
-    },
-    computed: {
-        menuPageCss() {
-            //左面和顶面菜单切换时，动态计划相关css参数
-            return {
-                "--padding-top": this.menuPage === "left" ? "60px" : "0px",
-                "--margin-left": this.menuPage === "left" ? "200px" : "0px",
-            };
-        },
-    },
-    methods: {
-        toggle() {
-            this.isOpen = !this.isOpen;
-        },
+  },
+  methods: {
+    toggle() {
+      this.isOpen = !this.isOpen;
     },
+  },
 };
 </script>
 
 <style lang="less">
 .page {
-    min-height: calc(100vh - 100px);
-    width: 100%;
+  min-height: calc(100vh - 100px);
+  width: 100%;
 
-    position: relative;
-    background: #fff;
-    padding: var(--padding-top) 5px 5px 5px;
-    margin-left: 60px;
-    &.active {
-        margin-left: var(--margin-left);
-    }
+  position: relative;
+  background: #fff;
+  padding: var(--padding-top) 5px 5px 5px;
+  margin-left: 60px;
+  &.active {
+    margin-left: var(--margin-left);
+  }
 }
 .page-layout {
-    background: #eee;
+  background: #f0f2f5;
 }
-.layout-header .layout-menu-wrapper{
-    background: #2681e8!important;
-    height: 4rem;
-    line-height: 4rem;
+.layout-header .layout-menu-wrapper {
+  // background: #2681e8!important;
+  height: 4rem;
+  line-height: 4rem;
 }
-</style>
-
 
+</style>

refined-manager-ui/admin/src/views/appointment/config/list.vue

 <template>
   <div class="page">
-    <LayoutTable :data="tableData" :config="tableConfig">
-    </LayoutTable>
+    <LayoutTable :data="tableData" :config="tableConfig"> </LayoutTable>
 
-
-    <dialog-show ref="dialogform" @ok="getData"/>
+    <dialog-show ref="dialogform" @ok="getData" />
   </div>
 </template>
 
@@ -16,29 +14,26 @@ import table from "@/assets/mixins/table";
 export default {
   name: "AppointmentConfigList",
   components: {
-    dialogShow
+    dialogShow,
   },
   mixins: [table],
-  created() {
-  },
+  created() {},
   methods: {
     renderTable(tableData) {
       return (
-          <el-table stripe data={tableData} class="total-table">
-            {this.columnSet.map((item) => this.renderTableColumn(item))}
-          </el-table>
+        <el-table stripe data={tableData} class="total-table">
+          {this.columnSet.map((item) => this.renderTableColumn(item))}
+        </el-table>
       );
     },
     renderTableColumn(options) {
-
       return (
-          <el-table-column
-              prop={options.prop}
-              label={options.label}
-              width={options.width}
-              formatter={options.formatter}
-          >
-          </el-table-column>
+        <el-table-column
+          prop={options.prop}
+          label={options.label}
+          width={options.width}
+          formatter={options.formatter}
+        ></el-table-column>
       );
     },
     /** 重写新增方法 */
@@ -53,41 +48,52 @@ export default {
     toView(row) {
       this.$refs.dialogform.view(row);
     },
-
   },
   data() {
     return {
       /** 子表列元素 */
       columnSet: [
-        {prop: "serviceTimeStart", label: "服务开始时间", width: 200, formatter: this.formatterDate},
-        {prop: "serviceTimeEnd", label: "服务结束时间", width: 200, formatter: this.formatterDate},
-        {prop: "remark", label: "备注", width: 100},
+        {
+          prop: "serviceTimeStart",
+          label: "服务开始时间",
+          width: 200,
+          formatter: this.formatterDate,
+          align: "center",
+        },
+        {
+          prop: "serviceTimeEnd",
+          label: "服务结束时间",
+          width: 200,
+          formatter: this.formatterDate,
+          align: "center",
+        },
+        { prop: "remark", label: "备注", width: 200, align: "center" },
       ],
       config: {
         search: [],
         columns: [
-          {type: "selection", width: 60},
-          {type: "index", label: "序号", width: 50},
+          { type: "selection", width: 60 },
+          { type: "index", label: "序号", width: 50 },
 
-          {label: "启用", prop: "used", formatter: this.formatter},
+          { label: "启用", prop: "used", formatter: this.formatter },
 
-          {label: "周一", prop: "monday", formatter: this.formatter},
+          { label: "周一", prop: "monday", formatter: this.formatter },
 
-          {label: "周二", prop: "tuesday", formatter: this.formatter},
+          { label: "周二", prop: "tuesday", formatter: this.formatter },
 
-          {label: "周三", prop: "wednesday", formatter: this.formatter},
+          { label: "周三", prop: "wednesday", formatter: this.formatter },
 
-          {label: "周四", prop: "thursday", formatter: this.formatter},
+          { label: "周四", prop: "thursday", formatter: this.formatter },
 
-          {label: "周五", prop: "friday", formatter: this.formatter},
+          { label: "周五", prop: "friday", formatter: this.formatter },
 
-          {label: "周六", prop: "saturday", formatter: this.formatter},
+          { label: "周六", prop: "saturday", formatter: this.formatter },
 
-          {label: "周日", prop: "sunday", formatter: this.formatter},
+          { label: "周日", prop: "sunday", formatter: this.formatter },
 
-          {label: "最大人数", prop: "maxServicePersonNum"},
+          { label: "最大人数", prop: "maxServicePersonNum" },
 
-          {label: "累计预警", prop: "alertServiceNum"},
+          { label: "累计预警", prop: "alertServiceNum" },
 
           {
             label: "配置时间段",
@@ -98,25 +104,33 @@ export default {
                 return pre + Number(cur.width);
               }, 50);
               return (
-                  <el-popover placement="right" width={widthsize} trigger="click">
-                    {this.renderTable(row.appointmentConfigTimesList)}
-                    <el-button type="text" slot="reference">详细</el-button>
-                  </el-popover>
+                <el-popover placement="right" width={widthsize} trigger="click">
+                  {this.renderTable(row.appointmentConfigTimesList)}
+                  <el-button type="text" slot="reference">
+                    详细
+                  </el-button>
+                </el-popover>
               );
             },
           },
           {
             label: "操作",
             width: 240,
-            formatter: row => {
+            formatter: (row) => {
               return (
-                  <table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel}/>
+                <table-buttons
+                  noAdd
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
               );
-            }
-          }
-        ]
-      }
+            },
+          },
+        ],
+      },
     };
-  }
+  },
 };
 </script>

refined-manager-ui/admin/src/views/appointment/records/list.vue

@@ -3,7 +3,6 @@
     <LayoutTable notAdd notDel :data="tableData" :config="tableConfig">
       <el-button
         slot="table-head-left2"
-        style="margin-left: 10px"
         icon="el-icon-tickets"
         size="mini"
         type="danger"

refined-manager-ui/admin/src/views/care/config/list.vue

@@ -59,7 +59,7 @@
                 columnSet:[
                     {prop:"serviceTimeStart",label:"服务开始时间",width:200,formatter: this.formatterDate},
                     {prop:"serviceTimeEnd",label:"服务结束时间",width:200,formatter: this.formatterDate},
-                    {prop:"remark",label:"备注",width:100},
+                    {prop:"remark",label:"备注",width:200},
                 ],
                 config: {
                     search: [

refined-manager-ui/admin/src/views/person/list.vue

@@ -3,7 +3,6 @@
     <LayoutTable :data="tableData" :config="tableConfig">
       <el-button
           slot="table-head-left2"
-          style="margin-left: 10px"
           icon="el-icon-tickets"
           size="mini"
           @click="handleImport"

refined-manager-ui/admin/src/views/realtime/dataflow/list.vue

 <template>
   <div class="page">
+    <span
+      style="position: absolute; top: -30px;right: 0;font-size: 12px; color: #aaa;"
+    >
+      <i class="el-icon-warning"></i
+      > 流量数据由海康提供，本系统提供15日暂存服务。</span
+    >
     <LayoutTable notAdd notDel :data="tableData" :config="tableConfig">
       <el-button
         slot="table-head-left2"
-        style="margin-left: 10px"
         icon="el-icon-tickets"
         size="mini"
         type="danger"