Parcourir la source

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

liujiayin il y a 3 ans
Parent
commit
c5c8171b10

+ 11 - 0
src/api/detection/jcwtd.js

@@ -62,3 +62,14 @@ export function deleteMe(data){
     params: data
   })
 }
+
+/*
+无效接口,去除引用警告
+*/
+export function remove(data){
+    return request({
+        url:JCWTD_URL + '/delete',
+        method: 'post',
+        params: data
+    })
+}

+ 1 - 1
src/assets/styles/theme/theme-base.scss

@@ -62,7 +62,7 @@
 			  font-size: 14px;
 			  font-weight: bold;
 			  i{
-				color: red;
+				color: #1894d0;
 				font-size: 24px;
 			  }
 		  }

+ 2 - 2
src/components/jbd-panel/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="jbd-sys-title">
       <!--<span  class="jbd-sys-title-cont-center" style="margin-left: 40px;float: left;">金通实验室认证认可LIMS系统V2.0</span>-->
-      <span  class="jbd-sys-title-cont-center" style="margin-left: 40px;float: left;">罗湖实验室信息管理系统</span>
+      <span  class="jbd-sys-title-cont-center" style="margin-left: 40px;float: left;">深圳市罗湖医院集团细胞质量检测实验室</span>
        <span style="float: right; " class="jbd-sys-title-contact">
          </br>
        深圳市金源信通科技有限公司开发 <i style="margin-left: 10px;" class="el-icon-phone"/> 0755-2642-4403
@@ -9,4 +9,4 @@
 
      </span>
   </div>
-</template>
+</template>

+ 343 - 346
src/layout/header-aside/layout.vue

@@ -1,368 +1,365 @@
 <template>
-  <div
-    :style="styleLayoutMainGroup"
-    :class="{grayMode: grayActive}"
-    class="ibps-layout-header-aside-group hidden-print"
-  >
-
-   <!-- <iframe
-       style="display: none;"
-       id="iframeContain"
-       name="iframeContain"
-       seamless
-       scrolling="yes"
-       src="https://www.szjyxt.com/#/fileView?url=https%3A%2F%2Fwww.szjyxt.com%2Fibps%2Fplatform%2Fv3%2Ffile%2Fdownload%3FattachmentId%3D925044155762081792&isEdit=true&fileType=docx&title=GDYR-CX01-A0%20%E4%BF%9D%E8%AF%81%E5%85%AC%E6%AD%A3%E6%80%A7%E7%AE%A1%E7%90%86%E7%A8%8B%E5%BA%8F&user=%5Bobject%20Object%5D&mode=view&editUrl=https%3A%2F%2Fwww.szjyxt.com%2Fibps%2Fplatform%2Fv3%2Ffile%2FeditCallback%3FfileName%3DGDYR-CX01-A0%20%E4%BF%9D%E8%AF%81%E5%85%AC%E6%AD%A3%E6%80%A7%E7%AE%A1%E7%90%86%E7%A8%8B%E5%BA%8F%26fileType%3Ddocx&key="
-     >
-    </iframe> -->
+    <div
+        :style="styleLayoutMainGroup"
+        :class="{ grayMode: grayActive }"
+        class="ibps-layout-header-aside-group hidden-print"
+    >
+        <!-- <iframe
+            style="display: none;"
+            id="iframeContain"
+            name="iframeContain"
+            seamless
+            scrolling="yes"
+            src="https://www.szjyxt.com/#/fileView?url=https%3A%2F%2Fwww.szjyxt.com%2Fibps%2Fplatform%2Fv3%2Ffile%2Fdownload%3FattachmentId%3D925044155762081792&isEdit=true&fileType=docx&title=GDYR-CX01-A0%20%E4%BF%9D%E8%AF%81%E5%85%AC%E6%AD%A3%E6%80%A7%E7%AE%A1%E7%90%86%E7%A8%8B%E5%BA%8F&user=%5Bobject%20Object%5D&mode=view&editUrl=https%3A%2F%2Fwww.szjyxt.com%2Fibps%2Fplatform%2Fv3%2Ffile%2FeditCallback%3FfileName%3DGDYR-CX01-A0%20%E4%BF%9D%E8%AF%81%E5%85%AC%E6%AD%A3%E6%80%A7%E7%AE%A1%E7%90%86%E7%A8%8B%E5%BA%8F%26fileType%3Ddocx&key="
+        >
+        </iframe> -->
 
-    <!-- 半透明遮罩 -->
-    <div class="ibps-layout-header-aside-mask" />
-    <!-- websocket -->
-    <!-- <ibps-notify-monitor /> -->
-    <!-- 主体内容 -->
-    <div class="ibps-layout-header-aside-content" flex="dir:top">
+        <!-- 半透明遮罩 -->
+        <div class="ibps-layout-header-aside-mask" />
+        <!-- websocket -->
+        <!-- <ibps-notify-monitor /> -->
+        <!-- 主体内容 -->
+        <div class="ibps-layout-header-aside-content" flex="dir:top">
+            <panle />
+            <!-- 顶栏 -->
+            <div
+                :style="{opacity: searchActive ? 0.5 : 1}"
+                class="ibps-theme-header"
+                style="box-shadow: 1px 4px 6px rgba(0, 0, 0, 0.12), 0 0 5px rgba(155, 155, 0, 0.04);margin-bottom: 5px;"
+                flex-box="0"
+                flex
+            >
+                <!-- <div
+                    :class="{'logo-group': true, 'logo-transition': asideTransition, 'ibps-pt-5': system.logoType === 'image', 'ibps-pl-0': system.logoType === 'image'}"
+                    :style="{width: asideCollapse ? asideWidthCollapse : asideWidth}"
+                    flex-box="0"
+                >
+                    <el-dropdown
+                        v-if="subsystemList && subsystemList.length > 1"
+                        trigger="click"
+                        placement="bottom-start"
+                        @command="command => handleSubsystemClick(command)"
+                    >
+                        <ibps-logo
+                            :system="system"
+                            :aside-collapse="asideCollapse"
+                            :subsystem-list="subsystemList"
+                            :logo-icon-all="logoIconAll"
+                            :logo-icon-only="logoIconOnly"
+                        />
+                        <el-dropdown-menu slot="dropdown" style="width: 180px;">
+                            <el-dropdown-item
+                                v-for="(item, index) in subsystemList"
+                                :key="index"
+                                :disabled="item.id === system.id"
+                                :command="item"
+                            >
+                                <ibps-icon :name="item.logo || 'logo'" :title="item.name"/>{{ item.name }}
+                            </el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
 
-       <panle/>
-      <!-- 顶栏 -->
-      <div
-        :style="{
-          opacity: searchActive ? 0.5 : 1
-        }"
-        class="ibps-theme-header"
-        style=" box-shadow: 1px 4px 6px rgba(0, 0, 0, .12), 0 0 5px rgba(155,155, 0, .04);margin-bottom: 5px;"
-        flex-box="0"
-        flex
-      >
-       <!-- <div
-          :class="{'logo-group': true,
-                   'logo-transition': asideTransition,
-                   'ibps-pt-5':system.logoType ==='image',
-                   'ibps-pl-0':system.logoType ==='image'
-          }"
-          :style="{width: asideCollapse ? asideWidthCollapse : asideWidth}"
-          flex-box="0"
-        >
-          <el-dropdown
-            v-if="subsystemList && subsystemList.length >1"
-            trigger="click"
-            placement="bottom-start"
-            @command="command => handleSubsystemClick(command)"
-          >
-            <ibps-logo
-              :system="system"
-              :aside-collapse="asideCollapse"
-              :subsystem-list="subsystemList"
-              :logo-icon-all="logoIconAll"
-              :logo-icon-only="logoIconOnly"
-            />
-            <el-dropdown-menu slot="dropdown" style="width:180px;">
-              <el-dropdown-item
-                v-for="(item,index) in subsystemList"
-                :key="index"
-                :disabled="item.id===system.id"
-                :command="item"
-              >
-                <ibps-icon :name="item.logo||'logo'" :title="item.name" />  {{ item.name }}
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
+                    <ibps-logo
+                        v-else
+                        :system="system"
+                        :aside-collapse="asideCollapse"
+                        :subsystem-list="subsystemList"
+                        :logo-icon-all="logoIconAll"
+                        :logo-icon-only="logoIconOnly"
+                    />
+                </div>
+                <div
+                    class="toggle-aside-btn"
+                    flex-box="0"
+                    @click="handleToggleAside"
+                >
+                    <ibps-icon :name="asideCollapse ? 'indent' : 'outdent'" />
+                </div> -->
+                
+                <ibps-menu-header flex-box="1" @pageChange="pageChange" />
 
-          <ibps-logo
-            v-else
-            :system="system"
-            :aside-collapse="asideCollapse"
-            :subsystem-list="subsystemList"
-            :logo-icon-all="logoIconAll"
-            :logo-icon-only="logoIconOnly"
-          />
-        </div> -->
-        <!-- <div class="toggle-aside-btn" flex-box="0" @click="handleToggleAside">
-          <ibps-icon :name="asideCollapse ?'indent':'outdent'" />
-        </div> -->
-        <ibps-menu-header
-         flex-box="1"
-         @pageChange ="pageChange"
-         />
-        <!-- 顶栏右侧 -->
-        <div class="ibps-header-right"  flex-box="0">
-          <!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$nodeEnv === 'development'" -->
-         <!-- <ibps-header-search @click="handleSearchClick" /> --> <!-- 全局搜索放大镜 -->
-        <!--  <ibps-header-error-log v-if="$nodeEnv === 'development'" />
-          <ibps-header-base-url v-if="$nodeEnv === 'development'" /> --><!-- 日志与异常 -->
+                <!-- 顶栏右侧 -->
+                <div class="ibps-header-right" flex-box="0">
+                    <!-- 如果你只想在开发环境显示这个按钮请添加 v-if="$nodeEnv === 'development'" -->
+                    <!-- 全局搜索放大镜、日志、环境切换、全屏 -->
+                    <!-- <ibps-header-search @click="handleSearchClick" />
+                    <ibps-header-error-log v-if="$nodeEnv === 'development'" />
+                    <ibps-header-base-url v-if="$nodeEnv === 'development'" />
 
-          <!-- <ibps-header-download /> -->
-          <!-- <ibps-header-locking />
-          <ibps-header-theme />
-          <ibps-header-language />
-          <ibps-header-size /> -->
-         <!-- <ibps-header-fullscreen /> -->
-          <!-- <ibps-header-tenant /> -->
+                    <ibps-header-download />
+                    <ibps-header-locking />
+                    <ibps-header-theme />
+                    <ibps-header-language />
+                    <ibps-header-size />
+                    <ibps-header-fullscreen />
+                    <ibps-header-tenant /> -->
 
-          <span style="font-size: 12px; cursor: pointer;" @click="goToMain()">首页</span>
-             <span style="margin: 0 10px; ">|</span>
-          <ibps-header-message /><!-- 消息中心 -->
-            <span style="margin: 0 10px; ">|</span>
-          <ibps-header-user />
-            <span style="margin-left: 10px;">|</span>
-          <ibps-header-setting />
-        </div>
-      </div>
-      <!-- 下面 主体 -->
-      <div class="ibps-theme-container" flex-box="1" flex>
-        <!-- 主体 侧边栏 -->
-        <div
-          v-if="sysName !='首页'"
-          ref="aside"
-          flex-box="0"
-          :class="{'ibps-theme-container-aside': true, 'ibps-theme-container-transition': asideTransition}"
-          :style="{
-            width: asideCollapse ? asideWidthCollapse : asideWidth,
-            opacity: searchActive ? 0.5 : 1
-          }"
-        >
-        <!-- 侧部顶头栏-->
-        <div class="layout-border-left">
-            <div class="toggle-aside-btn" style="float: right; width: 25%;" @click="handleToggleAside">
-              <ibps-icon  :name="asideCollapse ?'indent':'outdent'" />
-            </div>
-            <div style="width: 74%;" class="toggle-aside-btn layout-border-left-name">
-             <span>{{getSystemName[0].name}}</span>
+                    <span style="font-size: 12px; cursor: pointer;" @click="goToMain()">首页</span>
+                    <span style="margin: 0 10px;">|</span>
+                    <ibps-header-message />
+                    <!-- 消息中心 -->
+                    <span style="margin: 0 10px;">|</span>
+                    <ibps-header-user />
+                    <span style="margin-left: 10px;">|</span>
+                    <ibps-header-setting />
+                </div>
             </div>
-        </div>
+            <!-- 下面 主体 -->
+            <div class="ibps-theme-container" flex-box="1" flex>
+                <!-- 主体 侧边栏 -->
+                <div
+                    v-if="sysName != '首页'"
+                    ref="aside"
+                    flex-box="0"
+                    :class="{'ibps-theme-container-aside': true, 'ibps-theme-container-transition': asideTransition}"
+                    :style="{width: asideCollapse ? asideWidthCollapse : asideWidth, opacity: searchActive ? 0.5 : 1}"
+                >
+                    <!-- 侧部顶头栏-->
+                    <div class="layout-border-left">
+                        <div
+                            class="toggle-aside-btn"
+                            style="float: right; width: 25%;"
+                            @click="handleToggleAside"
+                        >
+                            <ibps-icon :name="asideCollapse ? 'indent' : 'outdent'" />
+                        </div>
+                        <div style="width: 74%;" class="toggle-aside-btn layout-border-left-name">
+                            <span>{{ getSystemName[0].name }}</span>
+                        </div>
+                    </div>
+                    <ibps-menu-side style="margin-top: 52px;" />
+                </div>
 
-         <ibps-menu-side  style="margin-top: 52px;"/>
-        </div>
+                <!-- 主体 -->
+                <div class="ibps-theme-container-main" flex-box="1" flex>
+                    <!-- 搜索 -->
+                    <transition name="fade-scale">
+                        <div
+                            v-show="searchActive"
+                            class="ibps-theme-container-main-layer"
+                            flex
+                        >
+                            <ibps-panel-search ref="panelSearch" @close="searchPanelClose"/>
+                        </div>
+                    </transition>
+                    <!-- 内容 -->
+                    <transition name="fade-scale">
+                        <div
+                            v-show="!searchActive"
+                            class="ibps-theme-container-main-layer"
+                            flex="dir:top"
+                        >
+                            <!-- tab -->
+                            <!-- <div class="ibps-theme-container-main-header" flex-box="0">
+                                <ibps-tabs />
+                            </div> -->
 
-        <!-- 主体 -->
-        <div class="ibps-theme-container-main" flex-box="1" flex>
-          <!-- 搜索 -->
-          <transition name="fade-scale">
-            <div v-show="searchActive" class="ibps-theme-container-main-layer" flex>
-              <ibps-panel-search
-                ref="panelSearch"
-                @close="searchPanelClose"
-              />
+                            <!-- 页面 -->
+                            <div class="ibps-theme-container-main-body" flex-box="1">
+                                <transition :name="transitionActive ? 'fade-transverse' : ''">
+                                    <!-- <keep-alive :include="keepAlive"> -->
+                                    <router-view :key="routerViewKey" />
+                                    <!-- </keep-alive> -->
+                                </transition>
+                            </div>
+                        </div>
+                    </transition>
+                </div>
             </div>
-          </transition>
-          <!-- 内容 -->
-          <transition name="fade-scale">
-            <div v-show="!searchActive" class="ibps-theme-container-main-layer" flex="dir:top">
-              <!-- tab -->
-            <!-- <div class="ibps-theme-container-main-header" flex-box="0">
-                <ibps-tabs />
-              </div> -->
-              <!-- 页面 -->
-              <div class="ibps-theme-container-main-body" flex-box="1">
-                <transition :name="transitionActive ? 'fade-transverse' : ''">
-                 <!-- <keep-alive :include="keepAlive"> -->
-                    <router-view :key="routerViewKey" />
-                 <!-- </keep-alive> -->
-                </transition>
-              </div>
-            </div>
-          </transition>
         </div>
-      </div>
+        <FloatBall></FloatBall>
     </div>
-    <FloatBall></FloatBall>
-  </div>
 </template>
 
 <script>
-import IbpsLogo from './components/logo'
-import IbpsMenuSide from './components/menu-side/index.js'
-import IbpsMenuHeader from './components/menu-header/index.js'
-import IbpsTabs from './components/tabs'
-import IbpsHeaderSearch from './components/header-search'
-import FloatBall from './components/components/float-ball';
-import IbpsHeaderFullscreen from './components/header-fullscreen'
-// import IbpsHeaderLocking from './components/header-locking'
-// import IbpsHeaderLanguage from './components/header-language'
-// import IbpsHeaderSize from './components/header-size'
-// import IbpsHeaderTheme from './components/header-theme'
-// import IbpsHeaderToolbar from './components/header-toolbar'
-
-// import IbpsHeaderTenant from './components/header-tenant'
-import IbpsHeaderSetting from './components/header-setting'
-import IbpsHeaderMessage from './components/header-message'
-import panle from '@/components/jbd-panel'
-import IbpsHeaderUser from './components/header-user'
-import IbpsHeaderErrorLog from './components/header-error-log'
-import IbpsHeaderBaseUrl from './components/header-base-url'
-// import IbpsHeaderDownload from './components/header-download'
-// import IbpsNotifyMonitor from '@/business/platform/socket/notify-monitor'
-import { mapState, mapGetters, mapActions } from 'vuex'
-import mixinSearch from './mixins/search'
-import mixinLock from './mixins/lock'
+    import IbpsLogo from './components/logo'
+    import IbpsMenuSide from './components/menu-side/index.js'
+    import IbpsMenuHeader from './components/menu-header/index.js'
+    import IbpsTabs from './components/tabs'
+    import IbpsHeaderSearch from './components/header-search'
+    import FloatBall from './components/components/float-ball'
+    import IbpsHeaderFullscreen from './components/header-fullscreen'
+    // import IbpsHeaderLocking from './components/header-locking'
+    // import IbpsHeaderLanguage from './components/header-language'
+    // import IbpsHeaderSize from './components/header-size'
+    // import IbpsHeaderTheme from './components/header-theme'
+    // import IbpsHeaderToolbar from './components/header-toolbar'
 
-import setting from '@/setting.js'
-export default {
-  name: 'ibps-layout-header-aside',
-  components: {
-    IbpsLogo,
-    IbpsMenuSide,
-    IbpsMenuHeader,
-    IbpsTabs,
-    IbpsHeaderSearch,
-    FloatBall,
-    panle,
-    IbpsHeaderFullscreen,
-    // IbpsHeaderLocking,
-    // IbpsHeaderLanguage,
-    // IbpsHeaderSize,
-    // IbpsHeaderTheme,
-    // IbpsHeaderToolbar,
-    // IbpsHeaderTenant,
-    IbpsHeaderSetting,
-    IbpsHeaderMessage,
-    IbpsHeaderUser,
-    IbpsHeaderErrorLog,
-    IbpsHeaderBaseUrl
-    // IbpsHeaderDownload,
-    // IbpsNotifyMonitor
-  },
-  mixins: [
-    mixinSearch,
-    mixinLock
-  ],
-  data() {
-    return {
-      // [侧边栏宽度] 正常状态
-      asideWidth: '200px',
-      // [侧边栏宽度] 折叠状态
-      asideWidthCollapse: '65px',
-    }
-  },
- /* watch:{
-    getSystemName(value){
-        this.sysName = ''
-      },
-  }, */
- mounted() {
-   /* window.performance.navigation.type == 1 &&  */
-    if (this.$route.name == 'dashboard') {
-            this.sysName='首页'
-          }
-  },
-  computed: {
+    // import IbpsHeaderTenant from './components/header-tenant'
+    import IbpsHeaderSetting from './components/header-setting'
+    import IbpsHeaderMessage from './components/header-message'
+    import panle from '@/components/jbd-panel'
+    import IbpsHeaderUser from './components/header-user'
+    import IbpsHeaderErrorLog from './components/header-error-log'
+    import IbpsHeaderBaseUrl from './components/header-base-url'
+    // import IbpsHeaderDownload from './components/header-download'
+    // import IbpsNotifyMonitor from '@/business/platform/socket/notify-monitor'
+    import { mapState, mapGetters, mapActions } from 'vuex'
+    import mixinSearch from './mixins/search'
+    import mixinLock from './mixins/lock'
 
-    ...mapState('ibps', {
-      //sysName:state=>state.menu.sysName,
-      keepAlive: state => state.page.keepAlive,
-      grayActive: state => state.gray.active,
-      transitionActive: state => state.transition.active,
-      asideCollapse: state => state.menu.asideCollapse,
-      asideTransition: state => state.menu.asideTransition,
-      system: state => state.system.system,
-      subsystemList: state => state.system.subsystemList
-    }),
-    ...mapGetters('ibps', {
-      themeActiveSetting: 'theme/activeSetting'
-    }),
-    getSystemName() {
-      let this_ = this
-     return this.header().filter(function (name){ return name.id == this_.activeHeader()})
-      },
-    /**
-     * @description 用来实现带参路由的缓存
-     */
-    sysName(){
-      if (this.$route.name == 'dashboard') {
-          return '首页'
-      }else{
-        return ''
-      }
-    },
-    routerViewKey() {
-      // 默认情况下 key 类似 __transition-n-/foo
-      // 这里的字符串操作是为了最终 key 的格式和原来相同 类似 __transition-n-__stamp-time-/foo
-      const stamp = this.$route.meta[`__stamp-${this.$route.path}`] || ''
-      return `${stamp ? `__stamp-${stamp}-` : ''}${this.$route.path}`
-    },
-    /**
-    /**
-     * @description 最外层容器的背景图片样式
-     */
-    styleLayoutMainGroup() {
-      return {
-        ...this.themeActiveSetting.backgroundImage ? {
-          backgroundImage: `url('${this.$baseUrl}${this.themeActiveSetting.backgroundImage}')`
-        } : {}
-      }
-    },
-    logoIconAll() {
-      return `${this.$baseUrl}images/theme/${this.themeActiveSetting.name}/all.png`
-    },
-    logoIconOnly() {
-      return `${this.$baseUrl}images/theme/${this.themeActiveSetting.name}/only.png`
-    }
-  },
-  methods: {
-    ...mapActions('ibps/menu', [
-      'asideCollapseToggle'
-    ]),
-    ...mapState('ibps/menu', [
-      'activeHeader',
-      'header',
-      'activeName'
-    ]),
-    /* 跳转首页*/
-    goToMain(){
-      //this.sysName = "首页"
-      this.$router.push({
-      			name:'dashboard'
-      })
-    },
-    pageChange(){
-      this.sysName = ''
-    },
-    /**
-     * 接收点击切换侧边栏的按钮
-     */
-    handleToggleAside() {
-      this.asideCollapseToggle()
-    },
-    handleSubsystemClick(system) {
-      this.$store.dispatch('ibps/system/set', system)
-      window.location.href = this.$baseUrl
-      // location.reload() // 为了重新实例化vue-router对象 避免bug
+    import setting from '@/setting.js'
+    export default {
+        name: 'ibps-layout-header-aside',
+        components: {
+            IbpsLogo,
+            IbpsMenuSide,
+            IbpsMenuHeader,
+            IbpsTabs,
+            IbpsHeaderSearch,
+            FloatBall,
+            panle,
+            IbpsHeaderFullscreen,
+            // IbpsHeaderLocking,
+            // IbpsHeaderLanguage,
+            // IbpsHeaderSize,
+            // IbpsHeaderTheme,
+            // IbpsHeaderToolbar,
+            // IbpsHeaderTenant,
+            IbpsHeaderSetting,
+            IbpsHeaderMessage,
+            IbpsHeaderUser,
+            IbpsHeaderErrorLog,
+            IbpsHeaderBaseUrl
+            // IbpsHeaderDownload,
+            // IbpsNotifyMonitor
+        },
+        mixins: [mixinSearch, mixinLock],
+        data() {
+            return {
+                // [侧边栏宽度] 正常状态
+                asideWidth: '200px',
+                // [侧边栏宽度] 折叠状态
+                asideWidthCollapse: '65px'
+            }
+        },
+        // watch: {
+        //     getSystemName(value) {
+        //         this.sysName = ''
+        //     }
+        // },
+        mounted() {
+            // window.performance.navigation.type == 1
+            if (this.$route.name == 'dashboard') {
+                this.sysName = '首页'
+            }
+        },
+        computed: {
+            ...mapState('ibps', {
+                // sysName:state=>state.menu.sysName,
+                keepAlive: state => state.page.keepAlive,
+                grayActive: state => state.gray.active,
+                transitionActive: state => state.transition.active,
+                asideCollapse: state => state.menu.asideCollapse,
+                asideTransition: state => state.menu.asideTransition,
+                system: state => state.system.system,
+                subsystemList: state => state.system.subsystemList
+            }),
+            ...mapGetters('ibps', {
+                themeActiveSetting: 'theme/activeSetting'
+            }),
+            getSystemName() {
+                return this.header().filter(name => { return name.id == this.activeHeader() })
+            },
+            /**
+             * @description 用来实现带参路由的缓存
+             */
+            sysName: {
+                get() {
+                    if (this.$route.name == 'dashboard') {
+                        return '首页'
+                    } else {
+                        return ''
+                    }
+                },
+                set() {
+                    if (this.$route.name == 'dashboard') {
+                        return '首页'
+                    } else {
+                        return ''
+                    }
+                }
+            },
+            routerViewKey() {
+                // 默认情况下 key 类似 __transition-n-/foo
+                // 这里的字符串操作是为了最终 key 的格式和原来相同 类似 __transition-n-__stamp-time-/foo
+                const stamp = this.$route.meta[`__stamp-${this.$route.path}`] || ''
+                return `${stamp ? `__stamp-${stamp}-` : ''}${this.$route.path}`
+            },
+            /**
+             * @description 最外层容器的背景图片样式
+             */
+            styleLayoutMainGroup() {
+                return { ...(this.themeActiveSetting.backgroundImage ? {backgroundImage: `url('${this.$baseUrl}${this.themeActiveSetting.backgroundImage}')`} : {})}
+            },
+            logoIconAll() {
+                return `${this.$baseUrl}images/theme/${this.themeActiveSetting.name}/all.png`
+            },
+            logoIconOnly() {
+                return `${this.$baseUrl}images/theme/${this.themeActiveSetting.name}/only.png`
+            }
+        },
+        methods: {
+            ...mapActions('ibps/menu', ['asideCollapseToggle']),
+            ...mapState('ibps/menu', ['activeHeader', 'header', 'activeName']),
+            /* 跳转首页*/
+            goToMain() {
+                // this.sysName = "首页"
+                this.$router.push({
+                    name: 'dashboard'
+                })
+            },
+            pageChange() {
+                this.sysName = ''
+            },
+            /**
+             * 接收点击切换侧边栏的按钮
+             */
+            handleToggleAside() {
+                this.asideCollapseToggle()
+            },
+            handleSubsystemClick(system) {
+                this.$store.dispatch('ibps/system/set', system)
+                window.location.href = this.$baseUrl
+                // location.reload() // 为了重新实例化vue-router对象 避免bug
+            }
+        }
     }
-  }
-}
 </script>
 
 <style lang="scss">
-// 注册主题
-@import '~@/assets/styles/theme/register.scss';
-.jbd-sys-title{
-   background: linear-gradient(to top,#a73a3a,#f35858);
-  height: 40px;
-  line-height: 40px;
-  font-size: 18px;
-   color: #FFF;
-  text-align: center;
-}
-.jbd-sys-title-cont{
-  height: 40px;
-  line-height: 40px;
-  font-weight: bold;
-  font-size: 14px;
-}
-.jbd-sys-title-contact{
-  line-height: 20px;
-  margin-right: 40px;
-  font-size: 14px;
-}
-.layout-border-left{
-  float: left;
-  box-shadow: 0px 2px 4px #E78C45, 0 0 5px rgba(155,155, 0, .04);
-  width: 100%;
-  height: 50px;
-  line-height: 50px;
-  .layout-border-left-name{
-    float: left;
-    font-size: 18px;
-    font-weight: bold;
-  }
-}
+    // 注册主题
+    @import '~@/assets/styles/theme/register.scss';
+    .jbd-sys-title {
+        background: linear-gradient(to top, rgb(51, 150, 209), #7dbfdf);
+        // background: rgb(51, 150, 209);
+        height: 40px;
+        line-height: 40px;
+        font-size: 18px;
+        color: #fff;
+        text-align: center;
+    }
+    .jbd-sys-title-cont {
+        height: 40px;
+        line-height: 40px;
+        font-weight: bold;
+        font-size: 14px;
+    }
+    .jbd-sys-title-contact {
+        line-height: 20px;
+        margin-right: 40px;
+        font-size: 14px;
+    }
+    .layout-border-left {
+        float: left;
+        box-shadow: 0px 2px 4px #e78c45, 0 0 5px rgba(155, 155, 0, 0.04);
+        width: 100%;
+        height: 50px;
+        line-height: 50px;
+        .layout-border-left-name {
+            float: left;
+            font-size: 18px;
+            font-weight: bold;
+        }
+    }
 </style>

+ 1 - 1
src/views/component/normalSelect.vue

@@ -5,7 +5,7 @@
         v-model="selected"
         filterable
         :multiple="field.field_options.custom_class === 'multiple'"
-        :disabled="field.disabled" 
+        :disabled="field.disabled"
         placeholder="请选择"
     >
         <el-option

+ 4 - 2
src/views/detection/jtsjpz/list.vue

@@ -24,7 +24,8 @@
       <template slot="dsBuMenSelect">
         <el-select v-model="bianZhiBuMenId" clearable placeholder="请选择" style="width:120px">
           <el-option
-            v-for="item in buMenList"
+            v-for="(item, index) in buMenList"
+            :key="index"
             :label="item.label"
             :value="item.value"
           />
@@ -57,7 +58,8 @@
       <template slot="dsDuiXiangSelect">
         <el-select v-model="duiXiang" clearable placeholder="请选择" style="width:120px">
           <el-option
-            v-for="item in duiXiangList"
+            v-for="(item, index) in duiXiangList"
+            :key="index"
             :label="item.label"
             :value="item.value"
           />

BIN
src/views/system/blank/img/logo_MJJC.jpg


+ 2 - 2
src/views/system/blank/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div style="width: 86%;">
-          <div style="font-size:32px; font-weight: bold; color:rgb(2, 188, 254); margin-top: 10%;text-align: center;">
+          <div style="font-size:32px; font-weight: bold; color:rgb(51, 150, 209); margin-top: 10%;text-align: center;">
              <img src="./img/logo_MJJC.jpg" width="22%">
               </br>
                  <i style="font-size:28px;" :class="'ibps-icon-'+$route.query.icon"></i>
                   {{$route.query.name}}
                 </br>
-                 <span style="color: red; font-size: 16px;">选择左侧菜单功能项</span>
+                 <span style="color: #1894d0; font-size: 16px;">选择左侧菜单功能项</span>
           </div>
        </div>
 </template>

+ 67 - 8
src/views/system/dashboard/components/new-home.vue

@@ -59,6 +59,13 @@
                                 label="任务提交人"
                             />
 
+                            <el-table-column
+                                prop="submitBy"
+                                show-overflow-tooltip
+                                width="100"
+                                label="任务发起人"
+                            />
+
                             <el-table-column
                                 show-overflow-tooltip
                                 width="145"
@@ -184,6 +191,23 @@
                                 </template>
                             </el-table-column>
 
+                            <el-table-column
+                                show-overflow-tooltip
+                                label="任务发起人"
+                                width="100"
+                            >
+                                <template slot-scope="scope">
+                                    {{ scope.row.createBy | getUserName(userList)}}
+                                </template>
+                            </el-table-column>
+
+                            <!-- <el-table-column
+                                prop="submitBy"
+                                show-overflow-tooltip
+                                width="100"
+                                label="任务发起人2"
+                            /> -->
+
                             <el-table-column
                                 show-overflow-tooltip
                                 width="145"
@@ -424,6 +448,12 @@
     export default {
         components: { BpmnFormrender, homeCalendar },
         name: 'calendar',
+        filters: {
+            getUserName (v, list) {
+                let user = list.find(i => i.id_ === v)
+                return user ? user.name_ : ''
+            }
+        },
         data() {
             return {
                 taskId: '', // 编辑dialog需要使用
@@ -463,6 +493,11 @@
         },
         mounted: function () {
             this.loadData()
+
+            let sql = `select id_, name_ from ibps_party_employee where status_ = 'actived'`
+            curdPost('sql', sql).then(res => {
+                this.userList = res.variables && res.variables.data
+            })
             if (this.timer) {
                 clearInterval(this.timer)
             }
@@ -533,9 +568,21 @@
             getWait() {
                 this.waitLoading = true
                 pending(this.getFormatParams(null, this.pagination)).then(response => {
-                    if (response.data.dataResult) {
-                        this.pendingData = response.data.dataResult
-                        this.pendingPage = response.data.pageResult
+                    let {dataResult, pageResult} = response.data
+                    if (dataResult && dataResult.length) {
+                        let instList = []
+                        dataResult.forEach(item => {
+                            instList.push(item.bpmnInstId)
+                        })
+                        let sql = `select b.bpmn_inst_id_, b.create_by_, a.name_ from ibps_bpm_inst b left join ibps_party_employee a on a.id_ = b.create_by_ where b.bpmn_inst_id_ in (${instList.join(',')}) order by find_in_set(b.bpmn_inst_id_,'${instList.join(',')}')`
+                        curdPost('sql', sql).then(res => {
+                            const data = res.variables && res.variables.data
+                            data.forEach((item, index) => {
+                                dataResult[index].submitBy = item.name_
+                            })
+                            this.pendingData = dataResult
+                            this.pendingPage = pageResult
+                        })
                     }
                     this.waitLoading = false
                 }).catch(() => {
@@ -551,9 +598,21 @@
             getOrver() {
                 this.orverLoading = true
                 handledTask(this.getFormatParams(1, this.orverPagination)).then(response => {
-                    if (response.data.dataResult.length > 0) {
-                        this.handledData = response.data.dataResult
-                        this.orverPage = response.data.pageResult
+                    let {dataResult, pageResult} = response.data
+                    if (dataResult && dataResult.length) {
+                        // let instList = []
+                        // dataResult.forEach(item => {
+                        //     instList.push(item.bpmnInstId)
+                        // })
+                        // let sql = `select b.bpmn_inst_id_, b.create_by_, a.name_ from ibps_bpm_inst b left join ibps_party_employee a on a.id_ = b.create_by_ where b.bpmn_inst_id_ in (${instList.join(',')}) order by find_in_set(b.bpmn_inst_id_,'${instList.join(',')}')`
+                        // curdPost('sql', sql).then(res => {
+                        //     const data = res.variables && res.variables.data
+                        //     data.forEach((item, index) => {
+                        //         dataResult[index].submitBy = item.name_
+                        //     })
+                        // })
+                        this.handledData = dataResult
+                        this.orverPage = pageResult
                     }
                     this.orverLoading = false
                 }).catch(() => {
@@ -563,7 +622,7 @@
             getMessage() {
                 // console.log("当前用户id",this.$store.getters.userId)
                 // console.log(this.$store)
-                console.log('当前用户信息', this.$store.getters.userInfo.employee)
+                // console.log('当前用户信息', this.$store.getters.userInfo.employee)
                 // getNews().then(response => {
                 //     this.newsData = response.data;
                 //     this.loading = false
@@ -601,7 +660,7 @@
                 let sql = "select td.*,ie.NAME_ from t_dxtz td,ibps_party_employee ie  where td.bian_zhi_ren_ = ie.id_ and  td.fa_song_fang_shi_ like  '%公告%' ORDER BY create_time_ desc"
 
                 curdPost('sql', sql).then(res => {
-                    console.log(res)
+                    // console.log(res)
                     if (res.state == 200) {
                         let dbData = res.variables.data
                         this.newsDataCms = dbData

+ 9 - 9
src/views/system/login/page.vue

@@ -3,7 +3,7 @@
         <el-container class="login-container" @keyup.enter="handleLogin">
             <el-header style="width: 80%;">
               <div style="width:100%;height: 93px;text-align: center; position: relative;top:10%;overflow:hidden;" >
-                <h1 class="login-info-title" style="font-size: 40px;color:#a73a3a;">罗湖实验室信息管理系统</h1>
+                <h1 class="login-info-title" style="font-size: 40px;color:#1894d0;">深圳市罗湖医院集团细胞质量检测实验室</h1>
               </div>
             </el-header>
 
@@ -41,7 +41,7 @@
 
             <div style="font-size: 12px;text-align:right;">
                 <hr>
-                
+
                 <p>
                   <!--<i style="margin-left: 50px;" class="el-icon-office-building"/> 深圳市明鉴细胞专业技术有限公司
                   <i style="margin-left: 20px;" class="el-icon-location-information"/> 深圳市南山区科技园高新北区源兴科技大厦东座303
@@ -79,16 +79,16 @@ export default {
 }
 </script>
 <style>
-/*.jbd-login-page-bg{ 
+/*.jbd-login-page-bg{
     margin-top:70px;
     height: 1200px;
     width: 800px;
-    
+
     background-image: url("../../../assets/images/login/MJ_bg01.png");
     background-repeat:no-repeat;
     background-size:100% ;
-    
-    
+
+
   }
 */
   .jbd-login-page-main{
@@ -102,9 +102,9 @@ export default {
     background-repeat:no-repeat;
     border-radius: 5%;
     box-sizing: border-box;
-    
+
   }
-  
+
   /*  margin-left: 12%;*/
   .jbd-login-page-main-img{
     /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
@@ -116,6 +116,6 @@ export default {
    /* background-image: url("../../../assets/images/login/MJ_login0.jpg"); */
    background-size:100% ;
    background-repeat:no-repeat;
-   
+
   }
 </style>

+ 0 - 4
src/views/viewFile/index.vue

@@ -94,7 +94,3 @@ export default {
     }
 }
 </script>
-
-<style scoped>
-
-</style>