Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.background": "#3C2154",
+        "titleBar.activeBackground": "#542E76",
+        "titleBar.activeForeground": "#FDFCFE"
+    }
+}

src/views/system/dashboard/components/util.js

@@ -8,6 +8,7 @@ import { findAllByCurrUserId, saveCalendarInfos, removeCalendarInfos, delNavigat
 import { isEqual } from 'lodash'
 import Bus from '@/utils/EventBus'
 import newPng from '@/assets/images/homepage/new.png'
+import { BASE_API, BUSINESS_BASE_URL, SYSTEM_URL } from '@/api/baseUrl'
 
 /**
  * 创建组件
@@ -185,7 +186,15 @@ export function buildComponent (name, column, preview, vm) {
                         })
                     } else if (param.alias === 'quickNavigation') {
                         getNavigation().then(res => {
-                            this.quickNavigationData = res.data || []
+                            let arr = res.data || []
+                            arr.forEach((item,i)=>{
+                                if(item.userId==""){
+                                    item.urlAddr = BASE_API().slice(0,-4) + '#' +item.urlAddr
+                                    // console.log(item.urlAddr,'item.urlAddr')
+                                }
+                            })
+                            
+                            this.quickNavigationData = arr
                         })
                     } else {
                         getData(param, params).then(res => {
@@ -381,7 +390,8 @@ export function buildComponent (name, column, preview, vm) {
                         myTraining: 'rygl/rypx/wdpx',
                         myTesting: 'rygl/kszx/wdks',
                         myDevices: 'sbgls/mywh',
-                        notice: 'tygl/tzgg'
+                        notice: 'tygl/tzgg',
+                        myFacility:'sshjgl/sshjjk/sshjkzzl'
                     }
                     if (menuMap[url]) {
                         const alias = menuMap[url].split('/')[0]

src/views/system/dashboard/templates/pendingMatters.vue

@@ -1,99 +1,99 @@
 <template>
-    <el-card class="home-card changeShadow">
-        <div slot="header" class="clearfix">
-            <ibps-icon name="list-ul" />
-            <el-badge :value="totalCount" :max="99" class="badge">
-                <span class="title">{{ title }}</span>
-            </el-badge>
-            <ibps-desktop-toolbar
-                ref="toolbar"
-                :actions="[{ key: 'refresh' }, { key: 'more' }, { key: 'collapse' }]"
-                @action-event="handleActionEvent"
-            />
-        </div>
-        <div ref="body" :style="{height: showHeight, width: '100%'}">
-            <el-scrollbar
-                style="height: 100%; width: 100%;"
-                wrap-class="ibps-scrollbar-wrapper"
-            >
-                <!-- <ibps-list-group v-if="data && data.length >0">
-                    <ibps-list v-for="(item,i) in data" :key="i" @click.native="handleFlowClick({taskId:item.taskId})">
-                        <div slot="label">{{ item.createTime|dateFormat }}</div>
-                        <el-link type="primary" :underline="false">{{ item.subject|removeHtmlTag }}</el-link>
-                        <el-avatar slot="icon" :src="getPhoto(item.instCreatorPhoto)" icon="el-icon-user-solid" @error="errorAvatarHandler">{{ item.creator }}</el-avatar>
-                        <span slot="extra">
-                            <ibps-icon name="dot-circle-o" style="color:#36c6d3" />
-                            {{ item.status | filterStatus('pending') }}
-                        </span>
-                    </ibps-list>
-                </ibps-list-group> -->
-                <ibps-list v-if="data && data.length" class="ibps-pr-10">
-                    <ibps-list-item
-                        v-for="(item, index) in data"
-                        :key="index"
-                        style="padding: 6px 0;"
-                        @click.native="handleFlowClick({ taskId: item.taskId, flowName: item.name })"
-                    >
-                        <ibps-list-item-meta>
-                            <template slot="avatar">
-                                <template v-if="item.remindTimes === 0">
+<el-card class="home-card changeShadow">
+    <div slot="header" class="clearfix">
+        <ibps-icon name="list-ul" />
+        <el-badge :value="totalCount" :max="99" class="badge">
+            <span class="title">{{ title }}</span>
+        </el-badge>
+        <ibps-desktop-toolbar
+            ref="toolbar"
+            :actions="[{ key: 'refresh' }, { key: 'more' }, { key: 'collapse' }]"
+            @action-event="handleActionEvent"
+        />
+    </div>
+    <div ref="body" :style="{height: showHeight, width: '100%'}">
+        <el-scrollbar
+            style="height: 100%; width: 100%;"
+            wrap-class="ibps-scrollbar-wrapper"
+        >
+            <!-- <ibps-list-group v-if="data && data.length >0">
+                <ibps-list v-for="(item,i) in data" :key="i" @click.native="handleFlowClick({taskId:item.taskId})">
+                    <div slot="label">{{ item.createTime|dateFormat }}</div>
+                    <el-link type="primary" :underline="false">{{ item.subject|removeHtmlTag }}</el-link>
+                    <el-avatar slot="icon" :src="getPhoto(item.instCreatorPhoto)" icon="el-icon-user-solid" @error="errorAvatarHandler">{{ item.creator }}</el-avatar>
+                    <span slot="extra">
+                        <ibps-icon name="dot-circle-o" style="color:#36c6d3" />
+                        {{ item.status | filterStatus('pending') }}
+                    </span>
+                </ibps-list>
+            </ibps-list-group> -->
+            <ibps-list v-if="data && data.length>0" class="ibps-pr-10">
+                <ibps-list-item
+                    v-for="(item, index) in data"
+                    :key="index"
+                    style="padding: 6px 0;"
+                    @click.native="handleFlowClick({ taskId: item.taskId,flowName:item.name })"
+                >
+                    <ibps-list-item-meta>
+                        <template slot="avatar">
+                            <template v-if="item.remindTimes === 0">
+                                <el-avatar
+                                    :src="getPhoto(item.photo)"
+                                    icon="el-icon-user-solid"
+                                    @error="errorAvatarHandler"
+                                >{{ item.creator }}</el-avatar>
+                            </template>
+                            <template v-else>
+                                <el-badge :value="item.remindTimes" :max="99" class="item">
                                     <el-avatar
-                                        :src="getPhoto(item.photo)"
+                                        :src="getPhoto(item.instCreatorPhoto)"
                                         icon="el-icon-user-solid"
                                         @error="errorAvatarHandler"
                                     >{{ item.creator }}</el-avatar>
-                                </template>
-                                <template v-else>
-                                    <el-badge :value="item.remindTimes" :max="99" class="item">
-                                        <el-avatar
-                                            :src="getPhoto(item.instCreatorPhoto)"
-                                            icon="el-icon-user-solid"
-                                            @error="errorAvatarHandler"
-                                        >{{ item.creator }}</el-avatar>
-                                    </el-badge>
-                                </template>
+                                </el-badge>
                             </template>
-                            <el-link slot="title" type="primary" :underline="false" style="display: inline-block; width: 100%;">
-                                <div style="display: flex; justify-content: space-between; width: 100%;">
-                                    <span style="font-size: 14px; width: 70%;">{{ item.procDefName }}</span>
-                                    <div style="font-size:14px">
-                                        <el-tag size="mini" type="success" disable-transitions>{{ item.name.length > 5 ? `待${item.name.slice(0, 4)}...` : `待${item.name}` }}</el-tag>
-                                        <el-tag v-if="item.expired === '即将超时'" size="mini" type="warning">{{ item.expired }}</el-tag>
-                                        <el-tag v-else-if="item.expired === '已超时'" size="mini" type="danger">{{ item.expired }}</el-tag>
-                                    </div>
-                                    <!-- <el-tag v-else-if="item.state=='danger'" type=''>{{ '已超时' }}</el-tag> -->
+                        </template>
+                        <el-link slot="title" type="primary" :underline="false" style="display: inline-block; width: 100%;">
+                            <div style="display: flex; justify-content: space-between; width: 100%;">
+                                <span style="font-size: 14px; width: 70%;">{{ item.procDefName }}</span>
+                                <div style="font-size:14px">
+                                    <el-tag size="mini" type="success" disable-transitions>{{ item.name.length > 5 ? `待${item.name.slice(0, 4)}...` : `待${item.name}` }}</el-tag>
+                                    <el-tag v-if="item.expired === '即将超时'" size="mini" type="warning">{{ item.expired }}</el-tag>
+                                    <el-tag v-else-if="item.expired === '已超时'" size="mini" type="danger">{{ item.expired }}</el-tag>
                                 </div>
-                            </el-link>
-                            <template slot="description">
-                                <div style="font-size: 12px;">
-                                    {{ getTaskDesc(item.subject) }}
-                                </div>
-                            </template>
-                            <template slot="description">
-                                <div style="display: flex; justify-content: space-between;">
-                                    <el-tag
-                                        v-if="getTaskInfo(item.subject, 'deptName')"
-                                        size="mini"
-                                        style="font-size: 12px;"
-                                        type="info"
-                                        disable-transitions
-                                    >{{ getTaskInfo(item.subject, 'deptName') }}</el-tag>
-                                    <div v-else style="color:#fff;">无</div>
-                                    <span style="font-size: 12px;">
-                                        {{ item.createTime | dateFormat }}
-                                    </span>
-                                </div>
-                            </template>
-                        </ibps-list-item-meta>
-                    </ibps-list-item>
-                </ibps-list>
-                <el-alert
-                    v-else
-                    :title="$t('common.noData')"
-                    :closable="false"
-                    type="warning"
-                />
-            </el-scrollbar>
-        </div>
-    </el-card>
+                                <!-- <el-tag v-else-if="item.state=='danger'" type=''>{{ '已超时' }}</el-tag> -->
+                            </div>
+                        </el-link>
+                        <template slot="description">
+                            <div style="font-size: 12px;">
+                                {{ getTaskDesc(item.subject) }}
+                            </div>
+                        </template>
+                        <template slot="description">
+                            <div style="display: flex; justify-content: space-between;">
+                                <el-tag
+                                    v-if="getTaskInfo(item.subject, 'deptName')"
+                                    size="mini"
+                                    style="font-size: 12px;"
+                                    type="info"
+                                    disable-transitions
+                                >{{ getTaskInfo(item.subject, 'deptName') }}</el-tag>
+                                <div v-else style="color:#fff;">无</div>
+                                <span style="font-size: 12px;">
+                                    {{ item.createTime | dateFormat }}
+                                </span>
+                            </div>
+                        </template>
+                    </ibps-list-item-meta>
+                </ibps-list-item>
+            </ibps-list>
+            <el-alert
+                v-else
+                :title="$t('common.noData')"
+                :closable="false"
+                type="warning"
+            />
+        </el-scrollbar>
+    </div>
+</el-card>
 </template>

src/views/system/dashboard/templates/quickNavigation.vue

@@ -22,7 +22,7 @@
                     <el-tag
                         v-for="(tag, i) in quickNavigationData"
                         :key="i"
-                        closable
+                        :closable = "tag.userId==''?false:true"
                         :disable-transitions="false"
                         class="draggable"
                         @close="handleNavRemove(tag.id, i)"