productDev/dmvisit.git

doum

15 小时以前 4e598bff548c0e4a89f30e1523bdfb8b59d97741

tijiao

已修改11个文件

	admin/.env	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/public/index.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/components/common/CommonHeader.vue	77 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/components/system/menu/OperaMenuWindow.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/main.js	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/store/index.js	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/business/inoutRecord.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/login.vue	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/system/menu.vue	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/vehicle/category.vue	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/vehicle/components/OperaCategoryWindow.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 admin/.env

@@ -10,4 +10,8 @@
VUE_APP_API_PREFIX = '/system_gateway'

# 项目名称
<<<<<<< HEAD
VUE_APP_TITLE = '智慧物流园区安消一体化系统'
=======
VUE_APP_TITLE = '芜湖烟草智慧安消安全防范系统'
>>>>>>> c5675caa (最新版本541200007)

 admin/public/index.html

@@ -5,11 +5,19 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<<<<<<< HEAD
    <title>智慧园区安消一体化系统</title>
  </head>
  <body>
    <noscript>
      <strong>We're sorry but 智慧园区安消一体化系统 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
=======
    <title>芜湖烟草智慧安消安全防范系统</title>
  </head>
  <body>
    <noscript>
      <strong>We're sorry but 芜湖烟草智慧安消安全防范系统 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
>>>>>>> c5675caa (最新版本541200007)
    </noscript>
    <div id="app"></div>
    <!-- built files will be auto injected -->

 admin/src/components/common/CommonHeader.vue

@@ -4,19 +4,10 @@
      <div class="logo">
        <div class="title">{{ title }}</div>
        <div class="list">
          <div class="item active">
            <div>服务中心</div>
            <div class="linellae"></div>
          </div>
          <div  class="item" v-for="(item,index) in topMenuList.list" :key="item.id"  @click="getHeaderNav(item)" :index="index">{{item.label}}</div>
<!--          <div class="item" @click="getHeaderNav('0')">安防中心</div>
          <div class="item" @click="getHeaderNav('1')">消控中心</div>
          <div class="item" @click="getHeaderNav('2')">能管中心</div>
          <div class="item" @click="getHeaderNav('7')">后勤中心</div>
          <div class="item" @click="getHeaderNav('3')">驾驶舱</div>-->
          <!-- <div class="item" @click="handleTest">测试</div> -->
            <div  :class="index==currentIndex?'item active':'item'" v-for="(item,index) in topMenuList.list" :key="item.id"  @click="getHeaderNav(item,index)" :index="index">{{item.label}}
              <div v-if="index==currentIndex" class="linellae"></div>
            </div>
        </div>
        <!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
      </div>
      <div class="user">
        <el-dropdown v-if="isLogined" trigger="click">
@@ -75,6 +66,7 @@
    return {
      title: process.env.VUE_APP_TITLE,
      headerNavData: {},
      currentIndex: 0,
      visible: {
        // 修改密码
        changePwd: false
@@ -134,7 +126,7 @@
    }
  },
  methods: {
    ...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo']),
    ...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo', 'setTopMenuCurrent']),
    // 修改密码
    changePwd () {
      this.visible.changePwd = true
@@ -162,11 +154,16 @@
        }
      }
    },
    getHeaderNav (item) {
      if (item.url && item.url === 'goHKAF' && item.params != null) {
        this.getHKAFHeaderNav(item.params)
      } else if (item.url && item.url.indexOf('http') === 0) {
        window.open(item.url, '_blank')
    getHeaderNav (item,index) {
      this.currentIndex = index
      if(item.linkType === 0){
        this.setTopMenuCurrent(item)
      }else{
        if (item.url && item.url === 'goHKAF' && item.params != null) {
          this.getHKAFHeaderNav(item.params)
        } else if (item.url && item.url.indexOf('http') === 0) {
          window.open(item.url, '_blank')
        }
      }
    },
    getHKAFHeaderNav (type) {
@@ -295,31 +292,32 @@

.list {
  flex: 1;
  display: flex;
  align-items: center;
  margin-left: 60px;

  .item {
    margin-right: 40px;
    font-size: 16px;
    font-weight: 400;
  margin-top: 10px;
    display: flex;
    flex-direction: column;
    align-items: center;
    justify-content: flex-start;
    height: 40px;
    cursor: pointer;
    .item {
      margin-right: 40px;
      font-size: 16px;
      font-weight: 400;
      display: flex;
      flex-direction: column;
      align-items: center;
      justify-content: flex-start;
      height: 40px;
      cursor: pointer;

    .linellae {
      width: 64px;
      height: 2px;
      background: #FFFFFF;
      .linellae {
        width: 64px;
        height: 2px;
        background: #FFFFFF;
      }
    }
  }

  .active {
    font-weight: 500;
  }
    .active {
      font-weight: 500;
    }

}

.header {
@@ -344,7 +342,8 @@
    align-items: center;

    .title {
      width: 240px;
      font-size: 18px;
      width: 320px;
    }

    // display: inline;
@@ -356,7 +355,7 @@
  }

  .user {
    width: 212px;
    width: 152px;
    box-sizing: border-box;
    height: 56px;
    padding-right: 25px;

 admin/src/components/system/menu/OperaMenuWindow.vue

@@ -20,7 +20,6 @@
      <el-form-item label="携带参数" prop="params">
        <el-input v-model="form.params" placeholder="请输入携带参数" v-trim maxlength="200"/>
      </el-form-item>
      <el-form-item label="图标" prop="icon" class="form-item-icon" v-if="form.type !== 1">
      <el-form-item label="菜单类型" prop="linkType" >
        <el-radio-group v-model="form.linkType">
          <el-radio :label="0" :value="0" >内部菜单</el-radio>
@@ -67,7 +66,6 @@
        icon: '',
        type: '',
        linkType: 0,
        type: '',
        remark: ''
      },
      // 验证规则

 admin/src/main.js

@@ -37,7 +37,7 @@
  router,
  store,
  computed: {
    ...mapState(['userInfo', 'homePage'])
    ...mapState(['userInfo', 'homePage','topMenuCurrent','menuData'])
  },
  watch: {
    async userInfo () {
@@ -48,7 +48,7 @@
    }
  },
  methods: {
    ...mapMutations(['switchCollapseMenu', 'setHomePage']),
    ...mapMutations(['switchCollapseMenu', 'setHomePage', 'setTopMenuCurrent', 'setTopMenuCurrent']),
    // 初始化本地配置
    initLocalConfig () {
      // 菜单状态配置
@@ -74,15 +74,27 @@
      await fetchMenuTree()
        .then(allmenus => {
          // 添加菜单
          var menus = allmenus.filter(item => {
            return item.type !== 1
          })
          var topList = allmenus.filter(item => {
            return item.type === 1
          })
          console.log(topList)
          storeMenus.push.apply(storeMenus, menus)
          storeTopMenus.push.apply(storeTopMenus, topList)
          var topCurrent = null
          topList.forEach(item => {
            if (item.linkType === 0 && topCurrent == null) {
              topCurrent = item
            }
          })
          this.setTopMenuCurrent(topCurrent)
          // console.log(topList)
          // var menus = []
          // topList.forEach(item => {
          //   console.log(topCurrent.id, item.id)
          //   if (item.id == this.topMenuCurrent.id) {
          //     menus = item.children
          //   }
          // })
          console.log('menus', this.menuData.list)
          storeMenus.push.apply(storeMenus, this.menuData.list)
          // 添加路由
          this.__addRouters(storeMenus)
          // 404

 admin/src/store/index.js

@@ -16,6 +16,8 @@
    // 是否收起
    collapse: false
  },
  topMenuCurrent: {
  },
  topMenuList: {
    // 菜单列表
    list: [],
@@ -56,8 +58,22 @@
  setHomePage (state, homePage) {
    state.homePage = homePage
  },
  // 设置首页路由信息
  setTopMenuCurrent (state, current) {
    console.log("setTopMenuCurrent",current)
    if(current.id !== state.topMenuCurrent.id){
      state.topMenuList.list.forEach(item => {
        console.log(item.id, item.id)
        if (current.id == item.id) {
          state.topMenuCurrent = current
          state.menuData.list = item.children
        }
      })
    }
  },
  // 重置菜单
  resetMenus: (state) => {
    state.topMenuId=null;
    state.menuData.list = []
  },
  //  tags

 admin/src/views/business/inoutRecord.vue

@@ -162,8 +162,11 @@
        { key: 1, name: '外协运输车辆' },
        { key: 2, name: '市公司卸货车辆' },
        { key: 3, name: '加工烟卸货车辆' },
<<<<<<< HEAD
        { key: 4, name: '自有公务车' },
        { key: 5, name: '自有货运车辆' },
=======
        { key: 4, name: '物流公务用车'  007)
        { key: 6, name: '未知车辆' }
      ]
    }

 admin/src/views/login.vue

@@ -3,8 +3,13 @@
    <img src="@/assets/images/bg@2x.png" class="main_bg" alt="">
    <div class="login_wrap">
      <div class="login_img">
<<<<<<< HEAD
        <div class="h3" style="font-size: 30px; margin-bottom: 0;">{{sysConfig.title || ''}}</div>
        <div class="h3">{{sysConfig.subtitle || title}}</div>
=======
        <div class="h2">芜湖烟草智慧安消安全防范系统</div>
        <div class="h3">智慧物流园区安消一体化系统</div>
>>>>>>> c5675caa (最新版本541200007)
      </div>
      <div class="form_wrap">
        <div class="tabs">

 admin/src/views/system/menu.vue

@@ -11,7 +11,7 @@
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['system:menu:create', 'system:menu:delete', 'system:menu:sort']">
        <li><el-button type="primary" @click="$refs.operaMenuWindow.open(activeGroup==0?'新建一级菜单':'新建顶部导航菜单',null,null,activeGroup)" icon="el-icon-plus" v-permissions="['system:menu:create']">新建</el-button></li>
        <li><el-button type="primary" @click="$refs.operaMenuWindow.open(activeType==0?'新建一级菜单':'新建顶部导航菜单',null,null,activeType)" icon="el-icon-plus" v-permissions="['system:menu:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:menu:delete']">删除</el-button></li>
        <li><el-button @click="sort('top')" :loading="isWorking.sort" icon="el-icon-sort-up" v-permissions="['system:menu:sort']">上移</el-button></li>
        <li><el-button @click="sort('bottom')" :loading="isWorking.sort" icon="el-icon-sort-down" v-permissions="['system:menu:sort']">下移</el-button></li>
@@ -35,9 +35,14 @@
            <template v-else>未设置</template>
          </template>
        </el-table-column>
        <el-table-column prop="path" label="访问路径" show-tooltip-when-overflow min-width="220px"></el-table-column>
        <el-table-column prop="path" label="访问路径" show-tooltip-when-overflow min-width="200px"></el-table-column>
        <el-table-column prop="params" label="参数" min-width="120px"></el-table-column>
        <el-table-column prop="remark" label="备注" min-width="120px"></el-table-column>
        <el-table-column prop="linkType" label="菜单类型" min-width="80px">
          <template slot-scope="{row}">
            {{row.linkType == 1 ? '外部系统' : '内部系统'}}
          </template>
        </el-table-column>
        <el-table-column prop="remark" label="备注" min-width="150px" show-tooltip-when-overflow></el-table-column>
        <el-table-column prop="createUser" label="创建人" min-width="100px">
          <template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
        </el-table-column>
@@ -58,8 +63,8 @@
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" icon="el-icon-edit" @click="$refs.operaMenuWindow.open('编辑菜单', row,null,activeGroup)" v-permissions="['system:menu:update']">编辑</el-button>
            <el-button v-if="activeGroup !== 1" type="text" icon="el-icon-plus" @click="$refs.operaMenuWindow.open('新建子菜单', null, row,activeGroup)" v-permissions="['system:menu:create']">新建子菜单</el-button>
            <el-button type="text" icon="el-icon-edit" @click="$refs.operaMenuWindow.open('编辑菜单', row,null,activeType)" v-permissions="['system:menu:update']">编辑</el-button>
            <el-button v-if="activeGroup !== 1" type="text" icon="el-icon-plus" @click="$refs.operaMenuWindow.open('新建子菜单', null, row,activeType)" v-permissions="['system:menu:create']">新建子菜单</el-button>
            <el-button v-if="!row.fixed" type="text" icon="el-icon-delete" @click="deleteById(row)" v-permissions="['system:menu:delete']">删除</el-button>
          </template>
        </el-table-column>
@@ -82,8 +87,10 @@
  data () {
    return {
      // 是否正在处理中
      activeGroup: 0,
      groupList:[{id:0,name: "服务中心菜单"},{id:1,name: "顶部导航配置"}],
      activeGroup: -1,
      activeType: 1,
      topMenuId:null,
      groupList:[{id:-1,name: "顶部导航配置",type:1},{id:-2,name: "系统左侧菜单",type:0}],
      isWorking: {
        sort: false
      }
@@ -92,14 +99,36 @@
  methods: {
    groupClick(item){
      this.activeGroup = item.id
      this.activeType = item.type
      this.handlePageChange();
    },
    // 查询数据
    handlePageChange () {
      this.isWorking.search = true
      fetchTree({type: this.activeGroup})
      fetchTree({type: this.activeType == 1?this.activeType:null})
        .then(records => {
          this.tableData.list = records
          if(this.activeType === 1){
            this.tableData.list = records
            this.groupList = [{id:-1,name: "顶部导航配置",type:1}]
            var tops = []
            this.tableData.list.forEach(item=>{
              if(item.linkType !== 1){
                tops.push({id:item.id,name: item.name,type:0})
              }
            })
            if(tops.length){
              this.groupList.push(...tops)
            }else {
              this.groupList.push({id:0,name: "系统左侧菜单",type:0})
            }
          }else{
            //如果是内部菜单
            records.forEach(item =>{
              if(item.id === this.activeGroup){
                this.tableData.list =item.children
              }
            })
          }
        })
        .catch(e => {
          this.$tip.apiFailed(e)

 admin/src/views/vehicle/category.vue

@@ -30,8 +30,13 @@
                      <span  v-else-if="row.bizType ==1">外协运输车辆</span>
                      <span  v-else-if="row.bizType ==2">市公司卸货车辆</span>
                      <span  v-else-if="row.bizType ==3">加工烟卸货车辆</span>
<<<<<<< HEAD
                      <span  v-else-if="row.bizType ==4">自有公务车</span>
                      <span  v-else-if="row.bizType ==5">自有货运车辆</span>
=======
                      <span  v-else-if="row.bizType ==4">物流公务用车</span>
                      <span  v-else-if="row.bizType ==5">物流货运车辆</span>
>>>>>>> c5675caa (最新版本541200007)
                      <span  v-else >-</span>
                    </template>
              </el-table-column>

 admin/src/views/vehicle/components/OperaCategoryWindow.vue

@@ -51,7 +51,7 @@
        { key: 2, name: '市公司卸货车辆' },
        { key: 3, name: '加工烟卸货车辆' },
        { key: 4, name: '自有公务车' },
        { key: 5, name: '自有货运车辆' }
        { key: 5, name: '物流货运车辆' }
      ],
      // 验证规则
      rules: {

			@@ -10,4 +10,8 @@
			VUE_APP_API_PREFIX = '/system_gateway'

			# 项目名称
			<<<<<<< HEAD
			VUE_APP_TITLE = '智慧物流园区安消一体化系统'
			=======
			VUE_APP_TITLE = '芜湖烟草智慧安消安全防范系统'
			>>>>>>> c5675caa (最新版本541200007)

			@@ -5,11 +5,19 @@
			<meta http-equiv="X-UA-Compatible" content="IE=edge">
			<meta name="viewport" content="width=device-width,initial-scale=1.0">
			<link rel="icon" href="<%= BASE_URL %>favicon.ico">
			<<<<<<< HEAD
			<title>智慧园区安消一体化系统</title>
			</head>
			<body>
			<noscript>
			<strong>We're sorry but 智慧园区安消一体化系统 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
			=======
			<title>芜湖烟草智慧安消安全防范系统</title>
			</head>
			<body>
			<noscript>
			<strong>We're sorry but 芜湖烟草智慧安消安全防范系统 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
			>>>>>>> c5675caa (最新版本541200007)
			</noscript>
			<div id="app"></div>
			<!-- built files will be auto injected -->

			@@ -4,19 +4,10 @@
			<div class="logo">
			<div class="title">{{ title }}</div>
			<div class="list">
			<div class="item active">
			<div>服务中心</div>
			<div class="linellae"></div>
			</div>
			<div class="item" v-for="(item,index) in topMenuList.list" :key="item.id" @click="getHeaderNav(item)" :index="index">{{item.label}}</div>
			<!-- <div class="item" @click="getHeaderNav('0')">安防中心</div>
			<div class="item" @click="getHeaderNav('1')">消控中心</div>
			<div class="item" @click="getHeaderNav('2')">能管中心</div>
			<div class="item" @click="getHeaderNav('7')">后勤中心</div>
			<div class="item" @click="getHeaderNav('3')">驾驶舱</div>-->
			<!-- <div class="item" @click="handleTest">测试</div> -->
			<div :class="index==currentIndex?'item active':'item'" v-for="(item,index) in topMenuList.list" :key="item.id" @click="getHeaderNav(item,index)" :index="index">{{item.label}}
			<div v-if="index==currentIndex" class="linellae"></div>
			</div>
			</div>
			<!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
			</div>
			<div class="user">
			<el-dropdown v-if="isLogined" trigger="click">
			@@ -75,6 +66,7 @@
			return {
			title: process.env.VUE_APP_TITLE,
			headerNavData: {},
			currentIndex: 0,
			visible: {
			// 修改密码
			changePwd: false
			@@ -134,7 +126,7 @@
			}
			},
			methods: {
			...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo']),
			...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo', 'setTopMenuCurrent']),
			// 修改密码
			changePwd () {
			this.visible.changePwd = true
			@@ -162,11 +154,16 @@
			}
			}
			},
			getHeaderNav (item) {
			if (item.url && item.url === 'goHKAF' && item.params != null) {
			this.getHKAFHeaderNav(item.params)
			} else if (item.url && item.url.indexOf('http') === 0) {
			window.open(item.url, '_blank')
			getHeaderNav (item,index) {
			this.currentIndex = index
			if(item.linkType === 0){
			this.setTopMenuCurrent(item)
			}else{
			if (item.url && item.url === 'goHKAF' && item.params != null) {
			this.getHKAFHeaderNav(item.params)
			} else if (item.url && item.url.indexOf('http') === 0) {
			window.open(item.url, '_blank')
			}
			}
			},
			getHKAFHeaderNav (type) {
			@@ -295,31 +292,32 @@

			.list {
			flex: 1;
			display: flex;
			align-items: center;
			margin-left: 60px;

			.item {
			margin-right: 40px;
			font-size: 16px;
			font-weight: 400;
			margin-top: 10px;
			display: flex;
			flex-direction: column;
			align-items: center;
			justify-content: flex-start;
			height: 40px;
			cursor: pointer;
			.item {
			margin-right: 40px;
			font-size: 16px;
			font-weight: 400;
			display: flex;
			flex-direction: column;
			align-items: center;
			justify-content: flex-start;
			height: 40px;
			cursor: pointer;

			.linellae {
			width: 64px;
			height: 2px;
			background: #FFFFFF;
			.linellae {
			width: 64px;
			height: 2px;
			background: #FFFFFF;
			}
			}
			}

			.active {
			font-weight: 500;
			}
			.active {
			font-weight: 500;
			}

			}

			.header {
			@@ -344,7 +342,8 @@
			align-items: center;

			.title {
			width: 240px;
			font-size: 18px;
			width: 320px;
			}

			// display: inline;
			@@ -356,7 +355,7 @@
			}

			.user {
			width: 212px;
			width: 152px;
			box-sizing: border-box;
			height: 56px;
			padding-right: 25px;

			@@ -20,7 +20,6 @@
			<el-form-item label="携带参数" prop="params">
			<el-input v-model="form.params" placeholder="请输入携带参数" v-trim maxlength="200"/>
			</el-form-item>
			<el-form-item label="图标" prop="icon" class="form-item-icon" v-if="form.type !== 1">
			<el-form-item label="菜单类型" prop="linkType" >
			<el-radio-group v-model="form.linkType">
			<el-radio :label="0" :value="0" >内部菜单</el-radio>
			@@ -67,7 +66,6 @@
			icon: '',
			type: '',
			linkType: 0,
			type: '',
			remark: ''
			},
			// 验证规则

			@@ -37,7 +37,7 @@
			router,
			store,
			computed: {
			...mapState(['userInfo', 'homePage'])
			...mapState(['userInfo', 'homePage','topMenuCurrent','menuData'])
			},
			watch: {
			async userInfo () {
			@@ -48,7 +48,7 @@
			}
			},
			methods: {
			...mapMutations(['switchCollapseMenu', 'setHomePage']),
			...mapMutations(['switchCollapseMenu', 'setHomePage', 'setTopMenuCurrent', 'setTopMenuCurrent']),
			// 初始化本地配置
			initLocalConfig () {
			// 菜单状态配置
			@@ -74,15 +74,27 @@
			await fetchMenuTree()
			.then(allmenus => {
			// 添加菜单
			var menus = allmenus.filter(item => {
			return item.type !== 1
			})
			var topList = allmenus.filter(item => {
			return item.type === 1
			})
			console.log(topList)
			storeMenus.push.apply(storeMenus, menus)
			storeTopMenus.push.apply(storeTopMenus, topList)
			var topCurrent = null
			topList.forEach(item => {
			if (item.linkType === 0 && topCurrent == null) {
			topCurrent = item
			}
			})
			this.setTopMenuCurrent(topCurrent)
			// console.log(topList)
			// var menus = []
			// topList.forEach(item => {
			// console.log(topCurrent.id, item.id)
			// if (item.id == this.topMenuCurrent.id) {
			// menus = item.children
			// }
			// })
			console.log('menus', this.menuData.list)
			storeMenus.push.apply(storeMenus, this.menuData.list)
			// 添加路由
			this.__addRouters(storeMenus)
			// 404

			@@ -16,6 +16,8 @@
			// 是否收起
			collapse: false
			},
			topMenuCurrent: {
			},
			topMenuList: {
			// 菜单列表
			list: [],
			@@ -56,8 +58,22 @@
			setHomePage (state, homePage) {
			state.homePage = homePage
			},
			// 设置首页路由信息
			setTopMenuCurrent (state, current) {
			console.log("setTopMenuCurrent",current)
			if(current.id !== state.topMenuCurrent.id){
			state.topMenuList.list.forEach(item => {
			console.log(item.id, item.id)
			if (current.id == item.id) {
			state.topMenuCurrent = current
			state.menuData.list = item.children
			}
			})
			}
			},
			// 重置菜单
			resetMenus: (state) => {
			state.topMenuId=null;
			state.menuData.list = []
			},
			// tags

			@@ -162,8 +162,11 @@
			{ key: 1, name: '外协运输车辆' },
			{ key: 2, name: '市公司卸货车辆' },
			{ key: 3, name: '加工烟卸货车辆' },
			<<<<<<< HEAD
			{ key: 4, name: '自有公务车' },
			{ key: 5, name: '自有货运车辆' },
			=======
			{ key: 4, name: '物流公务用车' 007)
			{ key: 6, name: '未知车辆' }
			]
			}

			@@ -3,8 +3,13 @@
			<img src="@/assets/images/bg@2x.png" class="main_bg" alt="">
			<div class="login_wrap">
			<div class="login_img">
			<<<<<<< HEAD
			<div class="h3" style="font-size: 30px; margin-bottom: 0;">{{sysConfig.title \|\| ''}}</div>
			<div class="h3">{{sysConfig.subtitle \|\| title}}</div>
			=======
			<div class="h2">芜湖烟草智慧安消安全防范系统</div>
			<div class="h3">智慧物流园区安消一体化系统</div>
			>>>>>>> c5675caa (最新版本541200007)
			</div>
			<div class="form_wrap">
			<div class="tabs">

			@@ -11,7 +11,7 @@
			<!-- 表格和分页 -->
			<template v-slot:table-wrap>
			<ul class="toolbar" v-permissions="['system:menu:create', 'system:menu:delete', 'system:menu:sort']">
			<li><el-button type="primary" @click="$refs.operaMenuWindow.open(activeGroup==0?'新建一级菜单':'新建顶部导航菜单',null,null,activeGroup)" icon="el-icon-plus" v-permissions="['system:menu:create']">新建</el-button></li>
			<li><el-button type="primary" @click="$refs.operaMenuWindow.open(activeType==0?'新建一级菜单':'新建顶部导航菜单',null,null,activeType)" icon="el-icon-plus" v-permissions="['system:menu:create']">新建</el-button></li>
			<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:menu:delete']">删除</el-button></li>
			<li><el-button @click="sort('top')" :loading="isWorking.sort" icon="el-icon-sort-up" v-permissions="['system:menu:sort']">上移</el-button></li>
			<li><el-button @click="sort('bottom')" :loading="isWorking.sort" icon="el-icon-sort-down" v-permissions="['system:menu:sort']">下移</el-button></li>
			@@ -35,9 +35,14 @@
			<template v-else>未设置</template>
			</template>
			</el-table-column>
			<el-table-column prop="path" label="访问路径" show-tooltip-when-overflow min-width="220px"></el-table-column>
			<el-table-column prop="path" label="访问路径" show-tooltip-when-overflow min-width="200px"></el-table-column>
			<el-table-column prop="params" label="参数" min-width="120px"></el-table-column>
			<el-table-column prop="remark" label="备注" min-width="120px"></el-table-column>
			<el-table-column prop="linkType" label="菜单类型" min-width="80px">
			<template slot-scope="{row}">
			{{row.linkType == 1 ? '外部系统' : '内部系统'}}
			</template>
			</el-table-column>
			<el-table-column prop="remark" label="备注" min-width="150px" show-tooltip-when-overflow></el-table-column>
			<el-table-column prop="createUser" label="创建人" min-width="100px">
			<template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
			</el-table-column>
			@@ -58,8 +63,8 @@
			fixed="right"
			>
			<template slot-scope="{row}">
			<el-button type="text" icon="el-icon-edit" @click="$refs.operaMenuWindow.open('编辑菜单', row,null,activeGroup)" v-permissions="['system:menu:update']">编辑</el-button>
			<el-button v-if="activeGroup !== 1" type="text" icon="el-icon-plus" @click="$refs.operaMenuWindow.open('新建子菜单', null, row,activeGroup)" v-permissions="['system:menu:create']">新建子菜单</el-button>
			<el-button type="text" icon="el-icon-edit" @click="$refs.operaMenuWindow.open('编辑菜单', row,null,activeType)" v-permissions="['system:menu:update']">编辑</el-button>
			<el-button v-if="activeGroup !== 1" type="text" icon="el-icon-plus" @click="$refs.operaMenuWindow.open('新建子菜单', null, row,activeType)" v-permissions="['system:menu:create']">新建子菜单</el-button>
			<el-button v-if="!row.fixed" type="text" icon="el-icon-delete" @click="deleteById(row)" v-permissions="['system:menu:delete']">删除</el-button>
			</template>
			</el-table-column>
			@@ -82,8 +87,10 @@
			data () {
			return {
			// 是否正在处理中
			activeGroup: 0,
			groupList:[{id:0,name: "服务中心菜单"},{id:1,name: "顶部导航配置"}],
			activeGroup: -1,
			activeType: 1,
			topMenuId:null,
			groupList:[{id:-1,name: "顶部导航配置",type:1},{id:-2,name: "系统左侧菜单",type:0}],
			isWorking: {
			sort: false
			}
			@@ -92,14 +99,36 @@
			methods: {
			groupClick(item){
			this.activeGroup = item.id
			this.activeType = item.type
			this.handlePageChange();
			},
			// 查询数据
			handlePageChange () {
			this.isWorking.search = true
			fetchTree({type: this.activeGroup})
			fetchTree({type: this.activeType == 1?this.activeType:null})
			.then(records => {
			this.tableData.list = records
			if(this.activeType === 1){
			this.tableData.list = records
			this.groupList = [{id:-1,name: "顶部导航配置",type:1}]
			var tops = []
			this.tableData.list.forEach(item=>{
			if(item.linkType !== 1){
			tops.push({id:item.id,name: item.name,type:0})
			}
			})
			if(tops.length){
			this.groupList.push(...tops)
			}else {
			this.groupList.push({id:0,name: "系统左侧菜单",type:0})
			}
			}else{
			//如果是内部菜单
			records.forEach(item =>{
			if(item.id === this.activeGroup){
			this.tableData.list =item.children
			}
			})
			}
			})
			.catch(e => {
			this.$tip.apiFailed(e)

			@@ -30,8 +30,13 @@
			<span v-else-if="row.bizType ==1">外协运输车辆</span>
			<span v-else-if="row.bizType ==2">市公司卸货车辆</span>
			<span v-else-if="row.bizType ==3">加工烟卸货车辆</span>
			<<<<<<< HEAD
			<span v-else-if="row.bizType ==4">自有公务车</span>
			<span v-else-if="row.bizType ==5">自有货运车辆</span>
			=======
			<span v-else-if="row.bizType ==4">物流公务用车</span>
			<span v-else-if="row.bizType ==5">物流货运车辆</span>
			>>>>>>> c5675caa (最新版本541200007)
			<span v-else >-</span>
			</template>
			</el-table-column>

			@@ -51,7 +51,7 @@
			{ key: 2, name: '市公司卸货车辆' },
			{ key: 3, name: '加工烟卸货车辆' },
			{ key: 4, name: '自有公务车' },
			{ key: 5, name: '自有货运车辆' }
			{ key: 5, name: '物流货运车辆' }
			],
			// 验证规则
			rules: {