productDev/dmvisit.git

MrShi

2024-03-08 071c89da8ad662d0a37a9f3e7924a6966e7ab489

mrshi

已修改8个文件

	admin/.env	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/public/index.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/components/common/CommonHeader.vue	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/router/index.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/store/index.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/business/device.vue	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/login.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/vue.config.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 admin/.env

@@ -10,4 +10,4 @@
VUE_APP_API_PREFIX = '/admin_interface'

# 项目名称
VUE_APP_TITLE = '华晟园区'
VUE_APP_TITLE = '华晟智慧园区系统'

 admin/public/index.html

@@ -5,11 +5,11 @@
    <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">
    <title>华晟园区</title>
    <title>华晟智慧园区系统</title>
  </head>
  <body>
    <noscript>
      <strong>We're sorry but 豆米跳跳 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
      <strong>We're sorry but 华晟智慧园区系统 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
    </noscript>
    <div id="app"></div>
    <!-- built files will be auto injected -->

 admin/src/components/common/CommonHeader.vue

@@ -2,7 +2,7 @@
  <div class="common-header">
    <div class="header">
      <div class="logo">
        <div> 华晟园区</div>
        <div>{{title}}</div>
        <!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
      </div>
      <div class="user">
@@ -55,6 +55,7 @@
  },
  data () {
    return {
      title: process.env.VUE_APP_TITLE,
      visible: {
        // 修改密码
        changePwd: false
@@ -104,7 +105,7 @@
    }
  },
  methods: {
    ...mapMutations(['setUserInfo', 'switchCollapseMenu']),
    ...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo']),
    // 修改密码
    changePwd () {
      this.visible.changePwd = true
@@ -148,8 +149,10 @@
    logout () {
      logout()
        .then(() => {
          this.setUserInfo(null)
          this.$router.push({ name: 'login' })
          this.clearUserInfo()
          // window.location.href = process.env.VUE_APP_CONTEXT_PATH
          // this.$router.push({ name: 'login' })
          window.location.reload()
        })
        .catch(e => {
          this.$tip.apiFailed(e)

 admin/src/router/index.js

@@ -9,7 +9,8 @@
Vue.use(VueRouter)

const router = new VueRouter({
  base: process.env.VUE_APP_CONTEXT_PATH + (process.env.VUE_APP_ROUTER_MODE === 'hash' ? '#' : ''),
  // + (process.env.VUE_APP_ROUTER_MODE === 'hash' ? '#' : '')
  base: process.env.VUE_APP_CONTEXT_PATH,
  mode: process.env.VUE_APP_ROUTER_MODE,
  routes: [
    // 登录

 admin/src/store/index.js

@@ -38,6 +38,10 @@
    }
  },

  clearUserInfo: (state) => {
    state.userInfo = null
  },

  // 设置首页路由信息
  setHomePage (state, homePage) {
    state.homePage = homePage

 admin/src/views/business/device.vue

@@ -23,12 +23,12 @@
                :data="tableData.list"
                stripe
            >
                <el-table-column prop="name" label="设备名称" min-width="100px"></el-table-column>
                <el-table-column prop="doorName" label="门禁点名称" min-width="100px"></el-table-column>
                <el-table-column prop="regionPathName" label="区域名称" min-width="100px"></el-table-column>
                <el-table-column prop="doorNo" label="门禁点编号" min-width="100px"></el-table-column>
                <el-table-column prop="manufature" label="厂商" min-width="100px"></el-table-column>
                <el-table-column prop="no" label="设备号" min-width="100px"></el-table-column>
                <el-table-column prop="name" label="设备名称"></el-table-column>
                <el-table-column prop="doorName" label="门禁点名称"></el-table-column>
                <el-table-column prop="regionPathName" label="区域名称"></el-table-column>
                <el-table-column prop="doorNo" label="门禁点编号"></el-table-column>
                <el-table-column prop="manufature" label="厂商"></el-table-column>
                <el-table-column prop="no" label="设备号"></el-table-column>
<!--                <el-table-column-->
<!--                    v-if="containPermissions(['business:device:update'])"-->
<!--                    label="操作"-->

 admin/src/views/login.vue

@@ -59,7 +59,7 @@
        uuid: this.captcha.uuid
      })
        .then(() => {
         // window.location.href = process.env.VUE_APP_CONTEXT_PATH
          // window.location.href = process.env.VUE_APP_CONTEXT_PATH
          window.location.reload()
        })
        .catch(e => {

 admin/vue.config.js

@@ -19,7 +19,7 @@
        // http://10.10.99.63/admin_interface/  最新测试服（内网）
        // http://218.23.218.228:8018/admin_interface   最新测试服（外网）
        // target: 'http://218.23.218.228:8018/admin_interface',
        target: 'http://localhost:10028',
        target: 'http://218.23.218.228:8018/admin_interface',
        changeOrigin: true,
        pathRewrite: {
          [`^${[process.env.VUE_APP_API_PREFIX]}`]: ''

			@@ -10,4 +10,4 @@
			VUE_APP_API_PREFIX = '/admin_interface'

			# 项目名称
			VUE_APP_TITLE = '华晟园区'
			VUE_APP_TITLE = '华晟智慧园区系统'

			@@ -5,11 +5,11 @@
			<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">
			<title>华晟园区</title>
			<title>华晟智慧园区系统</title>
			</head>
			<body>
			<noscript>
			<strong>We're sorry but 豆米跳跳 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
			<strong>We're sorry but 华晟智慧园区系统 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
			</noscript>
			<div id="app"></div>
			<!-- built files will be auto injected -->

			@@ -2,7 +2,7 @@
			<div class="common-header">
			<div class="header">
			<div class="logo">
			<div> 华晟园区</div>
			<div>{{title}}</div>
			<!-- <div class="title-en">Diagnosis of Intelligent Manufacturing Integrated Service Platfrom</div> -->
			</div>
			<div class="user">
			@@ -55,6 +55,7 @@
			},
			data () {
			return {
			title: process.env.VUE_APP_TITLE,
			visible: {
			// 修改密码
			changePwd: false
			@@ -104,7 +105,7 @@
			}
			},
			methods: {
			...mapMutations(['setUserInfo', 'switchCollapseMenu']),
			...mapMutations(['setUserInfo', 'switchCollapseMenu', 'clearUserInfo']),
			// 修改密码
			changePwd () {
			this.visible.changePwd = true
			@@ -148,8 +149,10 @@
			logout () {
			logout()
			.then(() => {
			this.setUserInfo(null)
			this.$router.push({ name: 'login' })
			this.clearUserInfo()
			// window.location.href = process.env.VUE_APP_CONTEXT_PATH
			// this.$router.push({ name: 'login' })
			window.location.reload()
			})
			.catch(e => {
			this.$tip.apiFailed(e)

			@@ -9,7 +9,8 @@
			Vue.use(VueRouter)

			const router = new VueRouter({
			base: process.env.VUE_APP_CONTEXT_PATH + (process.env.VUE_APP_ROUTER_MODE === 'hash' ? '#' : ''),
			// + (process.env.VUE_APP_ROUTER_MODE === 'hash' ? '#' : '')
			base: process.env.VUE_APP_CONTEXT_PATH,
			mode: process.env.VUE_APP_ROUTER_MODE,
			routes: [
			// 登录

			@@ -38,6 +38,10 @@
			}
			},

			clearUserInfo: (state) => {
			state.userInfo = null
			},

			// 设置首页路由信息
			setHomePage (state, homePage) {
			state.homePage = homePage

			@@ -23,12 +23,12 @@
			:data="tableData.list"
			stripe
			>
			<el-table-column prop="name" label="设备名称" min-width="100px"></el-table-column>
			<el-table-column prop="doorName" label="门禁点名称" min-width="100px"></el-table-column>
			<el-table-column prop="regionPathName" label="区域名称" min-width="100px"></el-table-column>
			<el-table-column prop="doorNo" label="门禁点编号" min-width="100px"></el-table-column>
			<el-table-column prop="manufature" label="厂商" min-width="100px"></el-table-column>
			<el-table-column prop="no" label="设备号" min-width="100px"></el-table-column>
			<el-table-column prop="name" label="设备名称"></el-table-column>
			<el-table-column prop="doorName" label="门禁点名称"></el-table-column>
			<el-table-column prop="regionPathName" label="区域名称"></el-table-column>
			<el-table-column prop="doorNo" label="门禁点编号"></el-table-column>
			<el-table-column prop="manufature" label="厂商"></el-table-column>
			<el-table-column prop="no" label="设备号"></el-table-column>
			<!-- <el-table-column-->
			<!-- v-if="containPermissions(['business:device:update'])"-->
			<!-- label="操作"-->

			@@ -59,7 +59,7 @@
			uuid: this.captcha.uuid
			})
			.then(() => {
			// window.location.href = process.env.VUE_APP_CONTEXT_PATH
			// window.location.href = process.env.VUE_APP_CONTEXT_PATH
			window.location.reload()
			})
			.catch(e => {

			@@ -19,7 +19,7 @@
			// http://10.10.99.63/admin_interface/ 最新测试服（内网）
			// http://218.23.218.228:8018/admin_interface 最新测试服（外网）
			// target: 'http://218.23.218.228:8018/admin_interface',
			target: 'http://localhost:10028',
			target: 'http://218.23.218.228:8018/admin_interface',
			changeOrigin: true,
			pathRewrite: {
			[`^${[process.env.VUE_APP_API_PREFIX]}`]: ''