时间搜索图标位置修改、设备告警loading1 接口返回后打开、月报样式修改

deviceManager/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

deviceManager/static/css/chunk-2d1d87f5.f4f45be1.css

@@ -0,0 +1 @@
+.errPage-container[data-v-0e5c12bd]{width:800px;max-width:100%;margin:100px auto}.errPage-container .pan-back-btn[data-v-0e5c12bd]{background:#008489;color:#fff;border:none!important}.errPage-container .pan-gif[data-v-0e5c12bd]{margin:0 auto;display:block}.errPage-container .pan-img[data-v-0e5c12bd]{display:block;margin:0 auto;width:100%}.errPage-container .text-jumbo[data-v-0e5c12bd]{font-size:60px;font-weight:700;color:#484848}.errPage-container .list-unstyled[data-v-0e5c12bd]{font-size:14px}.errPage-container .list-unstyled li[data-v-0e5c12bd]{padding-bottom:5px}.errPage-container .list-unstyled a[data-v-0e5c12bd]{color:#008489;text-decoration:none}.errPage-container .list-unstyled a[data-v-0e5c12bd]:hover{text-decoration:underline}

deviceManager/static/css/chunk-58e08142.4f216fb8.css

@@ -0,0 +1 @@
+.user-info-head[data-v-20a6c9d6]{position:relative;display:inline-block;height:120px}.user-info-head[data-v-20a6c9d6]:hover:after{content:"+";position:absolute;left:0;right:0;top:0;bottom:0;color:#eee;background:rgba(0,0,0,.5);font-size:24px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;cursor:pointer;line-height:110px;border-radius:50%}

deviceManager/static/css/chunk-6a3a862b.02c39c52.css

@@ -0,0 +1 @@
+.register{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:100%;background-size:cover}.title{margin:0 auto 30px auto;text-align:center;color:#707070}.register-form{border-radius:6px;background:#fff;width:400px;padding:25px 25px 5px 25px}.register-form .el-input,.register-form .el-input input{height:38px}.register-form .input-icon{height:39px;width:14px;margin-left:2px}.register-tip{font-size:13px;text-align:center;color:#bfbfbf}.register-code{width:33%;height:38px;float:right}.register-code img{cursor:pointer;vertical-align:middle}.el-register-footer{height:40px;line-height:40px;position:fixed;bottom:0;width:100%;text-align:center;color:#fff;font-family:Arial;font-size:12px;letter-spacing:1px}.register-code-img{height:38px}

deviceManager/static/css/chunk-7aa66bd7.e9afe59c.css

@@ -0,0 +1 @@
+.bg[data-v-2bc06bed]{width:100%;height:100%;overflow:hidden;position:fixed;top:0;left:0;z-index:-1}.bg .bgimg[data-v-2bc06bed]{width:100%;height:100%;position:absolute;top:0;left:0;z-index:-1}.logo[data-v-2bc06bed]{width:100%;position:fixed;top:0}.logo img[data-v-2bc06bed]{width:152px;margin:10px 2rem 0 20px;vertical-align:middle}.logo .logo_txt[data-v-2bc06bed]{font-size:1.5rem;color:#fff;vertical-align:middle;letter-spacing:4px}.login[data-v-2bc06bed]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:100%;background-size:cover}.title[data-v-2bc06bed]{margin:0 auto 30px auto;text-align:left;color:#000;font-size:20px}.title span[data-v-2bc06bed]{margin-left:10px;opacity:.25}.login-form[data-v-2bc06bed]{border-radius:6px;background:#fff;width:456px;padding:63px 35px}.login-form .el-input[data-v-2bc06bed]{height:40px;font-size:16px!important}.login-form .el-input input[data-v-2bc06bed]{height:40px}.login-form .input-icon[data-v-2bc06bed]{height:39px;width:14px;margin-left:2px}.login-tip[data-v-2bc06bed]{font-size:13px;text-align:center;color:#bfbfbf}.login-code[data-v-2bc06bed]{width:33%;height:36px;float:right}.login-code img[data-v-2bc06bed]{cursor:pointer;vertical-align:middle;width:100%;height:36px;margin-top:-1px}.el-login-footer[data-v-2bc06bed]{height:40px;line-height:40px;position:fixed;bottom:0;width:100%;text-align:center;color:#fff;font-family:Arial;font-size:12px;letter-spacing:1px}[data-v-2bc06bed] .el-input__inner{height:36px!important;line-height:36px!important}#app,body,html{height:100%;margin:0;padding:0;background-color:transparent!important}

deviceManager/static/img/dark.412ca67e.svg

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="52px" height="45px" viewBox="0 0 52 45" version="1.1" 
+    xmlns="http://www.w3.org/2000/svg" 
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs>
+        <filter x="-9.4%" y="-6.2%" width="118.8%" height="122.5%" filterUnits="objectBoundingBox" id="filter-1">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.15 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="SourceGraphic"></feMergeNode>
+            </feMerge>
+        </filter>
+        <rect id="path-2" x="0" y="0" width="48" height="40" rx="4"></rect>
+        <filter x="-4.2%" y="-2.5%" width="108.3%" height="110.0%" filterUnits="objectBoundingBox" id="filter-4">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="配置面板" width="48" height="40" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="setting-copy-2" width="48" height="40" transform="translate(-1190.000000, -136.000000)">
+            <g id="Group-8" width="48" height="40" transform="translate(1167.000000, 0.000000)">
+                <g id="Group-5-Copy-5" filter="url(#filter-1)" transform="translate(25.000000, 137.000000)">
+                    <mask id="mask-3" fill="white">
+                        <use xlink:href="#path-2"></use>
+                    </mask>
+                    <g id="Rectangle-18">
+                        <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-2"></use>
+                        <use fill="#F0F2F5" fill-rule="evenodd" xlink:href="#path-2"></use>
+                    </g>
+                    <rect id="Rectangle-11" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="48" height="10"></rect>
+                    <rect id="Rectangle-18" fill="#303648" mask="url(#mask-3)" x="0" y="0" width="16" height="40"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

deviceManager/static/img/light.4183aad0.svg

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="52px" height="45px" viewBox="0 0 52 45" version="1.1" 
+    xmlns="http://www.w3.org/2000/svg" 
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs>
+        <filter x="-9.4%" y="-6.2%" width="118.8%" height="122.5%" filterUnits="objectBoundingBox" id="filter-1">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="1" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.15 0" type="matrix" in="shadowBlurOuter1" result="shadowMatrixOuter1"></feColorMatrix>
+            <feMerge>
+                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
+                <feMergeNode in="SourceGraphic"></feMergeNode>
+            </feMerge>
+        </filter>
+        <rect id="path-2" x="0" y="0" width="48" height="40" rx="4"></rect>
+        <filter x="-4.2%" y="-2.5%" width="108.3%" height="110.0%" filterUnits="objectBoundingBox" id="filter-4">
+            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="配置面板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="setting-copy-2" transform="translate(-1254.000000, -136.000000)">
+            <g id="Group-8" transform="translate(1167.000000, 0.000000)">
+                <g id="Group-5" filter="url(#filter-1)" transform="translate(89.000000, 137.000000)">
+                    <mask id="mask-3" fill="white">
+                        <use xlink:href="#path-2"></use>
+                    </mask>
+                    <g id="Rectangle-18">
+                        <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-2"></use>
+                        <use fill="#F0F2F5" fill-rule="evenodd" xlink:href="#path-2"></use>
+                    </g>
+                    <rect id="Rectangle-18" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="16" height="40"></rect>
+                    <rect id="Rectangle-11" fill="#FFFFFF" mask="url(#mask-3)" x="0" y="0" width="48" height="10"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

deviceManager/static/js/chunk-2d0f012d.1bde8e38.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f012d"],{"9b8f":function(e,r,n){"use strict";n.r(r);n("ac1f"),n("5319");var t,u,a={created:function(){var e=this.$route,r=e.params,n=e.query,t=r.path;this.$router.replace({path:"/"+t,query:n})},render:function(e){return e()}},c=a,o=n("2877"),p=Object(o["a"])(c,t,u,!1,null,null,null);r["default"]=p.exports}}]);

deviceManager/static/js/chunk-2d1d87f5.28d4ee2b.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d1d87f5"],{9798:function(t,e,s){},cc6c:function(t,e,s){t.exports=s.p+"static/img/401.089007e7.gif"},e356:function(t,e,s){"use strict";s("9798")},ec55:function(t,e,s){"use strict";s.r(e);var a=function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",{staticClass:"errPage-container"},[s("el-button",{staticClass:"pan-back-btn",attrs:{icon:"arrow-left"},on:{click:t.back}},[t._v(" 返回 ")]),s("el-row",[s("el-col",{attrs:{span:12}},[s("h1",{staticClass:"text-jumbo text-ginormous"},[t._v(" 401错误! ")]),s("h2",[t._v("您没有访问权限！")]),s("h6",[t._v("对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面")]),s("ul",{staticClass:"list-unstyled"},[s("li",{staticClass:"link-type"},[s("router-link",{attrs:{to:"/index"}},[t._v(" 回首页 ")])],1)])]),s("el-col",{attrs:{span:12}},[s("img",{attrs:{src:t.errGif,width:"313",height:"428",alt:"Girl has dropped her ice cream."}})])],1)],1)},c=[],n=s("cc6c"),r=s.n(n),i={name:"Page401",data:function(){return{errGif:r.a+"?"+ +new Date}},methods:{back:function(){this.$route.query.noGoBack?this.$router.push({path:"/"}):this.$router.go(-1)}}},o=i,l=(s("e356"),s("2877")),u=Object(l["a"])(o,a,c,!1,null,"0e5c12bd",null);e["default"]=u.exports}}]);

deviceManager/static/js/chunk-4d481014.130a7218.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-4d481014"],{"26fc":function(t,s,i){t.exports=i.p+"static/img/404_cloud.0f4bc32b.png"},2754:function(t,s,i){"use strict";i.r(s);var a=function(){var t=this,s=t.$createElement,i=t._self._c||s;return i("div",{staticClass:"wscn-http404-container"},[i("div",{staticClass:"wscn-http404"},[t._m(0),i("div",{staticClass:"bullshit"},[i("div",{staticClass:"bullshit__oops"},[t._v(" 404错误! ")]),i("div",{staticClass:"bullshit__headline"},[t._v(" "+t._s(t.message)+" ")]),i("div",{staticClass:"bullshit__info"},[t._v(" 对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。 ")]),i("router-link",{staticClass:"bullshit__return-home",attrs:{to:"/index"}},[t._v(" 返回首页 ")])],1)])])},c=[function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"pic-404"},[a("img",{staticClass:"pic-404__parent",attrs:{src:i("a36b"),alt:"404"}}),a("img",{staticClass:"pic-404__child left",attrs:{src:i("26fc"),alt:"404"}}),a("img",{staticClass:"pic-404__child mid",attrs:{src:i("26fc"),alt:"404"}}),a("img",{staticClass:"pic-404__child right",attrs:{src:i("26fc"),alt:"404"}})])}],e={name:"Page404",computed:{message:function(){return"找不到网页！"}}},l=e,n=(i("e077"),i("2877")),r=Object(n["a"])(l,a,c,!1,null,"267f2676",null);s["default"]=r.exports},"2e5e":function(t,s,i){},a36b:function(t,s,i){t.exports=i.p+"static/img/404.a57b6f31.png"},e077:function(t,s,i){"use strict";i("2e5e")}}]);

public/index.html

@@ -18,8 +18,8 @@
             height: 100%;
             margin: 0px;
             padding: 0px;
+            /* background-color: #7171C6; */
         }
-        
         .chromeframe {
             margin: 0.2em 0;
             background: #ccc;

src/App.vue

@@ -1,3 +1,12 @@
+<!--
+ * @Author: wt 1241351815@qq.com
+ * @Date: 2022-04-25 10:00:04
+ * @LastEditors: wt 1241351815@qq.com
+ * @LastEditTime: 2022-05-13 09:12:01
+ * @FilePath: \deviceManager\src\App.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+
 <template>
   <div id="app">
     <router-view />
@@ -17,7 +26,27 @@ export default  {
     }
 }
 </script>
+<style lang="scss" scoped>
+::v-deep {
+  .el-table__body-wrapper::-webkit-scrollbar {
+    /*width: 0;宽度为0隐藏*/
+    width: 4px;
+  }
+  .el-table__body-wrapper::-webkit-scrollbar-thumb {
+    border-radius: 6px;
+    height: 50px;
+    background: rgba(40, 190, 252, .6);//滚动条颜色
+  }
+  .el-table__body-wrapper::-webkit-scrollbar-track {
+    box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+    border-radius: 6px;
+    background: #eee;//滚动条背景色
+  }
+}
+
+</style>
 <style>
+/* input 样式 */
 .el-input__inner{
   height:28px !important;
   line-height: 28px !important;
@@ -44,25 +73,63 @@ export default  {
   height:0;
   bottom: none !important;
 }
-</style>
-<style lang="scss" scoped>
-::v-deep {
-  .el-table__body-wrapper::-webkit-scrollbar {
-    /*width: 0;宽度为0隐藏*/
-    width: 4px;
-  }
-  .el-table__body-wrapper::-webkit-scrollbar-thumb {
-    border-radius: 6px;
-    height: 50px;
-    background: rgba(40, 190, 252, .6);//滚动条颜色
-  }
-  .el-table__body-wrapper::-webkit-scrollbar-track {
-    box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
-    border-radius: 6px;
-    background: #eee;//滚动条背景色
-  }
+/* 部门框高度 */
+.vue-treeselect--searchable .vue-treeselect__input-container{
+  height:28px !important;
+  line-height: 20px !important;
+}
+.vue-treeselect__control{
+  height:28px !important;
+  margin-top:4px;
+}
+.vue-treeselect__placeholder, .vue-treeselect__single-value{
+  top:-4px !important;
 }
 
+/* 时间搜托图标位置 */
+.el-range-editor--small .el-range__icon, .el-range-editor--small .el-range__close-icon{
+  margin-top:-4px;
+}
+.el-range-editor--small .el-range-separator{
+  margin-top:-6px;
+}
 
+/* 部门框高度 */
+.vue-treeselect--searchable .vue-treeselect__input-container{
+  height:28px !important;
+  line-height: 20px !important;
+}
+.vue-treeselect__control{
+  height:28px !important;
+  margin-top:4px;
+}
+.vue-treeselect__placeholder, .vue-treeselect__single-value{
+  top:-4px !important;
+}
+
+/* 数字加减图标位置 */
+.el-input-number{
+  line-height: 28px !important;
+}
+.el-input-number.is-controls-right .el-input-number__increase, .el-input-number.is-controls-right .el-input-number__decrease{
+  line-height:10px;
+}
+.el-input-number--small{
+  height:28px !important;
+  line-height: 26px !important;
+}
+.el-textarea .el-input__count,.el-input .el-input__count .el-input__count-inner{
+  font-size: 8px;
+  height: 12px;
+  line-height: 12px;
+  background: transparent !important
+}
+.el-input-number--medium{
+  width:auto;
+  line-height:28px;
+}
+.el-input-number.is-controls-right[class*=medium] [class*=increase], .el-input-number.is-controls-right[class*=medium] [class*=decrease] {
+    line-height: 13px;
+}
 </style>
 

src/api/login.js

@@ -17,9 +17,9 @@ export function login(username, password, code, uuid) {
 // 登录方法(ERP)
 export function loginERP(data) {
   return request({
-    url: '/loginByCenterId',
-    method: 'get',
-    params: data
+    url: '/loginByCenter',
+    method: 'post',
+    data
   })
 }
 

src/api/system/user.js

@@ -13,7 +13,7 @@ export function listUser(query) {
 // 查询用户详细
 export function getUser(userId) {
     return request({
-        url: '/system/user/' + praseStrEmpty(userId),
+        url: '/system/user/' ,
         method: 'get'
     })
 }

src/components/SizeSelect/index.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Author: wt 1241351815@qq.com
+ * @Date: 2022-04-25 10:00:05
+ * @LastEditors: wt 1241351815@qq.com
+ * @LastEditTime: 2022-05-13 09:06:33
+ * @FilePath: \deviceManager\src\components\SizeSelect\index.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <el-dropdown trigger="click" @command="handleSetSize">
     <div>
@@ -17,10 +25,9 @@ export default {
   data() {
     return {
       sizeOptions: [
-        { label: 'Default', value: 'default' },
-        { label: 'Medium', value: 'medium' },
-        { label: 'Small', value: 'small' },
-        { label: 'Mini', value: 'mini' }
+        { label: '正常', value: 'default' },
+        { label: '中等', value: 'medium' },
+        { label: '小', value: 'small' },
       ]
     }
   },
@@ -35,7 +42,7 @@ export default {
       this.$store.dispatch('app/setSize', size)
       this.refreshView()
       this.$message({
-        message: 'Switch Size Success',
+        message: '字体大小切换成功',
         type: 'success'
       })
     },

src/layout/components/Navbar.vue

@@ -96,7 +96,10 @@ export default {
         let year = myDate.getFullYear() + '年'
         let month = myDate.getMonth() + 1 +'月'
         let day = myDate.getDate()  +'日'
-        let sfb = myDate.getHours() + ':' + myDate.getMinutes() + ':' + myDate.getSeconds()
+        let hours = myDate.getHours() < 10 ? "0" + myDate.getHours() : myDate.getHours();
+        let minutes = myDate.getMinutes() < 10 ? "0" + myDate.getMinutes() : myDate.getMinutes();
+        let seconds = myDate.getSeconds() < 10 ? "0" + myDate.getSeconds() : myDate.getSeconds();
+        let sfb = hours + ':' + minutes + ':' + seconds
         that.date = year + month + day + ' ' + sfb
     });
 

src/store/modules/user.js

@@ -48,7 +48,7 @@ const user = {
         // 登录PER
          LoginERP({ commit }, userInfo) {
             return new Promise((resolve, reject) => {
-                loginERP({centerId:userInfo.id}).then(res => {
+                loginERP({username:userInfo.username,password:userInfo.password}).then(res => {
                     setToken(res.data)
                     commit('SET_TOKEN', res.data)
                     resolve()

src/views/business/MochaITOM/crew - 副本 (2)/index.vue

@@ -1,255 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="团队名称：" prop="name">
-        <el-input
-          v-model.trim="queryParams.name"
-          placeholder="请输入团队名称"
-          clearable
-          size="small"
-          style="width: 140px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="责任人" prop="userName">
-        <el-select v-model="queryParams.userName"   placeholder="请选择责任人" style="width: 140px">
-          <el-option
-            v-for="item in transferTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="团队名称" align="center" prop="teamName"  show-overflow-tooltip />
-      <el-table-column label="所属单位" align="center" prop="companyName"  show-overflow-tooltip />
-      <el-table-column label="责任人" align="center" prop="userIds.name"  show-overflow-tooltip />
-      <el-table-column label="联系方式" align="center" prop="userIds.id"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="addPeople"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="addTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:admin:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:admin:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 修改、新增对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="auto" >
-        <el-row :gutter="20">
-          <el-col :span="12" >
-            <el-form-item label="楼层名称" prop="floorName">
-              <el-input v-model="form.floorName" placeholder="请填写楼层名称" @input="onInput()" maxlength="15" show-word-limit />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="建筑名称" prop="buildId">
-              <el-select
-                v-model="form.buildId"
-                placeholder="请选择建筑名称"
-                clearable
-                size="small"
-              >
-                <el-option
-                  v-for="(dict,index) in buildListData"
-                  :key="index"
-                  :label="dict.name"
-                  :value="dict.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input type="textarea" v-model.trim="form.remark" placeholder="请填写备注" @input="onInput()" rows="4" maxlength="25" show-word-limit/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.current"
-      :limit.sync="queryParams.size"
-      @pagination="getList"
-    />
-  </div>
-</template>
-<script>
-import { addDevopsTeam, delDevopsTeam, updateDevopsTeam, getDevopsTeam } from "@/api/business/MochaITOM/crew";
-export default {
-  name: "Floor",
-  data() {
-    return {
-      exportLoading:false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 参数表格数据
-      adminList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        current: 1,
-        size: 20,
-        name: undefined,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        buildName: [
-          { required: true, message: "建筑名称不能为空",  trigger: ["blur",'change']  }
-        ],
-        floorName: [
-          { required: true, message: "楼层名称不能为空", trigger: "blur" }
-        ],
-      },
-      //建筑下拉
-      buildListData:[],
-    };
-  },
-  created() {
-    this.getList();//初始化table
-    this.buildList()//初始化建筑下拉
-  },
-  methods: {
-    //强制el-input刷新
-    onInput(){
-        this.$forceUpdate();
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.queryParams = {
-        name:undefined,
-        current:1,
-        size:20
-      }
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 表单重置
-    reset() {
-      this.form = {};
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.current = 1;
-      this.getList();
-    },
-    /** 查询参数列表 */
-    getList() {
-      this.loading = true;
-      getDevopsTeam(this.queryParams).then(response => {
-        this.adminList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.title = "修改";
-      this.form = JSON.parse(JSON.stringify(row))
-      this.form.buildId = Number(this.form.buildId)
-
-      this.open = true;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增";
-    },
-    /** 提交按钮 */
-    submitForm(row) {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (this.form.id != undefined) {
-            updateDevopsTeam(this.form).then(response => {
-              this.loading = false,
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).catch(()=>{
-              this.loading = false
-            })
-          } else {
-            addDevopsTeam(this.form).then(response => {
-              this.loading = false,
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).catch(()=>{
-              this.loading = false
-            })
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delDevopsTeam(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-  }
-};
-</script>

src/views/business/MochaITOM/crew - 副本 (3)/index.vue

@@ -1,255 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="团队名称：" prop="name">
-        <el-input
-          v-model.trim="queryParams.name"
-          placeholder="请输入团队名称"
-          clearable
-          size="small"
-          style="width: 140px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="责任人" prop="userName">
-        <el-select v-model="queryParams.userName"   placeholder="请选择责任人" style="width: 140px">
-          <el-option
-            v-for="item in transferTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="团队名称" align="center" prop="teamName"  show-overflow-tooltip />
-      <el-table-column label="所属单位" align="center" prop="companyName"  show-overflow-tooltip />
-      <el-table-column label="责任人" align="center" prop="userIds.name"  show-overflow-tooltip />
-      <el-table-column label="联系方式" align="center" prop="userIds.id"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="addPeople"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="addTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:admin:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:admin:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 修改、新增对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="auto" >
-        <el-row :gutter="20">
-          <el-col :span="12" >
-            <el-form-item label="楼层名称" prop="floorName">
-              <el-input v-model="form.floorName" placeholder="请填写楼层名称" @input="onInput()" maxlength="15" show-word-limit />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="建筑名称" prop="buildId">
-              <el-select
-                v-model="form.buildId"
-                placeholder="请选择建筑名称"
-                clearable
-                size="small"
-              >
-                <el-option
-                  v-for="(dict,index) in buildListData"
-                  :key="index"
-                  :label="dict.name"
-                  :value="dict.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input type="textarea" v-model.trim="form.remark" placeholder="请填写备注" @input="onInput()" rows="4" maxlength="25" show-word-limit/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.current"
-      :limit.sync="queryParams.size"
-      @pagination="getList"
-    />
-  </div>
-</template>
-<script>
-import { addDevopsTeam, delDevopsTeam, updateDevopsTeam, getDevopsTeam } from "@/api/business/MochaITOM/crew";
-export default {
-  name: "Floor",
-  data() {
-    return {
-      exportLoading:false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 参数表格数据
-      adminList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        current: 1,
-        size: 20,
-        name: undefined,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        buildName: [
-          { required: true, message: "建筑名称不能为空",  trigger: ["blur",'change']  }
-        ],
-        floorName: [
-          { required: true, message: "楼层名称不能为空", trigger: "blur" }
-        ],
-      },
-      //建筑下拉
-      buildListData:[],
-    };
-  },
-  created() {
-    this.getList();//初始化table
-    this.buildList()//初始化建筑下拉
-  },
-  methods: {
-    //强制el-input刷新
-    onInput(){
-        this.$forceUpdate();
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.queryParams = {
-        name:undefined,
-        current:1,
-        size:20
-      }
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 表单重置
-    reset() {
-      this.form = {};
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.current = 1;
-      this.getList();
-    },
-    /** 查询参数列表 */
-    getList() {
-      this.loading = true;
-      getDevopsTeam(this.queryParams).then(response => {
-        this.adminList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.title = "修改";
-      this.form = JSON.parse(JSON.stringify(row))
-      this.form.buildId = Number(this.form.buildId)
-
-      this.open = true;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增";
-    },
-    /** 提交按钮 */
-    submitForm(row) {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (this.form.id != undefined) {
-            updateDevopsTeam(this.form).then(response => {
-              this.loading = false,
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).catch(()=>{
-              this.loading = false
-            })
-          } else {
-            addDevopsTeam(this.form).then(response => {
-              this.loading = false,
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).catch(()=>{
-              this.loading = false
-            })
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delDevopsTeam(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-  }
-};
-</script>

src/views/business/MochaITOM/crew - 副本/index.vue

@@ -1,255 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="团队名称：" prop="name">
-        <el-input
-          v-model.trim="queryParams.name"
-          placeholder="请输入团队名称"
-          clearable
-          size="small"
-          style="width: 140px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="责任人" prop="userName">
-        <el-select v-model="queryParams.userName"   placeholder="请选择责任人" style="width: 140px">
-          <el-option
-            v-for="item in transferTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="团队名称" align="center" prop="teamName"  show-overflow-tooltip />
-      <el-table-column label="所属单位" align="center" prop="companyName"  show-overflow-tooltip />
-      <el-table-column label="责任人" align="center" prop="userIds.name"  show-overflow-tooltip />
-      <el-table-column label="联系方式" align="center" prop="userIds.id"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="addPeople"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="addTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:admin:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:admin:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 修改、新增对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="auto" >
-        <el-row :gutter="20">
-          <el-col :span="12" >
-            <el-form-item label="楼层名称" prop="floorName">
-              <el-input v-model="form.floorName" placeholder="请填写楼层名称" @input="onInput()" maxlength="15" show-word-limit />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="建筑名称" prop="buildId">
-              <el-select
-                v-model="form.buildId"
-                placeholder="请选择建筑名称"
-                clearable
-                size="small"
-              >
-                <el-option
-                  v-for="(dict,index) in buildListData"
-                  :key="index"
-                  :label="dict.name"
-                  :value="dict.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input type="textarea" v-model.trim="form.remark" placeholder="请填写备注" @input="onInput()" rows="4" maxlength="25" show-word-limit/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.current"
-      :limit.sync="queryParams.size"
-      @pagination="getList"
-    />
-  </div>
-</template>
-<script>
-import { addDevopsTeam, delDevopsTeam, updateDevopsTeam, getDevopsTeam } from "@/api/business/MochaITOM/crew";
-export default {
-  name: "Floor",
-  data() {
-    return {
-      exportLoading:false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 参数表格数据
-      adminList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        current: 1,
-        size: 20,
-        name: undefined,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        buildName: [
-          { required: true, message: "建筑名称不能为空",  trigger: ["blur",'change']  }
-        ],
-        floorName: [
-          { required: true, message: "楼层名称不能为空", trigger: "blur" }
-        ],
-      },
-      //建筑下拉
-      buildListData:[],
-    };
-  },
-  created() {
-    this.getList();//初始化table
-    this.buildList()//初始化建筑下拉
-  },
-  methods: {
-    //强制el-input刷新
-    onInput(){
-        this.$forceUpdate();
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.queryParams = {
-        name:undefined,
-        current:1,
-        size:20
-      }
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 表单重置
-    reset() {
-      this.form = {};
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.current = 1;
-      this.getList();
-    },
-    /** 查询参数列表 */
-    getList() {
-      this.loading = true;
-      getDevopsTeam(this.queryParams).then(response => {
-        this.adminList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.title = "修改";
-      this.form = JSON.parse(JSON.stringify(row))
-      this.form.buildId = Number(this.form.buildId)
-
-      this.open = true;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增";
-    },
-    /** 提交按钮 */
-    submitForm(row) {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (this.form.id != undefined) {
-            updateDevopsTeam(this.form).then(response => {
-              this.loading = false,
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).catch(()=>{
-              this.loading = false
-            })
-          } else {
-            addDevopsTeam(this.form).then(response => {
-              this.loading = false,
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).catch(()=>{
-              this.loading = false
-            })
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delDevopsTeam(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-  }
-};
-</script>

src/views/business/MochaITOM/crew/index.vue

@@ -1,255 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="团队名称：" prop="name">
-        <el-input
-          v-model.trim="queryParams.name"
-          placeholder="请输入团队名称"
-          clearable
-          size="small"
-          style="width: 140px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="责任人" prop="userName">
-        <el-select v-model="queryParams.userName"   placeholder="请选择责任人" style="width: 140px">
-          <el-option
-            v-for="item in transferTypeList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:admin:add']"
-        >新增</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="团队名称" align="center" prop="teamName"  show-overflow-tooltip />
-      <el-table-column label="所属单位" align="center" prop="companyName"  show-overflow-tooltip />
-      <el-table-column label="责任人" align="center" prop="userIds.name"  show-overflow-tooltip />
-      <el-table-column label="联系方式" align="center" prop="userIds.id"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="addPeople"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="addTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:admin:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:admin:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 修改、新增对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :before-close="cancel" :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="auto" >
-        <el-row :gutter="20">
-          <el-col :span="12" >
-            <el-form-item label="楼层名称" prop="floorName">
-              <el-input v-model="form.floorName" placeholder="请填写楼层名称" @input="onInput()" maxlength="15" show-word-limit />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="建筑名称" prop="buildId">
-              <el-select
-                v-model="form.buildId"
-                placeholder="请选择建筑名称"
-                clearable
-                size="small"
-              >
-                <el-option
-                  v-for="(dict,index) in buildListData"
-                  :key="index"
-                  :label="dict.name"
-                  :value="dict.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input type="textarea" v-model.trim="form.remark" placeholder="请填写备注" @input="onInput()" rows="4" maxlength="25" show-word-limit/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.current"
-      :limit.sync="queryParams.size"
-      @pagination="getList"
-    />
-  </div>
-</template>
-<script>
-import { addDevopsTeam, delDevopsTeam, updateDevopsTeam, getDevopsTeam } from "@/api/business/MochaITOM/crew";
-export default {
-  name: "Floor",
-  data() {
-    return {
-      exportLoading:false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 参数表格数据
-      adminList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        current: 1,
-        size: 20,
-        name: undefined,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        buildName: [
-          { required: true, message: "建筑名称不能为空",  trigger: ["blur",'change']  }
-        ],
-        floorName: [
-          { required: true, message: "楼层名称不能为空", trigger: "blur" }
-        ],
-      },
-      //建筑下拉
-      buildListData:[],
-    };
-  },
-  created() {
-    this.getList();//初始化table
-    this.buildList()//初始化建筑下拉
-  },
-  methods: {
-    //强制el-input刷新
-    onInput(){
-        this.$forceUpdate();
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.queryParams = {
-        name:undefined,
-        current:1,
-        size:20
-      }
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 表单重置
-    reset() {
-      this.form = {};
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.current = 1;
-      this.getList();
-    },
-    /** 查询参数列表 */
-    getList() {
-      this.loading = true;
-      getDevopsTeam(this.queryParams).then(response => {
-        this.adminList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      });
-    },
-
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.title = "修改";
-      this.form = JSON.parse(JSON.stringify(row))
-      this.form.buildId = Number(this.form.buildId)
-
-      this.open = true;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "新增";
-    },
-    /** 提交按钮 */
-    submitForm(row) {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (this.form.id != undefined) {
-            updateDevopsTeam(this.form).then(response => {
-              this.loading = false,
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).catch(()=>{
-              this.loading = false
-            })
-          } else {
-            addDevopsTeam(this.form).then(response => {
-              this.loading = false,
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).catch(()=>{
-              this.loading = false
-            })
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delDevopsTeam(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-  }
-};
-</script>

src/views/business/OM/MochaITOM/crew/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
-      <el-form-item label="团队名称：" prop="name">
+      <el-form-item label="班组名称：" prop="name">
         <el-input
           v-model.trim="queryParams.name"
-          placeholder="请输入团队名称"
+          placeholder="请输入班组名称"
           clearable
           size="small"
           style="width: 140px"
@@ -15,7 +15,7 @@
         <el-select v-model="queryParams.userName"   placeholder="请选择责任人" style="width: 140px">
           <el-option
             v-for="item in zrr"
-            :key="item.name"
+            :key="item.id"
             :label="item.name"
             :value="item.name"
             clearable
@@ -37,7 +37,7 @@
     </el-form>
 
     <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
-      <el-table-column label="团队名称" align="center" prop="teamName"  show-overflow-tooltip />
+      <el-table-column label="班组名称" align="center" prop="teamName"  show-overflow-tooltip />
       <el-table-column label="所属单位" align="center" prop="companyName"  show-overflow-tooltip />
       <el-table-column label="责任人" align="center" prop="dutyName"  show-overflow-tooltip />
       <el-table-column label="联系方式" align="center" prop="dutyPhone"  show-overflow-tooltip />
@@ -68,8 +68,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="auto" >
         <el-row :gutter="20">
           <el-col :span="12" >
-            <el-form-item label="团队名称" prop="teamName">
-              <el-input v-model="form.teamName" style="width: 160px" placeholder="请填写团队名称" @input="onInput()" maxlength="15" show-word-limit />
+            <el-form-item label="班组名称" prop="teamName">
+              <el-input v-model="form.teamName" style="width: 160px" placeholder="请填写班组名称" @input="onInput()" maxlength="15" show-word-limit />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -99,7 +99,7 @@
                 <span>{{ scope.$index +1 }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="switch" label="负任人" align='center'>
+            <el-table-column prop="switch" label="责任人" align='center'>
               <template slot-scope="scope">
                 <el-switch
                   v-model="scope.row.switch"
@@ -118,7 +118,7 @@
              <el-table-column prop="phone" label="手机号" align='center'>
               <template slot-scope="scope">
                 <span v-if="!scope.row.isEgdit">{{scope.row.phone}}</span>
-                <el-input v-if="scope.row.isEgdit" v-model="scope.row.phone"  maxlength="11" oninput="value=value.replace(/^1[3|4|5|6|7|8|9][0-9]\d{8}$/,'')"></el-input>
+                <el-input v-if="scope.row.isEgdit" v-model="scope.row.phone"  maxlength="11" ></el-input>
               </template>
             </el-table-column>
             <el-table-column fixed="right" label="操作" align='center' >
@@ -177,7 +177,7 @@ export default {
       // 表单校验
       rules: {
         teamName: [
-          { required: true, message: "团队名称不能为空",  trigger: "blur"  }
+          { required: true, message: "班组名称不能为空",  trigger: ["blur",'change'] }
         ],
         companyCode: [
           { required: true, message: "单位名称不能为空",  trigger: ["blur",'change']}
@@ -223,7 +223,7 @@ export default {
         name:undefined,
         phone:undefined,
         switch:false,
-        label:false,
+        label:1,
         userId:1,
       }
       this.list.push(item)
@@ -299,10 +299,13 @@ export default {
       getDevopsTeam(this.queryParams).then(response => {
         if(response.data.records.length>0){
           this.adminList = response.data.records;
+          let arr = []
           for(let i=0;i<this.adminList.length;i++){
-            this.zrr[i] = {}
-            this.zrr[i].name = this.adminList[i].dutyName
+            arr[i] = {name:undefined,id:undefined}
+            arr[i].name = this.adminList[i].dutyName
+            arr[i].id = this.adminList[i].id
           }
+          this.zrr = arr
           this.total = response.data.total;
           this.loading = false;
         }else{
@@ -369,10 +372,6 @@ export default {
                 this.msgError("电话不能为空");
                 return
               }
-              // if(arr[i].phone ){
-              //   this.msgError("电话不能为空");
-              //   return
-              // }
             }
           }
           this.loading = true
@@ -387,11 +386,13 @@ export default {
             })
           } else {
             addDevopsTeam(this.form).then(response => {
-              this.loading = false,
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).catch(()=>{
+              this.loading = false
+              if(response.status == "SUCCESS"){
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            }).catch((err)=>{
               this.loading = false
             })
           }

src/views/business/OM/MochaITOM/plan/index.vue

@@ -36,10 +36,17 @@
 
     <el-table v-loading="loading" :data="adminList" height="calc(100vh - 28vh)">
       <el-table-column label="计划名称" align="center" prop="planName"  show-overflow-tooltip />
-      <el-table-column label="周期" align="center" prop="cycle"  show-overflow-tooltip />
+      <!-- <el-table-column label="周期" align="center" prop="cycle"  show-overflow-tooltip /> -->
+      <el-table-column label="周期" align="center" prop="cycle"  show-overflow-tooltip >
+        <template slot-scope="scope">
+          <span>{{scope.row.cycle == 1 ? "日" : scope.row.cycle == 2 ? "周" : "月"}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="计划开始时间" align="center" prop="startDate"  show-overflow-tooltip />
+      <el-table-column label="计划开始时间" align="center" prop="endDate"  show-overflow-tooltip />
       <el-table-column label="执行开始时间" align="center" prop="startInspectTime"  show-overflow-tooltip />
       <el-table-column label="执行结束时间" align="center" prop="endInspectTime"  show-overflow-tooltip />
-      <el-table-column label="执行团队" align="center" prop="teamName"  show-overflow-tooltip />
+      <el-table-column label="执行班组" align="center" prop="teamName"  show-overflow-tooltip />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
@@ -70,10 +77,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="执行团队" prop="teamId">
+            <el-form-item label="执行班组" prop="teamId">
               <el-select
                 v-model="form.teamId"
-                placeholder="请选择执行团队"
+                placeholder="请选择执行班组"
                 clearable
                 size="small"
                 style="width: 160px"
@@ -256,7 +263,7 @@ export default {
           { required: true, message: "任务名称不能为空",  trigger: "blur"  }
         ],
         teamId: [
-          { required: true, message: "团队名称不能为空",  trigger: "blur"  }
+          { required: true, message: "班组名称不能为空",  trigger: ["blur",'change']  }
         ],
         companyCode: [
           { required: true, message: "单位名称不能为空",  trigger: ["blur",'change']}
@@ -265,10 +272,10 @@ export default {
           { required: true, message: "周期不能为空",  trigger: ["blur",'change']}
         ],
         startDate: [
-          { required: true, message: "维保开始时间不能为空",  trigger: ["blur",'change']}
+          { required: true, message: "计划开始时间不能为空",  trigger: ["blur",'change']}
         ],
         endDate: [
-          { required: true, message: "维保结束时间不能为空",  trigger: ["blur",'change']}
+          { required: true, message: "计划结束时间不能为空",  trigger: ["blur",'change']}
         ],
         startInspectTime: [
           { required: true, message: "执行开始时间称不能为空",  trigger: ["blur",'change']}
@@ -281,13 +288,9 @@ export default {
       companyList: [],
       zrr:[],
       cycleList:[
-        {dictValue:"周一",dictValue:"周一"},
-        {dictValue:"周二",dictValue:"周二"},
-        {dictValue:"周三",dictValue:"周三"},
-        {dictValue:"周四",dictValue:"周四"},
-        {dictValue:"周五",dictValue:"周五"},
-        {dictValue:"周六",dictValue:"周六"},
-        {dictValue:"周日",dictValue:"周日"},
+        {dictValue:1,dictLabel:"日"},
+        {dictValue:2,dictLabel:"周"},
+        {dictValue:3,dictLabel:"月"},
       ],
       inspectTimeList:[],
 
@@ -457,11 +460,13 @@ export default {
             })
           } else {
             addMaintianPlan(this.form).then(response => {
-              this.loading = false,
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).catch(()=>{
+              this.loading = false
+              if(response.status == "SUCCESS"){
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            }).catch((err)=>{
               this.loading = false
             })
           }

src/views/business/OM/MochaITOM/point/index.vue

@@ -227,7 +227,7 @@ export default {
           { required: true, message: "单位名称不能为空",  trigger: ["blur",'change']}
         ],
         dwtype: [
-          { required: true, message: "涉设备类型不能为空",  trigger: ["blur",'change']}
+          { required: true, message: "设备类型不能为空",  trigger: ["blur",'change']}
         ],
         pictureRoute: [
           { required: true, message: "文件不能为空", trigger: ["blur",'change'] }
@@ -241,6 +241,7 @@ export default {
       num:0,
       fileList:[],
       base64:undefined,//二维码
+      loading:true,
     };
   },
   created() {
@@ -393,11 +394,13 @@ export default {
     /**新增 */
     addData(){
       addInspectionPoint(this.form).then(response => {
-        this.loading = false,
-        this.msgSuccess("新增成功");
-        this.open = false;
-        this.getList();
-      }).catch(()=>{
+        this.loading = false
+        if(response.status == "SUCCESS"){
+          this.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        }
+      }).catch((err)=>{
         this.loading = false
       })
     },

src/views/business/OM/MochaITOM/route/index.vue

@@ -262,11 +262,13 @@ export default {
             })
           } else {
             addPlanPath(this.form).then(response => {
-              this.loading = false,
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).catch(()=>{
+              this.loading = false
+              if(response.status == "SUCCESS"){
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            }).catch((err)=>{
               this.loading = false
             })
           }

src/views/business/fireInternet/deviceMonitoring/waterMonitoring/device/index.vue

@@ -225,6 +225,7 @@ export default {
           }
           this.index2Data = arr
           this.index2Data[2] = {name:"水系统设备工况情况跟踪",color:"#00FFFF"}
+          this.loading1 = false
           this.loading2 = false
         })
     },

src/views/business/fireInternet/monthReport/index.vue

@@ -22,7 +22,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="16">
             <el-form-item label="使用单位" prop="companyCode">
               <el-select v-model="form.companyCode"  placeholder="请选择使用单位">
                 <el-option
@@ -47,13 +47,13 @@
       <div class="exportBox" style="height:600px;overflow-y: scroll;">
           <div class="exportContainer" id="printArea" ref="print">
               <h3 style="text-align:center">
-                  <span id="companyName">{{companyListSelect.name}}</span>工作月报分析
+                  <span id="companyName"><strong>{{companyListSelect.name}}</strong></span><strong>工作月报分析</strong>
               </h3>
               <h4 style="text-align:center;margin-top:10px;">
-                  <span id="staticTime" v-if="form.startTime && form.endTime">{{form.startTime}}日 到 {{form.endTime}}日</span>
+                  <span id="staticTime" v-if="form.startTime && form.endTime"><strong>{{form.startTime}}日 到 {{form.endTime}}日</strong></span>
               </h4>
               <section class="">
-                  <h4 class="big-tit">1 单位信息</h4>
+                  <h4 class="big-tit"><strong>1.单位信息</strong></h4>
                   <table width="100%" border="1" style="text-align: center;border-collapse: collapse; border-spacing: 0;">
                       <tr>
                           <td>单位名称</td>
@@ -71,7 +71,7 @@
 
 
               <section class="section">
-                  <h4 class="big-tit">2 设备类型统计信息</h4>
+                  <h4 class="big-tit"><strong>2.设备类型统计信息</strong></h4>
                   <div>
                       <table width="100%" border="1" style="text-align: center;border-collapse: collapse;border-spacing: 0;">
                           <tr>
@@ -94,7 +94,7 @@
 
               <!-- 告警处理start -->
               <section class="alarm-handing">
-                  <h4 class="big-tit">3 告警处理情况统计</h4>
+                  <h4 class="big-tit"><strong>3.告警处理情况统计</strong></h4>
                   <div>
                       <h4 class="big-tit">3.1 水系统告警处理统计</h4>
                       <table width="100%" border="1" style="text-align: center;border-collapse: collapse;border-spacing: 0;">
@@ -165,7 +165,7 @@
 
               <!-- 设备离线情况统计start -->
               <section class="device-only">
-                  <h4 class="big-tit">4 设备离线情况统计</h4>
+                  <h4 class="big-tit"><strong>4.设备离线情况统计</strong></h4>
                   <div>
                       <h4 class="big-tit">4.1 水系统设备离线情况统计</h4>
                       <table width="100%" border="1" style="text-align: center;border-collapse: collapse;border-spacing: 0;">
@@ -254,7 +254,7 @@
               <!-- 设备离线情况统计end -->
 
               <section class="section">
-                  <h4 class="big-tit">4 分析结论</h4>
+                  <h4 class="big-tit"><strong>5.分析结论</strong></h4>
                   <div style=" padding: 15px;
                   line-height: 1.5;
                   margin:20px 0 20px;

src/views/login.vue

@@ -40,7 +40,7 @@
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;"  @change="memory">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button
           :loading="loading"
@@ -106,7 +106,7 @@ export default {
         ],
         code: [{ required: true, trigger: "change", message: "请输入验证码" }]
       },
-      loading: true,
+      loading: false,
       // 验证码开关
       captchaOnOff: false,
       // 注册开关
@@ -128,12 +128,10 @@ export default {
   methods: {
     getUrl(){
       let url = this.$route.query
-      if(url.id && url.name){
-        let data = {id:url.id,name:url.name}
+      if(url.username && url.password){
+        let data = {username:url.username,password:url.password}
         this.handleLoginERP(data)
       }else{
-        this.erp = true
-        this.ERPloading = false
         this.getCode();
         this.getCookie();
       }
@@ -153,6 +151,10 @@ export default {
         if (this.captchaOnOff) {
           this.codeUrl = "data:image/gif;base64," + res.data.img;
           this.loginForm.uuid = res.data.uuid;
+          this.erp = true
+          setTimeout(()=>{
+            this.ERPloading = false
+          },)
         }
       });
     },
@@ -170,15 +172,6 @@ export default {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true;
-          if (this.loginForm.rememberMe) {
-            Cookies.set("username20220313", this.loginForm.username, { expires: 30 });
-            Cookies.set("password20220313", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe20220313', this.loginForm.rememberMe, { expires: 30 });
-          } else {
-            Cookies.remove("username20220313");
-            Cookies.remove("password20220313");
-            Cookies.remove('rememberMe20220313');
-          }
           this.$store.dispatch("Login", this.loginForm).then((res) => {
             this.$router.push({ path: "/index"}).catch(()=>{});
           }).catch(() => {
@@ -190,8 +183,18 @@ export default {
         }
       });
     },
+    memory(){
+      if (this.loginForm.rememberMe) {
+        Cookies.set("username20220313", this.loginForm.username, { expires: 30 });
+        Cookies.set("password20220313", encrypt(this.loginForm.password), { expires: 30 });
+        Cookies.set('rememberMe20220313', this.loginForm.rememberMe, { expires: 30 });
+      } else {
+        Cookies.remove("username20220313");
+        Cookies.remove("password20220313");
+        Cookies.remove('rememberMe20220313');
+      }
+    },
     handleLoginERP(data) {//erp登录
-      Cookies.set("username20220313", data.name);
       this.$store.dispatch("LoginERP", data).then((res) => {
         this.$router.push({ path: "/index"}).catch(()=>{});
       }).catch((err) => {
@@ -306,177 +309,15 @@ export default {
   height:36px !important;
   line-height: 36px !important;
 }
-body,html{
-  width:100%;
-  height:100%;
-  background: #7171C6;
+</style>
+<style>
+html,
+body,
+#app {
+    height: 100%;
+    margin: 0px;
+    padding: 0px;
+    background-color: transparent !important;
+    
 }
-        
-        #loader-wrapper {
-            position: fixed;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-            z-index: 999999;
-        }
-        
-        #loader {
-            display: block;
-            position: relative;
-            left: 50%;
-            top: 50%;
-            width: 150px;
-            height: 150px;
-            margin: -75px 0 0 -75px;
-            border-radius: 50%;
-            border: 3px solid transparent;
-            border-top-color: #FFF;
-            -webkit-animation: spin 2s linear infinite;
-            -ms-animation: spin 2s linear infinite;
-            -moz-animation: spin 2s linear infinite;
-            -o-animation: spin 2s linear infinite;
-            animation: spin 2s linear infinite;
-            z-index: 1001;
-        }
-        
-        #loader:before {
-            content: "";
-            position: absolute;
-            top: 5px;
-            left: 5px;
-            right: 5px;
-            bottom: 5px;
-            border-radius: 50%;
-            border: 3px solid transparent;
-            border-top-color: #FFF;
-            -webkit-animation: spin 3s linear infinite;
-            -moz-animation: spin 3s linear infinite;
-            -o-animation: spin 3s linear infinite;
-            -ms-animation: spin 3s linear infinite;
-            animation: spin 3s linear infinite;
-        }
-        
-        #loader:after {
-            content: "";
-            position: absolute;
-            top: 15px;
-            left: 15px;
-            right: 15px;
-            bottom: 15px;
-            border-radius: 50%;
-            border: 3px solid transparent;
-            border-top-color: #FFF;
-            -moz-animation: spin 1.5s linear infinite;
-            -o-animation: spin 1.5s linear infinite;
-            -ms-animation: spin 1.5s linear infinite;
-            -webkit-animation: spin 1.5s linear infinite;
-            animation: spin 1.5s linear infinite;
-        }
-        
-        @-webkit-keyframes spin {
-            0% {
-                -webkit-transform: rotate(0deg);
-                -ms-transform: rotate(0deg);
-                transform: rotate(0deg);
-            }
-            100% {
-                -webkit-transform: rotate(360deg);
-                -ms-transform: rotate(360deg);
-                transform: rotate(360deg);
-            }
-        }
-        
-        @keyframes spin {
-            0% {
-                -webkit-transform: rotate(0deg);
-                -ms-transform: rotate(0deg);
-                transform: rotate(0deg);
-            }
-            100% {
-                -webkit-transform: rotate(360deg);
-                -ms-transform: rotate(360deg);
-                transform: rotate(360deg);
-            }
-        }
-        
-        #loader-wrapper .loader-section {
-            position: fixed;
-            top: 0;
-            width: 51%;
-            height: 100%;
-            background: #7171C6;
-            z-index: 1000;
-            -webkit-transform: translateX(0);
-            -ms-transform: translateX(0);
-            transform: translateX(0);
-        }
-        
-        #loader-wrapper .loader-section.section-left {
-            left: 0;
-        }
-        
-        #loader-wrapper .loader-section.section-right {
-            right: 0;
-        }
-        
-        .loaded #loader-wrapper .loader-section.section-left {
-            -webkit-transform: translateX(-100%);
-            -ms-transform: translateX(-100%);
-            transform: translateX(-100%);
-            -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-            transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-        }
-        
-        .loaded #loader-wrapper .loader-section.section-right {
-            -webkit-transform: translateX(100%);
-            -ms-transform: translateX(100%);
-            transform: translateX(100%);
-            -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-            transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
-        }
-        
-        .loaded #loader {
-            opacity: 0;
-            -webkit-transition: all 0.3s ease-out;
-            transition: all 0.3s ease-out;
-        }
-        
-        .loaded #loader-wrapper {
-            visibility: hidden;
-            -webkit-transform: translateY(-100%);
-            -ms-transform: translateY(-100%);
-            transform: translateY(-100%);
-            -webkit-transition: all 0.3s 1s ease-out;
-            transition: all 0.3s 1s ease-out;
-        }
-        
-        .no-js #loader-wrapper {
-            display: none;
-        }
-        
-        .no-js h1 {
-            color: #222222;
-        }
-        
-        #loader-wrapper .load_title {
-            font-family: 'Open Sans';
-            color: #FFF;
-            font-size: 19px;
-            width: 100%;
-            text-align: center;
-            z-index: 9999999999999;
-            position: absolute;
-            top: 60%;
-            opacity: 1;
-            line-height: 30px;
-        }
-        
-        #loader-wrapper .load_title span {
-            font-weight: normal;
-            font-style: italic;
-            font-size: 13px;
-            color: #FFF;
-            opacity: 0.5;
-        }
 </style>

src/views/system/dept/index.vue

@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <!-- <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="部门状态" clearable size="small" style="width: 140px">
           <el-option
             v-for="dict in statusOptions"
@@ -20,7 +20,7 @@
             :value="dict.dictValue"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -39,20 +39,20 @@
       v-loading="loading"
       :data="deptList"
       row-key="deptId"
-      default-expand-all
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column prop="deptName" label="部门名称" ></el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
+      <!-- <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" :formatter="statusFormat" width="200"></el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="200">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="操作" width="250" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
+          disabled
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -60,6 +60,7 @@
             v-hasPermi="['system:dept:edit']"
           >修改</el-button>
           <el-button
+          disabled
             size="mini"
             type="text"
             icon="el-icon-plus"
@@ -67,6 +68,7 @@
             v-hasPermi="['system:dept:add']"
           >新增</el-button>
           <el-button
+          disabled
             v-if="scope.row.parentId != 0"
             size="mini"
             type="text"

src/views/system/product/index.vue

@@ -206,12 +206,6 @@ export default {
           for(let i=1;i<response.data.records.length; i++){
             arr[0].batchNos.push(response.data.records[i].logo)
           }
-          // getFile(arr[0]).then(response =>{
-          //   const reverse = response.data.reverse()
-          //   for(let i=0;i<response.data.length;i++){
-          //     arrBig[i].logo = reverse[i].url
-          //   }
-          // })
           //setTimeout(()=>{
             this.loading = false;
             this.adminList = arrBig;
@@ -247,7 +241,6 @@ export default {
         adminType: "Y",
       };
       this.fileList=[]
-      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -307,10 +300,10 @@ export default {
     },
     /** 提交按钮 */
     submitForm(row) {
-      if(this.form.logo){
-      }else{
-          this.$refs.img.clearValidate();
-      }
+      // if(this.form.logo){
+      // }else{
+      //     this.$refs.img.clearValidate();
+      // }
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.loading = true

src/views/system/user/index.vue

@@ -13,14 +13,13 @@
             style="margin-bottom: 20px"
           />
         </div>
-        <div class="head-container">
-          <el-tree
+        <div class="head-container scroll " >
+          <el-tree  class="elTree" style="height:calc(100vh - 200px);overflow-y: scroll"
             :data="deptOptions"
             :props="defaultProps"
             :expand-on-click-node="false"
             :filter-node-method="filterNode"
             ref="tree"
-            default-expand-all
             @node-click="handleNodeClick"
           />
         </div>
@@ -198,7 +197,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="20" show-word-limit />
+              <el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="40" show-word-limit />
             </el-form-item>
           </el-col>
         </el-row>
@@ -234,6 +233,7 @@
                   v-for="dict in statusOptions"
                   :key="dict.dictValue"
                   :label="dict.dictValue"
+                  @change="fff"
                 >{{dict.dictLabel}}</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -466,6 +466,9 @@ export default {
     });
   },
   methods: {
+    fff(e){
+      console.log(e)
+    },
     //强制el-input刷新
     onInput(){
         this.$forceUpdate();
@@ -712,3 +715,18 @@ export default {
   }
 };
 </script>
+<style scoped>
+  .elTree::-webkit-scrollbar {
+    width: 4px;
+  }
+  .elTree::-webkit-scrollbar-thumb {
+    border-radius: 6px;
+    height: 50px;
+    background: rgba(40, 190, 252, .6);
+  }
+  .elTree::-webkit-scrollbar-track {
+    box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+    border-radius: 6px;
+    background: #eee;
+  }
+</style>