cyy пре 2 година
родитељ
комит
e2d13a19ab

+ 1 - 1
src/assets/styles/pages/dashboard.scss

@@ -30,7 +30,7 @@ $transition:all .5s;
       font-size: 12px;
       font-size: 12px;
       height: 100%;
       height: 100%;
       margin-left: 1%;
       margin-left: 1%;
-      padding: 0.2% 1.4% 0.2% 1.2%;
+      padding: 0.8% 1.4% 0.2% 1.2%;
     }
     }
     .el-tabs__header{
     .el-tabs__header{
       margin: 0;
       margin: 0;

+ 2 - 8
src/layout/header-aside/components/header-user/index.vue

@@ -126,7 +126,8 @@
                     <!-- <el-button @click="bpmnVisible = false">取 消</el-button> -->
                     <!-- <el-button @click="bpmnVisible = false">取 消</el-button> -->
                     <el-button type="primary" @click="bpmnVisible = false">关 闭</el-button>
                     <el-button type="primary" @click="bpmnVisible = false">关 闭</el-button>
                 </span>
                 </span>
-            </el-transfer></el-dialog>
+            </el-transfer>
+        </el-dialog>
     </div>
     </div>
 </template>
 </template>
 
 
@@ -256,13 +257,6 @@ export default {
             exitSwitchUser: 'ibps/user/exitSwitchUser',
             exitSwitchUser: 'ibps/user/exitSwitchUser',
             setTenantids: 'ibps/user/setTenantids'
             setTenantids: 'ibps/user/setTenantids'
         }),
         }),
-        // bpmnClose(){
-        //     this.$confirm('确认关闭?')
-        //     .then(_ => {
-        //         // done();
-        //     })
-        //     .catch(_ => {});
-        // },
         handleControlItemClick (command) {
         handleControlItemClick (command) {
             switch (command) {
             switch (command) {
                 case 'dashboard':// 主页
                 case 'dashboard':// 主页

+ 36 - 31
src/views/system/dashboard/templates/paddingApprove.vue

@@ -1,33 +1,38 @@
 <template>
 <template>
-    <el-card
-        :style="{height:getDashboardHeight(),width:'100%'}"
-        class="ibps-desktop-dashboard"
-    >
-        <el-row ref="row" :gutter="12">
-            <template v-if="data && data.length >0">
-                <el-col v-for="item in data" :key="item.id" :span="24" :sm="12" :md="6" :lg="6" :xl="6">
-                    <div :class="'bg-'+item.color" class="item" @click="openPlate(item.url)">
-                        <div class="item-header">
-                            <p>{{ item.dataContent }}</p>
-                        </div>
-                        <div class="item-body">
-                            <h2><count-to :end-val="parseInt(item.dataText,10)" :duration="4000" /></h2>
-                        </div>
-                        <p class="item-tip">{{ item.dataContent |firstStr }}</p>
-                    </div>
-                </el-col>
-            </template>
-            <template v-else>
-                <el-col v-for="(item,i) in 8" :key="i" :span="24" :sm="12" :md="6" :lg="6" :xl="6">
-                    <div class="item bg-grey-steel">
-                        <div class="item-header">&nbsp;</div>
-                        <div class="item-body">
-                            <h2>&nbsp;</h2>
-                        </div>
-                        <p class="item-tip">&nbsp;</p>
-                    </div>
-                </el-col>
-            </template>
-        </el-row>
-    </el-card>
+  <el-card
+    :style="{width:'100%'}"
+    class="ibps-desktop-dashboard changeShadow verticalCenterFlex"
+  >
+    <el-row ref="row" :gutter="12">
+      <template v-if="data && data.length >0">
+        <el-col v-for="item in data" :key="item.id" :span="24" :sm="6" :md="6" :lg="6" :xl="6">
+          <div :class="'bg-'+item.color" class="item pendingAssigneeClass" @click="openPlate(item.url)">
+            <div class="item-header">
+              <p class="item-headerH">{{ item.dataContent }}</p>
+            </div>
+            <div class="item-body">
+              <h2><count-to :end-val="parseInt(item.dataText,10)" :duration="2000" /></h2>
+            </div>
+            <p class="item-tip">{{ item.dataContent |firstStr }}</p>
+          </div>
+        </el-col>
+      </template>
+      <template v-else>
+        <el-col v-for="(item,i) in 6" :key="i" :span="24" :sm="6" :md="6" :lg="6" :xl="6">
+          <div class="item bg-grey-steel">
+            <div class="item-header">&nbsp;</div>
+            <div class="item-body">
+              <h2>&nbsp;</h2>
+            </div>
+            <p class="item-tip">&nbsp;</p>
+          </div>
+        </el-col>
+      </template>
+    </el-row>
+  </el-card>
+
 </template>
 </template>
+
+
+
+//height:getDashboardHeight()

+ 29 - 29
src/views/system/dashboard/templates/userInfoTab.vue

@@ -1,32 +1,32 @@
 <template>
 <template>
-    <el-card class="box-card" style="height:100%;">
-        <div ref="body" :style="{height:'100%',width:'100%','margin-top':'-10px'}">
-            <ibps-list-item-meta style="align-items: center;overflow: hidden;">
-                <el-avatar
-                    v-if="data"
-                    slot="avatar"
-                    :icon="data.photo===''?'ibps-icon-user-circle':null"
-                    :src="getPhoto(`/file/getImage?attachmentId=1212033424013918208`)"
-                    :size="100"
-                    style="font-size:100px;color: #C0C4CC;background: #fff;"
-                >
-                    <img :src="getPhoto(data.photo)" class="photo-img" @error="errorAvatarHandler(data)">
-                </el-avatar>
-                <div slot="title" class="ibps-item-content">
-                    <span class="ibps-item-content-title" style="font-size:16px">您好!<span v-if="data && data.orgName!==''">{{ data.orgName }}的</span><label v-if="data&&data.fullname!==''">{{ data.fullname }}</label><label v-if="data&&data.gender!==''">{{ data.gender|filterStatus('gender') }}</label> </span>
-                    <div slot="label" class="ibps-item-content-label">
-                        <div>
-                            地点:
-                            <el-tag class="item512" type="success" size="mini">{{ getUser('dd') }}</el-tag>
-                        </div>
-                        <div>
-                            部门:
-                            <el-tag v-for="(item, index) in getUser('bm')" :key="Date.now() + Math.random() + index" class="item512" type="info" size="mini">{{ item }}</el-tag>
-                        </div>
-                        <!-- <span v-if="data&&data.address!==''">地址:{{ data.address }}</span> -->
-                    </div>
-                </div>
-            </ibps-list-item-meta>
+  <el-card class="box-card changeShadow verticalCenterFlex" >
+    <div ref="body" :style="{width:'100%'}">
+      <ibps-list-item-meta style="align-items: center;overflow: hidden;">
+        <el-avatar
+          v-if="data"
+          slot="avatar"
+          :icon="data.photo===''?'ibps-icon-user-circle':null"
+          :src="getPhoto(`/file/getImage?attachmentId=1212033424013918208`)"
+          :size="100"
+          style="font-size:100px;color: #C0C4CC;background: #fff;"
+        >
+          <img :src="getPhoto(data.photo)" class="photo-img" @error="errorAvatarHandler(data)">
+        </el-avatar>
+        <div slot="title" class="ibps-item-content">
+          <span class="ibps-item-content-title" style="font-size:16px">您好!<span v-if="data&&data.orgName!==''">{{ data.orgName }}的</span><label v-if="data&&data.fullname!==''">{{ data.fullname }}</label><label v-if="data&&data.gender!==''">{{ data.gender|filterStatus('gender') }}</label> </span>
+          <div slot="label" class="ibps-item-content-label">
+            <div>
+              地点:
+              <el-tag class="item512" type="success" size="mini">{{ getUser('dd') }}</el-tag>
+            </div>
+            <div>
+              部门:
+              <el-tag v-for="(item, index) in getUser('bm')" :key="Date.now() + Math.random() + index" class="item512" type="info" size="mini">{{ item }}</el-tag>
+            </div>
+            <!-- <span v-if="data&&data.address!==''">地址:{{ data.address }}</span> -->
+          </div>
         </div>
         </div>
-    </el-card>
+      </ibps-list-item-meta>
+    </div>
+  </el-card>
 </template>
 </template>