登录页

src/page/index/logo.vue

@@ -13,7 +13,9 @@
               key="1">{{website.indexTitle}} </span>
       </template>
     </transition-group> -->
-    <div class="logo">logo</div>
+    <div class="logo">
+      <img :src="require('@/assets/img/login/logo.png')" alt="" width="80" height="90" >
+    </div>
     <div class="title">运维管理系统</div>
   </div>
 </template>
@@ -58,8 +60,7 @@ export default {
   z-index: 1024;
   display: flex;
   .logo {
-    width: 90px;
-    background: skyblue;
+    width: 80px;
   }
   .title {
     line-height: 92px;

src/page/login/index.vue

@@ -5,7 +5,9 @@
       <!-- 左侧 -->
       <div class="login-border">
         <div class="login-main">
-          <div class="login-logo"></div>
+          <div class="login-logo">
+            <img :src="require('@/assets/img/login/logo.png')" />
+          </div>
           <div class="login-title">运维管理系统，欢迎您！</div>
           <div class="login-subTitle">
             WELCOME TO THE OPERATION AND MAINTENANCE<br />
@@ -15,7 +17,9 @@
         </div>
       </div>
       <!-- 右侧 -->
-      <div class="login-right"></div>
+      <div class="login-right">
+        <img :src="require('@/assets/img/login/login-right.png')" alt="">
+      </div>
     </div>
   </div>
 </template>

src/styles/common.scss

@@ -18,6 +18,8 @@
 @import './media.scss';
 //通用配置
 @import './normalize.scss';
+//自定义
+@import './custom/custom.scss';
 // 字体
 // @import '~@/assets/font/font.css';
 a{

src/styles/custom/custom.scss

@@ -1,16 +1,23 @@
-// input输入框
-.el-input--small .el-input__inner {
-  width: 420px;
-  height: 50px;
-  line-height: 50px;
-  border-radius: 3px 3px 3px 3px;
-  color: #333;
-  position: relative;
-  border: 1px solid #CFCFCF
-}
-// input输入框label
-.el-form--label-top .el-form-item__label {
-  font-size: 16px;
-  color: #273240;
-  padding: 0!important;
+// // input输入框
+// .el-input--small .el-input__inner {
+//   width: 420px;
+//   height: 50px;
+//   line-height: 50px;
+//   border-radius: 3px 3px 3px 3px;
+//   color: #333;
+//   position: relative;
+//   border: 1px solid #CFCFCF
+// }
+// // input输入框label
+// .el-form--label-top .el-form-item__label {
+//   font-size: 16px;
+//   color: #273240;
+//   padding: 0!important;
+// }
+// 包裹容器
+.cus-container {
+  margin: 0 38px;
+  border: 1px solid blue;
+  height: 100%;
+  width: calc(100% - 76px);
 }

src/styles/login.scss

@@ -5,7 +5,7 @@
   width: 100%;
   height: 100%;
   margin: 0 auto;
-  background-image: url("/img/bg/bg4.jpg");
+  background-image: url("~@/assets/img/login/login-bg.png");
   background-size: 100% 100%;
 }
 
@@ -29,11 +29,11 @@
 }
 
 .login-right {
+  background-color: #F1F7FB;
   border-top-right-radius: 9px;
   border-bottom-right-radius: 9px;
   justify-content: center;
   flex-direction: column;
-  background-color: #8b9aac;
   color: #fff;
   float: left;
   width: 50%;
@@ -63,7 +63,6 @@
 .login-logo {
   width: 118px;
   height: 124px;
-  background: pink;
   display: flex;
   margin: 0 auto;
 }

src/styles/media.scss

@@ -70,7 +70,7 @@
 }
 
 .avue-view {
-  padding: 0 10px !important;
+  // padding: 0 10px !important;
   width: 100%;
   box-sizing: border-box;
 }

src/views/monitoring/index.vue

@@ -0,0 +1,119 @@
+<template>
+  <div class="cus-container">
+    <el-form :model="searchForm">
+      <div class="search">
+        <div>
+          <el-select
+            v-model="searchForm.company"
+            placeholder="公司"
+            class="search-select"
+            
+          >
+            <el-option
+              v-for="item in conpanyList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            v-model="searchForm.company"
+            placeholder="公司"
+            class="search-select"
+          >
+            <el-option
+              v-for="item in conpanyList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            v-model="searchForm.company"
+            placeholder="公司"
+            class="search-select"
+          >
+            <el-option
+              v-for="item in conpanyList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            v-model="searchForm.company"
+            placeholder="公司"
+            class="search-select"
+          >
+            <el-option
+              v-for="item in conpanyList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div style="display:flex;">
+          <el-input
+          :rows="18"
+            v-model="searchForm.name"
+            placeholder="请输入"
+            class="search-input"
+          ></el-input>
+           <el-button class="search-btn">查询</el-button>
+           <el-button class="search-btn" style="margin:0;background:#2EE27C;">导出</el-button>
+           <div class="search-reset">
+            <i class="el-icon-refresh-right" style="font-size:20px;"></i>
+           </div>
+        </div>
+      </div>
+    </el-form>
+    <div>1</div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      searchForm: {},
+      conpanyList: [{ label: "运维公司", value: 1 }],
+    };
+  },
+};
+</script>
+<style lang="scss" scoped>
+.search {
+  display: flex;
+  justify-content: space-between;
+}
+.search-select {
+  width: 150px;
+  margin-right: 20px;
+}
+.search-input {
+  width: 288px;
+}
+.search-btn {
+  width: 130px;
+  height: 46px !important;
+  background: #2E92F6;
+  color:#fff;
+  margin: 0 20px;
+}
+.search-reset {
+  width: 46px;
+  height: 46px !important;
+  background: #FF9130;
+  margin-left:20px;
+  color:#fff;
+  text-align: center;
+  line-height: 46px;
+}
+/deep/ .el-input__inner{
+    height: 46px;
+}
+</style>

src/views/plugin/workflow/process/components/form.vue

@@ -31,7 +31,7 @@
         <el-button type="primary"
                    size="medium"
                    v-loading="loading"
-                   @click="handleStartProcess">发起</el-button>
+                   @click="handleStartProcess">提 交</el-button>
         <el-button v-if="permission.wf_process_draft"
                    type="success"
                    size="medium"
@@ -116,6 +116,7 @@ export default {
           option.column = columnArr
           option.group = groupArr
           this.option = option
+          // this.findObject(this.option.column, 'yunweigongsi').disabled = true
 
           if (this.permission.wf_process_draft) {
             // 查询是否有草稿箱