408249787 před 2 roky
rodič
revize
9dcf437312

+ 1 - 1
src/components/Menu/SideMenu.vue

@@ -1,7 +1,7 @@
 <template>
   <a-layout-sider
     :class="['sider', isDesktop() ? null : 'shadow', theme, fixSiderbar ? 'ant-fixed-sidemenu' : null ]"
-    width="220px"
+    width="190px"
     :collapsible="collapsible"
     v-model="collapsed"
     :trigger="null">

+ 7 - 8
src/views/Login.vue

@@ -48,7 +48,7 @@
               </template>
             </a-input>
           </a-form-item>
-          <a-checkbox :checked="remberMe" v-model="remberMe"><span style="color: #00DEFF;">记住密码</span></a-checkbox>
+          <a-checkbox :checked="remberMe" v-model="remberMe"><span style="color: #00DEFF;font-size: 14px;">记住密码</span></a-checkbox>
           <a-button class="btn" type="primary" htmlType="submit">
             登录
           </a-button>
@@ -321,7 +321,7 @@ export default {
     width: 95px;
     letter-spacing: 1px;
     padding-bottom: 2px;
-    font-size: 22px;
+    font-size: 20px;
     color: #fff;
     font-family: PingFang SC;
     border-bottom: 4px solid #00DEFF ;
@@ -335,17 +335,16 @@ export default {
     text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25) !important;
     border: 5px solid #FFF;
     border-radius: 0;
-    margin-top:20px;
+    margin-top:10px;
     box-shadow: none !important;
     -webkit-transition: background-color 0.15s, border-color 0.15s, opacity 0.15s;
     -o-transition: background-color 0.15s, border-color 0.15s, opacity 0.15s;
     transition: background-color 0.15s, border-color 0.15s, opacity 0.15s;
     cursor: pointer;
     vertical-align: middle;
-    width: 83%;
+    width: 89%;
     height: 40px;
     border: none;
-    margin-left: 12px;
     background: rgb(82, 166, 212) !important;
     color: rgb(255, 255, 255);
     user-select: none;
@@ -353,7 +352,7 @@ export default {
   .fh-login .login-input{
     border: none!important;
     outline: none!important;
-    height: 42px!important;
+    height: 36px!important;
     width: 89%!important;
     background-color: rgba(0,0,0,0)!important;
 
@@ -363,10 +362,10 @@ border-radius: 6px!important;
   }
   /*设置输入图标大小*/
   .ant-input-affix-wrapper{
-    font-size: 24px;
+    font-size: 20px;
   }
  /deep/ .ant-input{
-    height: 40px!important;
+    height: 36px!important;
     background-color: rgba(0,0,0,0)!important;
     border: none;
 color:#fff;

+ 2 - 2
src/views/repair/application-form/RepairForm.vue

@@ -109,7 +109,7 @@
             <operation-button
               v-show="dispatchFlag"
               v-if="( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === record.status ||
-              DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REPAIR_FAIL === record.status) && $auth('repair-application-forms-dispatch')"
+                DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REPAIR_FAIL === record.status) && $auth('repair-application-forms-dispatch')"
               @click="handleAssign(record)" >派工</operation-button>
             <operation-button
               v-show="allocatedFlag"
@@ -137,7 +137,7 @@
     <detail-out ref="detailOutModal" @ok="handleOk"/>
     <assign-form ref="assignForm" @ok="handleOk" />
     <dispatch-base-form ref="dispatchBaseForm" @ok="handleOk" />
-    <refused-form ref='refusedForm' @ok='handleOk'/>
+    <refused-form ref="refusedForm" @ok="handleOk"/>
   </div>
 </template>
 

+ 2 - 1
src/views/sb/info/SbInfo.vue

@@ -275,7 +275,8 @@ export default {
       queryParam: {
         filter: this.filter,
         useType: this.useType,
-        id: this.$route.query.id
+        id: this.$route.query.id,
+        status: this.$route.query.status
       },
       depreciationTypeMap: {},
       visible: true,

+ 90 - 84
src/views/sb/sb-stop-details/SbInfoStopDetail.vue

@@ -1,108 +1,113 @@
 <template>
-  <a-card :bordered='false'>
-    <div class='table-page-search-wrapper' @keyup.enter='handleEnter'>
-      <a-form layout='inline'>
-        <a-row :gutter='48'>
-          <a-col :md='6' :sm='24'>
-            <a-form-item label='关键字'>
-              <a-input v-model.trim='queryParam.keyword' placeholder='请输入名称/类型名称' />
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper" @keyup.enter="handleEnter">
+      <a-form layout="inline">
+        <a-row :gutter="48">
+          <a-col :md="6" :sm="24">
+            <a-form-item label="关键字">
+              <a-input v-model.trim="queryParam.keyword" placeholder="请输入名称/类型名称" />
             </a-form-item>
           </a-col>
-          <a-col :md='6' :sm='24'>
-            <a-form-item label='设备Id'>
-              <a-input v-model='queryParam.sbInfoName' placeholder='设备Id' />
+          <a-col :md="6" :sm="24">
+            <a-form-item label="设备Id">
+              <a-input v-model="queryParam.sbInfoName" placeholder="设备Id" />
             </a-form-item>
           </a-col>
           <a-select
             v-model="['queryParam.type', {rules: [{required: true, message: '类型不能为空'}]}]"
-            placeholder='请选择'>
+            placeholder="请选择">
             <a-select-option
-              v-for='(label,value) in typeMap'
-              :key='value'
-              :label='label'
-              :value='parseInt(value)'>{{ label }}
+              v-for="(label,value) in typeMap"
+              :key="value"
+              :label="label"
+              :value="parseInt(value)">{{ label }}
             </a-select-option>
           </a-select>
           <a-select
             v-model="['queryParam.status', {rules: [{required: true, message: '状态不能为空'}]}]"
-            placeholder='请选择'>
+            placeholder="请选择">
             <a-select-option
-              v-for='(label,value) in statusMap'
-              :key='value'
-              :label='label'
-              :value='parseInt(value)'>{{ label }}
+              v-for="(label,value) in statusMap"
+              :key="value"
+              :label="label"
+              :value="parseInt(value)">{{ label }}
             </a-select-option>
           </a-select>
-          <a-col :md='6 || 24' :sm='24'>
-                        <span class='table-page-search-submitButtons'>
-                          <a-button type='primary' @click='$refs.table.refresh(true)'>查询</a-button>
-                          <a-button style='margin-left: 8px' @click='resetSearchForm'>重置</a-button>
-                        </span>
+          <a-col :md="6 || 24" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+            </span>
           </a-col>
         </a-row>
       </a-form>
     </div>
 
-    <div class='table-operator' style='margin-bottom: 8px;'>
+    <div class="table-operator" style="margin-bottom: 8px;">
       <a-row>
-        <a-col :md='16'>
-          <a-button v-if="$auth('sb-sb-add')" type='primary' icon='plus' @click='$refs.baseModal.base()'>新增</a-button>
-          <a-button style='margin-left: 8px' v-if="$auth('sb-sb-export')" type='primary' icon='download'
-                    @click='doExport'>导出
+        <a-col :md="16">
+          <a-button v-if="$auth('sb-sb-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
+          <a-button
+            style="margin-left: 8px"
+            v-if="$auth('sb-sb-export')"
+            type="primary"
+            icon="download"
+            @click="doExport">导出
           </a-button>
           <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-sb-del')">
-            <a-menu slot='overlay'>
-              <a-popconfirm title='是否要删除所选数据?' @confirm='batchDelete()'>
-                <a-menu-item key='1'>
-                  <a-icon type='delete' />
+            <a-menu slot="overlay">
+              <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
+                <a-menu-item key="1">
+                  <a-icon type="delete" />
                   <a>删除</a></a-menu-item>
               </a-popconfirm>
             </a-menu>
-            <a-button style='margin-left: 8px'>
+            <a-button style="margin-left: 8px">
               批量操作
-              <a-icon type='down' />
+              <a-icon type="down" />
             </a-button>
           </a-dropdown>
         </a-col>
-        <a-col style='text-align: right'>
-                    <span class='table-page-search-submitButtons'>
-                    <a-button type='primary' @click='handleOk'>查询</a-button>
-                    <a-button style='margin-left: 8px' @click='resetSearchForm'>重置</a-button>
-                    <a @click='()=>{ this.advanced = !this.advanced}' style='margin-left: 8px'>
-                      {{ advanced ? '收起' : '展开' }}
-                      <a-icon :type="advanced ? 'up' : 'down'" />
-                    </a>
-                  </span>
+        <a-col style="text-align: right">
+          <span class="table-page-search-submitButtons">
+            <a-button type="primary" @click="handleOk">查询</a-button>
+            <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+            <a @click="()=>{ this.advanced = !this.advanced}" style="margin-left: 8px">
+              {{ advanced ? '收起' : '展开' }}
+              <a-icon :type="advanced ? 'up' : 'down'" />
+            </a>
+          </span>
         </a-col>
       </a-row>
     </div>
 
     <s-table
-      ref='table'
-      size='default'
-      rowKey='id'
-      :columns='columns'
-      :data='loadData'
-      :alert='options.alert'
-      :rowSelection='options.rowSelection'
-      showPagination='auto'
+      ref="table"
+      size="default"
+      rowKey="id"
+      :columns="columns"
+      :data="loadData"
+      :alert="options.alert"
+      :rowSelection="options.rowSelection"
+      showPagination="auto"
     >
-            <span slot='action' slot-scope='record'>
-              <template>
-                <a @click='handleView(record)'>查看</a>
-                <operation-button
-                  v-if="$auth('sb-sb-edit')" @click='handleEdit(record)'
-                >修改</operation-button>
-                <operation-button
-                  v-if="$auth('sb-sb-del')"
-                  :type='2'
-                  title='是否要删除该条数据?'
-                  @confirm='batchDelete(record.id)'>删除</operation-button>
-              </template>
-            </span>
+      <span slot="action" slot-scope="record">
+        <template>
+          <a @click="handleView(record)">查看</a>
+          <operation-button
+            v-if="$auth('sb-sb-edit')"
+            @click="handleEdit(record)"
+          >修改</operation-button>
+          <operation-button
+            v-if="$auth('sb-sb-del')"
+            :type="2"
+            title="是否要删除该条数据?"
+            @confirm="batchDelete(record.id)">删除</operation-button>
+        </template>
+      </span>
     </s-table>
-    <base-form ref='baseModal' @ok='handleOk' />
-    <detail ref='detailModal' />
+    <base-form ref="baseModal" @ok="handleOk" />
+    <detail ref="detailModal" />
     <detail-audit-scrap :audit="false" ref="detailAuditScrapModal" @ok="handleOk"/>
   </a-card>
 </template>
@@ -128,7 +133,7 @@ export default {
     Detail,
     DetailAuditScrap
   },
-  data() {
+  data () {
     return {
       advanced: false,
       // 查询参数
@@ -194,7 +199,8 @@ export default {
 
       options: {
         alert: {
-          show: true, clear: () => {
+          show: true,
+          clear: () => {
             this.selectedRowKeys = []
           }
         },
@@ -206,18 +212,19 @@ export default {
       optionAlertShow: false
     }
   },
-  created() {
+  created () {
     // 下拉框map
     this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_INFO_STOP_DETAIL_)
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_INFO_STOP_DETAIL_)
     this.tableOption()
   },
   methods: {
-    tableOption() {
+    tableOption () {
       if (!this.optionAlertShow) {
         this.options = {
           alert: {
-            show: true, clear: () => {
+            show: true,
+            clear: () => {
               this.selectedRowKeys = []
             }
           },
@@ -241,7 +248,7 @@ export default {
         this.optionAlertShow = false
       }
     },
-    batchDelete(id) {
+    batchDelete (id) {
       let ids = []
       if (this.BaseTool.String.isBlank(id)) {
         const length = this.selectedRows.length
@@ -259,30 +266,30 @@ export default {
         this.$refs.table.clearSelected()
       })
     },
-    handleEdit(record) {
+    handleEdit (record) {
       fetchSbInfoStopDetail({ id: record.id }).then(res => {
         const modal = this.$refs.baseModal
         modal.base(res.data)
       })
     },
-    handleView(record) {
+    handleView (record) {
       fetchSbInfoStopDetail({ id: record.id }).then(res => {
         const modal = this.$refs.detailModal
         modal.base(res.data)
       })
     },
-    handleOk() {
+    handleOk () {
       this.$refs.table.refresh()
     },
-    onSelectChange(selectedRowKeys, selectedRows) {
+    onSelectChange (selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
     },
-    resetSearchForm() {
+    resetSearchForm () {
       this.queryParam = {}
       this.$refs.table.refresh(true)
     },
-    doExport() {
+    doExport () {
       const parameter = {
         ...this.queryParam
       }
@@ -290,11 +297,10 @@ export default {
         this.BaseTool.Util.downLoadExportExcel(file)
       })
     },
-    handleEnter() {
+    handleEnter () {
       this.$refs.table.refresh(true)
-    }
-    ,
-    sbIdhandleDetail() {
+    },
+    sbIdhandleDetail () {
       const text = this.$router.resolve({
         name: sbInfo,
         query: { id: this.model.sbId }

+ 2 - 2
src/views/sb/scraps/SbAuditUnifyForm.vue

@@ -54,7 +54,7 @@
               icon="download"
               @click="doExport">导出
             </a-button>
-<!--            <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-scraps-del')">
+            <!--            <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-scraps-del')">
               <a-menu slot="overlay">
                 <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
                   <a-menu-item key="1">
@@ -114,7 +114,7 @@
     </div>
     <base-form ref="baseModal" @ok="handleOk" />
     <detail ref="detailModal" @ok="handleOk" />
-    <sb-custom-form-view ref='showCustomView' @ok='handleOk'/>
+    <sb-custom-form-view ref="showCustomView" @ok="handleOk"/>
     <detail-audit-scrap :audit="false" ref="detailAuditScrapModal" @ok="handleOk"/>
   </a-card>
 </template>

+ 25 - 25
src/views/workplace/backlog/NewWorkplaceBacklog.vue

@@ -6,29 +6,29 @@
           <div class="gutter-box">
             <a-row type="flex" justify="space-between" style="flex:1; font-size:22px;font-weight: 500;color: #373737;">
               <a-col>维修数据</a-col>
-              <a-col><a href="/repair/form?type=1&searchType=6" style="color:#E4007F;" target="_block">{{ topData.repairTotalNum }}</a></a-col>
+              <a-col><a href="/repair/form?type=1&searchType=6" style="color:#3066EC ;" target="_block">{{ topData.repairTotalNum }}</a></a-col>
             </a-row>
             <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
               <a-col style="width:110px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;"><a style="color:#E4007F;" target="_block" href="/repair/wait?type=1">待接单 &nbsp; {{ topData.completedRepairNum }}</a></span>
+                <a-badge color="#3066EC "/>
+                <span style="color:#3066EC ;"><a style="color:#3066EC ;" target="_block" href="/repair/wait?type=1">待接单 &nbsp; {{ topData.completedRepairNum }}</a></span>
 
               </a-col>
               <a-col style="width:110px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;"><a style="color:#E4007F;" target="_block" href="/repair/form/mine?type=1">维修中 &nbsp; {{ topData.waitForRepairNum }}</a></span>
+                <a-badge color="#3066EC "/>
+                <span style="color:#3066EC ;"><a style="color:#3066EC ;" target="_block" href="/repair/form/mine?type=1">维修中 &nbsp; {{ topData.waitForRepairNum }}</a></span>
               </a-col>
 
             </a-row>
             <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
               <a-col style="width:110px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;"><a style="color:#E4007F;" target="_block" href="/repair/form?type=1&searchType=3">待审核 &nbsp; {{ topData.verifyRepairNum }}</a></span>
+                <a-badge color="#3066EC "/>
+                <span style="color:#3066EC ;"><a style="color:#3066EC ;" target="_block" href="/repair/form?type=1&searchType=3">待审核 &nbsp; {{ topData.verifyRepairNum }}</a></span>
 
               </a-col>
               <a-col style="width:110px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;"><a style="color:#E4007F;" target="_block" href="/repair/form?type=1&searchType=5">已驳回 &nbsp; {{ topData.refusedRepairNum }}</a></span>
+                <a-badge color="#3066EC "/>
+                <span style="color:#3066EC ;"><a style="color:#3066EC ;" target="_block" href="/repair/form?type=1&searchType=5">已驳回 &nbsp; {{ topData.refusedRepairNum }}</a></span>
 
               </a-col>
 
@@ -39,29 +39,29 @@
           <div class="gutter-box">
             <a-row type="flex" justify="space-between" style="flex:1; font-size:22px;font-weight: 500;color: #373737;">
               <a-col>委外数据</a-col>
-              <a-col><a target="_block" style="color:#E4007F;" href="/repair/form?type=2&searchType=6">{{ topData.outRepairTotalNum }}</a></a-col>
+              <a-col><a target="_block" style="color:#3066EC ;" href="/repair/form?type=2&searchType=6">{{ topData.outRepairTotalNum }}</a></a-col>
             </a-row>
             <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
               <a-col style="width:110px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;"><a style="color:#E4007F;" target="_block" href="/repair/wait?type=2">待接单 &nbsp; {{ topData.outCompletedRepairNum }}</a></span>
+                <a-badge color="#3066EC "/>
+                <span style="color:#3066EC ;"><a style="color:#3066EC ;" target="_block" href="/repair/wait?type=2">待接单 &nbsp; {{ topData.outCompletedRepairNum }}</a></span>
 
               </a-col>
               <a-col style="width:110px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;"><a style="color:#E4007F;" target="_block" href="/repair/form/mine?type=2">待维修 &nbsp; {{ topData.outWaitForRepairNum }}</a></span>
+                <a-badge color="#3066EC "/>
+                <span style="color:#3066EC ;"><a style="color:#3066EC ;" target="_block" href="/repair/form/mine?type=2">待维修 &nbsp; {{ topData.outWaitForRepairNum }}</a></span>
               </a-col>
 
             </a-row>
             <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
               <a-col style="width:110px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;"><a style="color:#E4007F;" target="_block" href="/repair/form?type=2&searchType=3">待审核 &nbsp; {{ topData.outVerifyRepairNum }}</a></span>
+                <a-badge color="#3066EC "/>
+                <span style="color:#3066EC ;"><a style="color:#3066EC ;" target="_block" href="/repair/form?type=2&searchType=3">待审核 &nbsp; {{ topData.outVerifyRepairNum }}</a></span>
 
               </a-col>
               <a-col style="width:110px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;"><a style="color:#E4007F;" target="_block" href="/repair/form?type=2&searchType=5">已驳回 &nbsp; {{ topData.outRefusedRepairNum }}</a></span>
+                <a-badge color="#3066EC "/>
+                <span style="color:#3066EC ;"><a style="color:#3066EC ;" target="_block" href="/repair/form?type=2&searchType=5">已驳回 &nbsp; {{ topData.outRefusedRepairNum }}</a></span>
               </a-col>
             </a-row>
           </div>
@@ -70,12 +70,12 @@
           <div style="display:flex;text-align:center;background:#fff;height: 170px;">
             <div style="width:48%;margin:auto;font-size:26px; line-height: 60px;">
               <div>本月维修总计</div>
-              <div style="font-size:24px;"><a style="color:#E4007F;" target="_block" :href="`/repair/form?repairStartTimeStart=${date.repairStartTimeStart}&repairStartTimeEnd=${date.repairStartTimeEnd}`">{{ topData.totalNum }}</a></div>
+              <div style="font-size:24px;"><a style="color:#3066EC ;" target="_block" :href="`/repair/form?repairStartTimeStart=${date.repairStartTimeStart}&repairStartTimeEnd=${date.repairStartTimeEnd}`">{{ topData.totalNum }}</a></div>
             </div>
             <div style="width: 1px;height: 70px;background: #999999;margin:auto;"></div>
             <div style="width:48%;margin:auto; font-size:26px;line-height: 60px;">
               <div>本月维修费用</div>
-              <div style="font-size:24px;"><a style="color:#E4007F;" target="_block" :href="`/repair/fee?feeDateStart=${date.searchStartTime}&feeDateEnd=${date.searchEndTime}`">{{ topData.totalFee }}</a></div>
+              <div style="font-size:24px;"><a style="color:#3066EC ;" target="_block" :href="`/repair/fee?feeDateStart=${date.searchStartTime}&feeDateEnd=${date.searchEndTime}`">{{ topData.totalFee }}</a></div>
             </div>
           </div>
         </a-col>
@@ -103,20 +103,20 @@
         <a-col class="gutter-row" :span="4">
           <div style="height: 471px;display:flex;flex-direction:column;justify-content: space-between">
             <a style="color:#fff;" target="_block" href="/repair/form/mine?type=1">
-              <div class="btn" style="background:linear-gradient(to right,#36B5FA,#26ECF5);" >
+              <div class="btn" style="background:linear-gradient(to right,#36B5FA,#3066EC);" >
                 <my-icon type="icon-weixiu" style="font-size:58px;"/>
                 <span>维修</span>
               </div>
             </a>
-            <div class="btn" style="background:linear-gradient(to right,#FF416D,#FF847F);" @click="$refs.repairForm.base({},{filter: -1})">
+            <div class="btn" style="background:linear-gradient(to right,#36B5FA,#3066EC);" @click="$refs.repairForm.base({},{filter: -1})">
               <my-icon type="icon-baoxiu-xuanzhong-copy" style="font-size:58px;color:#fff;"/>
               <span>报修</span>
             </div>
-            <div class="btn" style="background:linear-gradient(to right,#FB47D1,#F96EFE);" @click="$refs.sparePickForm.base()">
+            <div class="btn" style="background:linear-gradient(to right,#36B5FA,#3066EC);" @click="$refs.sparePickForm.base()">
               <my-icon type="icon-tubiaozhizuomoban-copy" style="font-size:58px;color:#fff;"/>
               <span>领用</span>
             </div>
-            <div class="btn" style="background:linear-gradient(to right,#941FFF,#BC72FB);" @click="$refs.sparebackform.base()">
+            <div class="btn" style="background:linear-gradient(to right,#36B5FA,#3066EC);" @click="$refs.sparebackform.base()">
               <!-- <my-icon type="icon-tuiku" style="font-size:58px; color:#fff;"/> -->
               <img src="@/assets/tuiku.png" width="60px" alt="">
               <span>退库</span>
@@ -173,7 +173,7 @@
               :columns="columns"
               :data="loadData"
               :pageSize="10"
-              :scroll="{ y: 190 }"
+              :scroll="{ y: 400 }"
             >
               <span slot="action" slot-scope="record">
                 <template>

+ 214 - 158
src/views/workplace/backlog/SbInfoWorkplaceBacklog.vue

@@ -1,192 +1,211 @@
 <template>
   <div>
-    <div class="gutter-example">
-      <a-row :gutter="20">
-        <a-col class="gutter-row" :span="8">
-          <div class="gutter-box">
-            <a-row type="flex" justify="space-between" style="flex:1; font-size:22px;font-weight: 500;color: #373737;">
-              <a-col>设备数量汇总</a-col>
-              <a-col style="color:#E4007F;">{{ record.totalDNumber }}</a-col>
-            </a-row>
-            <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
-              <a-col style="width:130px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;">在用 &nbsp; {{ record.dbNumber }}</span>
-              </a-col>
-              <a-col style="width:130px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;">报废中 &nbsp; {{ record.bfNumber }}</span>
+    <div v-show="visible">
+      <div class="gutter-example">
+        <a-row :gutter="20">
+          <a-col class="gutter-row" :span="8">
+            <div class="gutter-box">
+              <a-row type="flex" justify="space-between" style="flex:1; font-size:22px;font-weight: 500;color: #373737;">
+                <a-col>设备数量汇总</a-col>
+                <a-col style="color:#3066EC ;"><a href="sb/info" style="color:#3066EC ;" target="_block">{{ record.totalDNumber }}</a></a-col>
+              </a-row>
+              <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
+                <a-col style="width:130px;">
+                  <a-badge color="#3066EC "/>
+                  <span style="color:#3066EC ;"> <a href="sb/info?status=1" style="color:#3066EC ;" target="_block">在用 &nbsp;{{ record.dbNumber }}</a></span>
+                </a-col>
+                <a-col style="width:130px;">
+                  <a-badge color="#3066EC "/>
+                  <span style="color:#3066EC ;"><a href="sb/info?status=3" style="color:#3066EC ;" target="_block">报废中 &nbsp; {{ record.bfNumber }}</a></span>
 
-              </a-col>
-            </a-row>
-            <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
-              <a-col style="width:130px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;">已停机 &nbsp; {{ record.stopNumber }}</span>
-              </a-col>
-              <a-col style="width:130px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;">已报废 &nbsp; {{ record.pdNumber }}</span>
-              </a-col>
-            </a-row>
-          </div>
-        </a-col>
-        <a-col class="gutter-row" :span="8">
-          <div class="gutter-box">
-            <a-row type="flex" justify="space-between" style="flex:1; font-size:22px;font-weight: 500;color: #373737;">
-              <a-col>设备维修</a-col>
-              <a-col style="color:#E4007F;">{{ record.totalRepairNumber }}</a-col>
-            </a-row>
-            <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
-              <a-col style="width:130px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;">计划性 &nbsp; {{ record.planNumber }}</span>
-              </a-col>
-              <a-col style="width:130px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;">非计划性 &nbsp; {{ record.notPlanNumber }}</span>
+                </a-col>
+              </a-row>
+              <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
+                <a-col style="width:130px;">
+                  <a-badge color="#3066EC "/>
+                  <span style="color:#3066EC ;"><a href="sb/info?status=7" style="color:#3066EC ;" target="_block">已停机 &nbsp; {{ record.stopNumber }}</a></span>
+                </a-col>
+                <a-col style="width:130px;">
+                  <a-badge color="#3066EC "/>
+                  <span style="color:#3066EC ;"><a href="sb/info?status=4" style="color:#3066EC ;" target="_block">已报废 &nbsp; {{ record.pdNumber }}</a></span>
+                </a-col>
+              </a-row>
+            </div>
+          </a-col>
+          <a-col class="gutter-row" :span="8">
+            <div class="gutter-box">
+              <a-row type="flex" justify="space-between" style="flex:1; font-size:22px;font-weight: 500;color: #373737;">
+                <a-col>设备维修</a-col>
+                <a-col style="color:#3066EC ;"><a href="repair/form" style="color:#3066EC ;" target="_block">{{ record.totalRepairNumber }}</a></a-col>
+              </a-row>
+              <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
+                <a-col style="width:130px;">
+                  <a-badge color="#3066EC "/>
+                  <span style="color:#3066EC ;"><a href="repair/form?planFlag=1" style="color:#3066EC ;" target="_block">计划性 &nbsp; {{ record.planNumber }}</a></span>
+                </a-col>
+                <a-col style="width:130px;">
+                  <a-badge color="#3066EC "/>
+                  <span style="color:#3066EC ;"><a href="repair/form?planFlag=2" style="color:#3066EC ;" target="_block">非计划性 &nbsp; {{ record.notPlanNumber }}</a></span>
 
-              </a-col>
-            </a-row>
-            <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
-              <a-col style="width:130px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;">其他 &nbsp; {{ record.otherNumber }}</span>
-              </a-col>
-              <a-col style="width:130px;">
-                <a-badge color="#E4007F"/>
-                <span style="color:#E4007F;">未设置 &nbsp; {{ record.noIdeaNumber }}</span>
-              </a-col>
-            </a-row>
-          </div>
-        </a-col>
-        <a-col class="gutter-row" :span="8">
-          <div style="display:flex;text-align:center;background:#fff;height: 170px;">
-            <div style="width:48%;margin:auto;font-size:26px; line-height: 60px;">
-              <div>设备总数</div>
-              <div style="font-size:24px;color:#E4007F;">{{ record.totalNumber }}</div>
+                </a-col>
+              </a-row>
+              <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
+                <a-col style="width:130px;">
+                  <a-badge color="#3066EC "/>
+                  <span style="color:#3066EC ;"><a href="repair/form?planFlag=3" style="color:#3066EC ;" target="_block">其他 &nbsp; {{ record.otherNumber }}</a></span>
+                </a-col>
+                <a-col style="width:130px;">
+                  <a-badge color="#3066EC "/>
+                  <span style="color:#3066EC ;"><a href="repair/form?planFlag=-1" style="color:#3066EC ;" target="_block">未设置 &nbsp; {{ record.noIdeaNumber }}</a></span>
+                </a-col>
+              </a-row>
             </div>
-            <div style="width: 1px;height: 70px;background: #999999;margin:auto;"></div>
-            <div style="width:48%;margin:auto; font-size:26px;line-height: 60px;">
-              <div>在用总数</div>
-              <div style="font-size:24px;color:#E4007F;">{{ record.useNumber }}</div>
+          </a-col>
+          <a-col class="gutter-row" :span="8">
+            <div style="display:flex;text-align:center;background:#fff;height: 170px;">
+              <div style="width:48%;margin:auto;font-size:26px; line-height: 60px;">
+                <div>设备总数</div>
+                <div style="font-size:24px;color:#3066EC ;"><a href="sb/info" style="color:#3066EC ;" target="_block">{{ record.totalDNumber }}</a></div>
+              </div>
+              <div style="width: 1px;height: 70px;background: #999999;margin:auto;"></div>
+              <div style="width:48%;margin:auto; font-size:26px;line-height: 60px;">
+                <div>在用总数</div>
+                <div style="font-size:24px;color:#3066EC ;"> <a href="sb/info?status=1" style="color:#3066EC ;" target="_block">在用 &nbsp;{{ record.useNumber }}</a></div>
+              </div>
             </div>
-          </div>
-        </a-col>
-      </a-row>
-    </div>
-    <div class="gutter-example">
-      <a-row :gutter="[20,40]">
-        <a-col class="gutter-row" :span="8">
-          <div style="height: 471px;background: #FFFFFF;padding:24px">
-            <div style="display:flex;justify-content: space-between;height: 18px; font-size:16px;color: #555555; ">
-              <div>设备状态一览图</div>
+          </a-col>
+        </a-row>
+      </div>
+      <div class="gutter-example">
+        <a-row :gutter="[20,40]">
+          <a-col class="gutter-row" :span="8">
+            <div style="height: 471px;background: #FFFFFF;padding:24px">
+              <div style="display:flex;justify-content: space-between;height: 18px; font-size:16px;color: #555555; ">
+                <div>设备状态一览图</div>
               <!-- <div>设备总数100</div> -->
+              </div>
+              <div id="container-pie"></div>
             </div>
-            <div id="container-pie"></div>
-          </div>
-        </a-col>
-        <a-col class="gutter-row" :span="12">
-          <div style="height: 471px;background: #FFFFFF; padding:24px;">
-            <div style="justify-content: space-between;height: 18px; font-size:16px;color: #555555; margin-bottom:25px;">
-              <div style="width: 7px;background: #4D86ED;"></div>
-              <div>近一周设备故障统计(截止到今天的一周)</div>
-            </div>
-            <div id="container-line"></div>
-          </div>
-        </a-col>
-        <a-col class="gutter-row" :span="4">
-          <div style="height: 471px;display:flex;flex-direction:column;justify-content: space-between">
-            <div class="btn" style="background:linear-gradient(to right,#36B5FA,#26ECF5);">
-              <img src="@/assets/diaobo.png" width="60px" alt="">
-              <span>调拨</span>
-            </div>
-            <div class="btn" style="background:linear-gradient(to right,#FF416D,#FF847F);">
-              <my-icon type="icon-jijubaofeishenqing" style="font-size:58px;"/>
-              <span>报废</span>
-            </div>
-            <div class="btn" style="background:linear-gradient(to right,#FB47D1,#F96EFE);">
-              <img src="@/assets/tingji.png" width="60px" alt="">
-              <span>停机</span>
+          </a-col>
+          <a-col class="gutter-row" :span="12">
+            <div style="height: 471px;background: #FFFFFF; padding:24px;">
+              <div style="justify-content: space-between;height: 18px; font-size:16px;color: #555555; margin-bottom:25px;">
+                <div style="width: 7px;background: #4D86ED;"></div>
+                <div>近一周设备故障统计(截止到今天的一周)</div>
+              </div>
+              <div id="container-line"></div>
             </div>
-            <div class="btn" style="background:linear-gradient(to right,#941FFF,#BC72FB);">
-              <img src="@/assets/pandian.png" width="60px" alt="">
-              <span>盘点</span>
+          </a-col>
+          <a-col class="gutter-row" :span="4">
+            <div style="height: 471px;display:flex;flex-direction:column;justify-content: space-between">
+              <div class="btn" style="background:linear-gradient(to right,#36B5FA,#3066EC);">
+                <img src="@/assets/diaobo.png" width="60px" alt="" @click="handleAdd(2)">
+                <span>调拨</span>
+              </div>
+              <div class="btn" style="background:linear-gradient(to right,#36B5FA,#3066EC);" @click="handleAdd(1)">
+                <my-icon type="icon-jijubaofeishenqing" style="font-size:58px;"/>
+                <span>报废</span>
+              </div>
+              <div class="btn" style="background:linear-gradient(to right,#36B5FA,#3066EC);" @click="handleAdd(0)">
+                <img src="@/assets/tingji.png" width="60px" alt="">
+                <span>停机</span>
+              </div>
+              <a style="color:#fff;" target="_block" href="/sb/store/check/plan">
+                <div class="btn" style="background:linear-gradient(to right,#36B5FA,#3066EC);">
+                  <img src="@/assets/pandian.png" width="60px" alt="">
+                  <span>盘点</span>
+                </div>
+              </a>
             </div>
-          </div>
-        </a-col>
-      </a-row>
-    </div>
-    <div class="gutter-example">
-      <a-row :gutter="20">
-        <a-col class="gutter-row" :span="6">
-          <div class="information">
-            <div style="display:flex;justify-content: space-between;align-items: center; padding-bottom:20px;">
-              <div style="display:flex; width:65px;height:17px;justify-content: space-between;align-items: center;">
-                <div style=" width: 17px;height: 17px;background: #3462FD;border-radius: 50%;"></div>
-                <div style="font-size: 18px;font-weight: 800;color: #333333;">资料</div>
+          </a-col>
+        </a-row>
+      </div>
+      <div class="gutter-example">
+        <a-row :gutter="20">
+          <a-col class="gutter-row" :span="6">
+            <div class="information">
+              <div style="display:flex;justify-content: space-between;align-items: center; padding-bottom:20px;">
+                <div style="display:flex; width:65px;height:17px;justify-content: space-between;align-items: center;">
+                  <div style=" width: 17px;height: 17px;background: #3462FD;border-radius: 50%;"></div>
+                  <div style="font-size: 18px;font-weight: 800;color: #333333;">资料</div>
+                </div>
+                <div >
+                  <a href="/operate/article/Article" target="_block"> 查看全部
+                    <my-icon type="icon-xiangyou-copy" style="font-size:13px;"/></a>
+                </div>
               </div>
-              <div >
-                <a href="/operate/article/Article" target="_block"> 查看全部
-                  <my-icon type="icon-xiangyou-copy" style="font-size:13px;"/></a>
+              <div
+                class="demo-infinite-container"
+              >
+                <a-list size="small" bordered :data-source="information">
+                  <a-list-item slot="renderItem" slot-scope="item,index" :class="{discolor: index%2}">
+                    <a-list-item-meta @click="handleView(item)" >
+                      <div slot="title" style="cursor:pointer">{{ item.title }}</div>
+                    </a-list-item-meta>
+                    <div>{{ item.updateTime }}</div>
+                  </a-list-item>
+                </a-list>
               </div>
             </div>
-            <div
-              class="demo-infinite-container"
-            >
-              <a-list size="small" bordered :data-source="information">
-                <a-list-item slot="renderItem" slot-scope="item,index" :class="{discolor: index%2}">
-                  <a-list-item-meta @click="handleView(item)" >
-                    <div slot="title" style="cursor:pointer">{{ item.title }}</div>
-                  </a-list-item-meta>
-                  <div>{{ item.updateTime }}</div>
-                </a-list-item>
-              </a-list>
+          </a-col>
+          <a-col class="gutter-row" :span="18">
+            <div class="information">
+              <div style="display:flex;justify-content: space-between;align-items: center; padding-bottom:20px;">
+                <div style="display:flex; width:65px;height:17px;justify-content: space-between;align-items: center;">
+                  <div style=" width: 17px;height: 17px;background: #3462FD;border-radius: 50%;"></div>
+                  <div style="font-size: 18px;font-weight: 800;color: #333333;">通知</div>
+                </div>
+                <a href="WorkplaceBacklog" target="_block">
+                  查看全部
+                  <my-icon type="icon-xiangyou-copy" style="font-size:13px;"/>
+                </a>
+              </div>
+              <s-table
+                ref="table"
+                size="small"
+                bordered
+                rowKey="id"
+                :columns="columns"
+                :data="loadData"
+                :pageSize="10"
+                :scroll="{ y: 400 }"
+              >
+                <span slot="action" slot-scope="record">
+                  <template>
+                    <a @click="handle(record)">详情</a>
+                    <a-divider v-if="record.status === 1" type="vertical" />
+                    <a v-if="record.status === 1" @click="dealJumpDetail(record)">跳转</a>
+                  </template>
+                </span>
+                <span slot="content" slot-scope="text" v-html="text">
+                </span>
+              </s-table>
             </div>
-          </div>
-        </a-col>
-        <a-col class="gutter-row" :span="18">
-          <div class="information">
-            <s-table
-              ref="table"
-              size="small"
-              bordered
-              rowKey="id"
-              :columns="columns"
-              :data="loadData"
-              :pageSize="10"
-              :scroll="{ y: 190 }"
-            >
-              <span slot="action" slot-scope="record">
-                <template>
-                  <a @click="handle(record)">详情</a>
-                  <a-divider v-if="record.status === 1" type="vertical" />
-                  <a v-if="record.status === 1" @click="dealJumpDetail(record)">跳转</a>
-                </template>
-              </span>
-              <span slot="content" slot-scope="text" v-html="text">
-              </span>
-            </s-table>
-          </div>
-        </a-col>
-      </a-row>
+          </a-col>
+        </a-row>
+      </div>
     </div>
     <detail ref="detailModal"></detail>
+    <sb-custom-form-view ref="showCustomView" @ok="handleOk"/>
   </div>
 </template>
 
 <script>
+import SbCustomFormView from '@/views/sb/scraps/modules/SbCustomFormView.vue'
 import Detail from '@/views/operate/article/modules/Detail.vue'
 import { STable } from '@/components'
 import { getArticlePage, fetchArticle } from '@/api/operate/article'
 import { getWorkplaceBacklogUserPage } from '@/api/workplace/backlog'
 import { Chart } from '@antv/g2'
 import { fetchSbWorkplaceData } from '@/api/sb/info'
+import { fetchCustomFieldTemplateByRemark } from '@/api/customize/fieldTemplate'
+
 export default {
   name: 'SbInfoWorkplaceBacklog',
   components: {
     STable,
     Detail,
+    SbCustomFormView,
     Chart
   },
   data () {
@@ -208,6 +227,7 @@ export default {
         { week: '周六', value: 6 },
         { week: '周日', value: 7 }
       ],
+      visible: true,
       allCount: 100,
       chartPie: null,
       chartLine: null,
@@ -325,6 +345,39 @@ export default {
     })
   },
   methods: {
+    handleAdd (key) {
+      let params
+
+      switch (key) {
+        case 0:
+          this.visible = false
+          params = { remark: 'sb_info_stop' }
+          fetchCustomFieldTemplateByRemark(params).then(res => {
+            const modal = this.$refs.showCustomView
+            modal.base(res.data)
+          })
+          break
+        case 1:
+          this.visible = false
+          params = { remark: 'sb_info_scrap' }
+          fetchCustomFieldTemplateByRemark(params).then(res => {
+            const modal = this.$refs.showCustomView
+            modal.base(res.data)
+          })
+          break
+        case 2:
+          this.visible = false
+          params = { remark: 'sb_info_allocate' }
+          fetchCustomFieldTemplateByRemark(params).then(res => {
+            const modal = this.$refs.showCustomView
+            modal.base(res.data)
+          })
+          break
+      }
+    },
+    handleOk (values) {
+      this.visible = true
+    },
     getDict () {
       this.typeDict = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.WORKPLACE_BACKLOG_TYPE)
       this.typeDetailDict = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.WORKPLACE_BACKLOG_DETAIL_TYPE)
@@ -497,6 +550,9 @@ display:flex;
 align-items: center;
 justify-content: space-around;
 }
+.btn:hover{
+  cursor:pointer;
+}
 .information{
   background: #fff;
   padding: 30px 12px;

+ 35 - 25
src/views/workplace/backlog/StoreWorkplaceBacklog.vue

@@ -7,33 +7,33 @@
             <div class="gutter-box">
               <a-row type="flex" justify="space-between" style="flex:1; font-size:22px;font-weight: 500;color: #373737;">
                 <a-col>待入库总数</a-col>
-                <a-col><a style="color:#E4007F;" href="/in/store/myform?status=1" target="_block">{{ topData.inTotalNum }}</a></a-col>
+                <a-col><a style="color:#3066EC ;" href="/in/store/myform?status=1" target="_block">{{ topData.inTotalNum }}</a></a-col>
               </a-row>
               <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
                 <a-col style="width:130px;">
-                  <a-badge color="#E4007F"/>
-                  <a href="/in/store/myform?type=1&status=1" target="_block"><span style="color:#E4007F;">采购入库 &nbsp; {{ topData.purchaseApplyNum }}</span></a>
+                  <a-badge color="#3066EC "/>
+                  <a href="/in/store/myform?type=1&status=1" target="_block"><span style="color:#3066EC ;">采购入库 &nbsp; {{ topData.purchaseApplyNum }}</span></a>
                 </a-col>
                 <a-col style="width:130px;">
-                  <a-badge color="#E4007F"/>
+                  <a-badge color="#3066EC "/>
                   <a href="/in/store/myform?type=2&status=1" target="_block">
-                    <span style="color:#E4007F;">闲置入库 &nbsp; {{ topData.spareBackApplyNum }}</span>
+                    <span style="color:#3066EC ;">闲置入库 &nbsp; {{ topData.spareBackApplyNum }}</span>
                   </a>
                 </a-col>
               </a-row>
               <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
                 <a-col style="width:130px;">
-                  <a-badge color="#E4007F"/>
+                  <a-badge color="#3066EC "/>
                   <a href="/in/store/myform?type=3&status=1" target="_block">
-                    <span style="color:#E4007F;">调拨入库 &nbsp; {{ topData.applyDBNum }}</span>
+                    <span style="color:#3066EC ;">调拨入库 &nbsp; {{ topData.applyDBNum }}</span>
 
                   </a>
                 </a-col>
                 <a-col style="width:130px;">
-                  <a-badge color="#E4007F"/>
+                  <a-badge color="#3066EC "/>
                   <a href="/in/store/myform?type=6&status=1" target="_block">
 
-                    <span style="color:#E4007F;">其他入库 &nbsp; {{ topData.otherNum }}</span>
+                    <span style="color:#3066EC ;">其他入库 &nbsp; {{ topData.otherNum }}</span>
 
                   </a>
 
@@ -45,36 +45,36 @@
             <div class="gutter-box">
               <a-row type="flex" justify="space-between" style="flex:1; font-size:22px;font-weight: 500;color: #373737;">
                 <a-col>待出库总数</a-col>
-                <a style="color:#E4007F;" href="/out/store/myform?status=1" target="_block">
+                <a style="color:#3066EC ;" href="/out/store/myform?status=1" target="_block">
                   <a-col>{{ topData.outTotalNum }}</a-col>
                 </a>
               </a-row>
               <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
                 <a-col style="width:130px;">
-                  <a-badge color="#E4007F"/>
+                  <a-badge color="#3066EC "/>
                   <a href="/out/store/myform?type=2&status=1" target="_block">
-                    <span style="color:#E4007F;">调拨出库 &nbsp; {{ topData.outDBNum }}</span>
+                    <span style="color:#3066EC ;">调拨出库 &nbsp; {{ topData.outDBNum }}</span>
                   </a>
                 </a-col>
                 <a-col style="width:130px;">
-                  <a-badge color="#E4007F"/>
+                  <a-badge color="#3066EC "/>
                   <a href="/out/store/myform?type=1&status=1" target="_block">
-                    <span style="color:#E4007F;">领用出库 &nbsp; {{ topData.lyNum }}</span>
+                    <span style="color:#3066EC ;">领用出库 &nbsp; {{ topData.lyNum }}</span>
                   </a>
                 </a-col>
               </a-row>
               <a-row type="flex" justify="space-between" :gutter="[0,16]" style="flex:1;font-size:18px;font-weight: 500;">
                 <a-col style="width:130px;">
-                  <a-badge color="#E4007F"/>
+                  <a-badge color="#3066EC "/>
                   <a href="/out/store/myform?type=3&status=1" target="_block">
-                    <span style="color:#E4007F;">报废出库 &nbsp; {{ topData.bfNum }}</span>
+                    <span style="color:#3066EC ;">报废出库 &nbsp; {{ topData.bfNum }}</span>
                   </a>
                 </a-col>
                 <a-col style="width:130px;">
-                  <a-badge color="#E4007F"/>
+                  <a-badge color="#3066EC "/>
                   <a href="/out/store/myform?type=6&status=1" target="_block">
 
-                    <span style="color:#E4007F;">其他出库 &nbsp; {{ topData.otherOutNum }}</span>
+                    <span style="color:#3066EC ;">其他出库 &nbsp; {{ topData.otherOutNum }}</span>
                   </a>
 
                 </a-col>
@@ -85,14 +85,14 @@
             <div style="display:flex;text-align:center;background:#fff;height: 170px;">
               <div style="width:48%;margin:auto;font-size:26px; line-height: 60px;">
                 <div>仓库总数</div>
-                <a style="color:#E4007F;" href="/storeJituan" target="_block">
+                <a style="color:#3066EC ;" href="/storeJituan" target="_block">
                   <div style="font-size:24px;">{{ topData.storeNums }}</div>
                 </a>
               </div>
               <div style="width: 1px;height: 70px;background: #999999;margin:auto;"></div>
               <div style="width:48%;margin:auto; font-size:26px;line-height: 60px;">
                 <div>备件总价值</div>
-                <a style="color:#E4007F;" href="/spare/part/info" target="_block">
+                <a style="color:#3066EC ;" href="/spare/part/info" target="_block">
 
                   <div style="font-size:24px;">{{ topData.totalPrice }}</div>
                 </a>
@@ -124,19 +124,19 @@
           </a-col>
           <a-col class="gutter-row" :span="4">
             <div style="height: 471px;display:flex;flex-direction:column;justify-content: space-between">
-              <div class="btn" style="background:linear-gradient(to right,#36B5FA,#26ECF5);" @click="handleOutAdd">
+              <div class="btn" style="background:linear-gradient(to right,#36B5FA,#3066EC);" @click="handleOutAdd">
                 <my-icon type="icon-chukuguanli" style="font-size:58px;"/>
                 <span>出库</span>
               </div>
-              <div class="btn" style="background:linear-gradient(to right,#FF416D,#FF847F);" @click="handleInAdd">
+              <div class="btn" style="background:linear-gradient(to right,#36B5FA,#3066EC);" @click="handleInAdd">
                 <my-icon type="icon-rukuguanli" style="font-size:58px;"/>
                 <span>入库</span>
               </div>
-              <div class="btn" style="background:linear-gradient(to right,#FB47D1,#F96EFE);">
+              <div class="btn" style="background:linear-gradient(to right,#36B5FA,#3066EC);">
                 <my-icon type="icon-zichanguanli-zichantiaobo" style="font-size:58px;"/>
                 <span>调拨</span>
               </div>
-              <div class="btn" style="background:linear-gradient(to right,#941FFF,#BC72FB);" @click="$refs.addStore.base()">
+              <div class="btn" style="background:linear-gradient(to right,#36B5FA,#3066EC);" @click="$refs.addStore.base()">
                 <my-icon type="icon-xinzengyugengxinhuopindangan-copy" style="font-size:58px;"/>
                 <span>新增</span>
               </div>
@@ -174,6 +174,16 @@
           </a-col>
           <a-col class="gutter-row" :span="18">
             <div class="information">
+              <div style="display:flex;justify-content: space-between;align-items: center; padding-bottom:20px;">
+                <div style="display:flex; width:65px;height:17px;justify-content: space-between;align-items: center;">
+                  <div style=" width: 17px;height: 17px;background: #3462FD;border-radius: 50%;"></div>
+                  <div style="font-size: 18px;font-weight: 800;color: #333333;">通知</div>
+                </div>
+                <a href="WorkplaceBacklog" target="_block">
+                  查看全部
+                  <my-icon type="icon-xiangyou-copy" style="font-size:13px;"/>
+                </a>
+              </div>
               <s-table
                 ref="table"
                 size="small"
@@ -182,7 +192,7 @@
                 :columns="columns"
                 :data="loadData"
                 :pageSize="10"
-                :scroll="{ y: 190 }"
+                :scroll="{ y: 400 }"
               >
                 <span slot="action" slot-scope="record">
                   <template>