productDev/dmvisit.git

MrShi

8 小时以前 b545acd5def7b4024c0b8dfbf14c3f45bc873698

优化

已修改7个文件

	admin/.env.production	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/components/business/OperaCategoryJkBannerWindow.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/components/business/OperaJkCabinetWindow.vue	42 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen/src/router/index.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen/src/views/KeyCabinet.vue	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	screen/vite.config.js	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 admin/.env.production

@@ -1,7 +1,9 @@
# 生产环境配置
NODE_ENV = 'production'

VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'
# VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'

VUE_APP_API_URL = 'http://10.49.152.112/system_gateway'

VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'


 admin/src/components/business/OperaCategoryJkBannerWindow.vue

@@ -70,6 +70,8 @@
    },
    open (title, target) {
      this.title = title
      this.form.imgurlFull = ''
      this.form.imgurl = ''
      this.visible = true
      // 新建组织
      if (target == null) {

 admin/src/components/business/OperaJkCabinetWindow.vue

@@ -82,6 +82,20 @@
          :inactive-value="1">
        </el-switch>
      </el-form-item>
      <el-form-item label="激活文件" prop="activateFile">
        <el-upload
          accept=".zip"
          class="upload-demo"
          :action="base"
          :limit="1"
          :data="{ folder: 'activate' }"
          :file-list="fileList"
          :on-success="getFile"
          :on-remove="removeFile">
          <el-button size="small" type="primary">点击上传</el-button>
          <div slot="tip" class="el-upload__tip">只能上传zip文件</div>
        </el-upload>
      </el-form-item>
      <h3 style="margin: 20px 0;">柜组信息</h3>
      <el-form-item label="排列" prop="rowNum">
        <div style="width: 100%; display: flex; align-items: center;">
@@ -137,6 +151,8 @@
      }
    };
    return {
      base: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload',
      fileList: [],
      // 表单数据
      form: {
        id: null,
@@ -160,7 +176,8 @@
        noPrefix: '',
        noLength: '',
        noIndex: '',
        sortType: 0
        sortType: 0,
        activateFile: null
      },
      // 验证规则
      rules: {
@@ -220,6 +237,13 @@
              for (const key in this.form) {
                this.form[key] = res[key]
              }
              if (res.activateFile) {
                this.fileList = [{
                  name: res.activateFile.name,
                  url: res.activateFile.fileurlFull,
                  ...res.activateFile
                }]
              }
              this.visible = true
            })
          })
@@ -268,6 +292,22 @@
        this.form.noIndex = ''
        this.form.sortType = 0
      }
    },
    getFile(response) {
      this.fileList = [{
        name: response.data.originname,
        fileurl: response.data.imgaddr,
        ...response.data
      }]
      this.form.activateFile = {
        name: response.data.originname,
        fileurl: response.data.imgaddr,
        ...response.data
      }
    },
    removeFile() {
      this.form.activateFile = null
      this.fileList = []
    }
  }
}

 screen/index.html

@@ -4,7 +4,7 @@
    <meta charset="UTF-8">
    <link rel="icon" href="/favicon.ico">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>安泰智慧物流园区系统</title>
    <title>马鞍山烟草三交一封智能柜</title>
  </head>
  <body>
    <div id="app"></div>

 screen/src/router/index.js

@@ -6,7 +6,7 @@
    {
      path: '/',
      meta: {
        title: '钥匙柜数据看板'
        title: '马鞍山烟草三交一封智能柜'
      },
      component: () => import('../views/KeyCabinet.vue')
    }

 screen/src/views/KeyCabinet.vue

@@ -4,7 +4,7 @@
            <img src="@/assets/images/bg.png" class="main_bg" alt="" />
            <div class="main_header">
                <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
                <div class="title">钥匙柜数据看板</div>
                <div class="title">三交一封智能柜</div>
                <div class="time_wrap">
                    <span class="date">{{ date }}</span>
                    <span class="week">{{ week }}</span>
@@ -176,9 +176,9 @@
                                </div>
                                <div class="car_static">
                                    <div class="echart_wrap">
                                        <div class="pie_text">
                                            <div class="fs30"><strong>30</strong></div>
                                            <div style="font-size: 15px; color: rgba(255,255,255,0.8); font-weight: 400;">入库总量</div>
                                        <div class="pie_text" v-if="fenbu">
                                            <div class="fs30"><strong>{{fenbu.alcoholNum + fenbu.unCloseNum + fenbu.timeOutNum}}</strong></div>
                                            <div style="font-size: 15px; color: rgba(255,255,255,0.8); font-weight: 400;">告警总量</div>
                                        </div>
                                        <div class="echart1" id="echart1"></div>
                                    </div>
@@ -195,14 +195,14 @@
                                                <div class="icon" :style="{ background: `linear-gradient(270deg, ${colors[1].color1} 0%, ${colors[1].color2} 100%)` }"></div>
                                                <div class="text">柜门未关告警</div>
                                            </div>
                                            <div class="num" :style="{ color: '#FEAF01' }">{{fenbu.timeOutNum}}次｜{{fenbu.timeOutNumPct}}%</div>
                                            <div class="num" :style="{ color: '#FEAF01' }">{{fenbu.unCloseNum}}次｜{{fenbu.unCloseNumPct}}%</div>
                                        </div>
                                        <div class="item1">
                                            <div class="line">
                                                <div class="icon" :style="{ background: `linear-gradient(270deg, ${colors[2].color1} 0%, ${colors[2].color2} 100%)` }"></div>
                                                <div class="text">超时未还告警</div>
                                            </div>
                                            <div class="num" :style="{ color: '#28F0C4' }">{{fenbu.unCloseNum}}次｜{{fenbu.unCloseNumPct}}%</div>
                                            <div class="num" :style="{ color: '#28F0C4' }">{{fenbu.timeOutNum}}次｜{{fenbu.timeOutNumPct}}%</div>
                                        </div>
                                    </div>
                                </div>
@@ -350,10 +350,10 @@
                fenbu.value = {
                    ...res.data,
                    alcoholNumPct: calculatePercentage(res.data.alcoholNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum]),
                    timeOutNumPct: calculatePercentage(res.data.timeOutNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum]),
                    unCloseNumPct: calculatePercentage(res.data.unCloseNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum])
                    unCloseNumPct: calculatePercentage(res.data.unCloseNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum]),
                    timeOutNumPct: calculatePercentage(res.data.timeOutNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum])
                }
                dataList5.value = [res.data.alcoholNum, res.data.timeOutNum, res.data.unCloseNum]
                dataList5.value = [res.data.alcoholNum, res.data.unCloseNum, res.data.timeOutNum]
                nextTick(() => {
                    initEchart1()
                })
@@ -626,12 +626,12 @@
                            <div style="display: flex; align-items: center;margin-top: 4px;">
                                <div style="width: 12px;height: 12px;background: linear-gradient(to bottom, #50afd3, #1d4861);border-radius: 50%;margin-right: 12px;"></div>
                                <div style="color: #FFFFFF;font-size: 14px;font-weight: 400;">领取：</div>
                                <div style="color: #00F2F3;font-size: 14px;font-weight: 500;">${params[0].data}个</div>
                                <div style="color: #00F2F3;font-size: 14px;font-weight: 500;">${params[0].data}次</div>
                            </div>
                            <div style="display: flex; align-items: center;margin-top: 4px;">
                                <div style="width: 12px;height: 12px;background: linear-gradient(to bottom, rgb(255,184,0), rgba(255, 138, 0, 0.20));border-radius: 50%;margin-right: 12px;"></div>
                                <div style="color: #FFFFFF;font-size: 14px;font-weight: 400;">归还：</div>
                                <div style="color: #00F2F3;font-size: 14px;font-weight: 500;">${params[1].data}个</div>
                                <div style="color: #00F2F3;font-size: 14px;font-weight: 500;">${params[1].data}次</div>
                            </div>
                        </div>
                      `;
@@ -647,7 +647,7 @@
            },
            yAxis: {
                type: 'value',
                name: '单位：个',
                name: '单位：次',
                minInterval: 1,
                axisLabel: {
                    color: '#D2E0FF',

 screen/vite.config.js

@@ -25,7 +25,8 @@
  server: {
    proxy: {
      "/system_gateway": {
        target: "http://192.168.1.45:10010",
        // target: "http://192.168.1.45:10010",
        target: "http://10.49.152.112/system_gateway",
        // target: "http://192.168.0.7/system_gateway",
        // target: "http://10.50.250.253:8088/gateway_interface",
        // target: "https://atwl.ahzyssl.com/zhyq_interface",

			@@ -1,7 +1,9 @@
			# 生产环境配置
			NODE_ENV = 'production'

			VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
			# VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'

			VUE_APP_API_URL = 'http://10.49.152.112/system_gateway'

			VUE_APP_AMAP_KEY='045542fc5f436b75e6c911c5c84ff8cd'

			@@ -70,6 +70,8 @@
			},
			open (title, target) {
			this.title = title
			this.form.imgurlFull = ''
			this.form.imgurl = ''
			this.visible = true
			// 新建组织
			if (target == null) {

			@@ -82,6 +82,20 @@
			:inactive-value="1">
			</el-switch>
			</el-form-item>
			<el-form-item label="激活文件" prop="activateFile">
			<el-upload
			accept=".zip"
			class="upload-demo"
			:action="base"
			:limit="1"
			:data="{ folder: 'activate' }"
			:file-list="fileList"
			:on-success="getFile"
			:on-remove="removeFile">
			<el-button size="small" type="primary">点击上传</el-button>
			<div slot="tip" class="el-upload__tip">只能上传zip文件</div>
			</el-upload>
			</el-form-item>
			<h3 style="margin: 20px 0;">柜组信息</h3>
			<el-form-item label="排列" prop="rowNum">
			<div style="width: 100%; display: flex; align-items: center;">
			@@ -137,6 +151,8 @@
			}
			};
			return {
			base: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/upload',
			fileList: [],
			// 表单数据
			form: {
			id: null,
			@@ -160,7 +176,8 @@
			noPrefix: '',
			noLength: '',
			noIndex: '',
			sortType: 0
			sortType: 0,
			activateFile: null
			},
			// 验证规则
			rules: {
			@@ -220,6 +237,13 @@
			for (const key in this.form) {
			this.form[key] = res[key]
			}
			if (res.activateFile) {
			this.fileList = [{
			name: res.activateFile.name,
			url: res.activateFile.fileurlFull,
			...res.activateFile
			}]
			}
			this.visible = true
			})
			})
			@@ -268,6 +292,22 @@
			this.form.noIndex = ''
			this.form.sortType = 0
			}
			},
			getFile(response) {
			this.fileList = [{
			name: response.data.originname,
			fileurl: response.data.imgaddr,
			...response.data
			}]
			this.form.activateFile = {
			name: response.data.originname,
			fileurl: response.data.imgaddr,
			...response.data
			}
			},
			removeFile() {
			this.form.activateFile = null
			this.fileList = []
			}
			}
			}

			@@ -4,7 +4,7 @@
			<meta charset="UTF-8">
			<link rel="icon" href="/favicon.ico">
			<meta name="viewport" content="width=device-width, initial-scale=1.0">
			<title>安泰智慧物流园区系统</title>
			<title>马鞍山烟草三交一封智能柜</title>
			</head>
			<body>
			<div id="app"></div>

			@@ -6,7 +6,7 @@
			{
			path: '/',
			meta: {
			title: '钥匙柜数据看板'
			title: '马鞍山烟草三交一封智能柜'
			},
			component: () => import('../views/KeyCabinet.vue')
			}

			@@ -4,7 +4,7 @@
			<img src="@/assets/images/bg.png" class="main_bg" alt="" />
			<div class="main_header">
			<img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
			<div class="title">钥匙柜数据看板</div>
			<div class="title">三交一封智能柜</div>
			<div class="time_wrap">
			<span class="date">{{ date }}</span>
			<span class="week">{{ week }}</span>
			@@ -176,9 +176,9 @@
			</div>
			<div class="car_static">
			<div class="echart_wrap">
			<div class="pie_text">
			<div class="fs30"><strong>30</strong></div>
			<div style="font-size: 15px; color: rgba(255,255,255,0.8); font-weight: 400;">入库总量</div>
			<div class="pie_text" v-if="fenbu">
			<div class="fs30"><strong>{{fenbu.alcoholNum + fenbu.unCloseNum + fenbu.timeOutNum}}</strong></div>
			<div style="font-size: 15px; color: rgba(255,255,255,0.8); font-weight: 400;">告警总量</div>
			</div>
			<div class="echart1" id="echart1"></div>
			</div>
			@@ -195,14 +195,14 @@
			<div class="icon" :style="{ background: `linear-gradient(270deg, ${colors[1].color1} 0%, ${colors[1].color2} 100%)` }"></div>
			<div class="text">柜门未关告警</div>
			</div>
			<div class="num" :style="{ color: '#FEAF01' }">{{fenbu.timeOutNum}}次｜{{fenbu.timeOutNumPct}}%</div>
			<div class="num" :style="{ color: '#FEAF01' }">{{fenbu.unCloseNum}}次｜{{fenbu.unCloseNumPct}}%</div>
			</div>
			<div class="item1">
			<div class="line">
			<div class="icon" :style="{ background: `linear-gradient(270deg, ${colors[2].color1} 0%, ${colors[2].color2} 100%)` }"></div>
			<div class="text">超时未还告警</div>
			</div>
			<div class="num" :style="{ color: '#28F0C4' }">{{fenbu.unCloseNum}}次｜{{fenbu.unCloseNumPct}}%</div>
			<div class="num" :style="{ color: '#28F0C4' }">{{fenbu.timeOutNum}}次｜{{fenbu.timeOutNumPct}}%</div>
			</div>
			</div>
			</div>
			@@ -350,10 +350,10 @@
			fenbu.value = {
			...res.data,
			alcoholNumPct: calculatePercentage(res.data.alcoholNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum]),
			timeOutNumPct: calculatePercentage(res.data.timeOutNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum]),
			unCloseNumPct: calculatePercentage(res.data.unCloseNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum])
			unCloseNumPct: calculatePercentage(res.data.unCloseNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum]),
			timeOutNumPct: calculatePercentage(res.data.timeOutNum,[res.data.alcoholNum + res.data.timeOutNum + res.data.unCloseNum])
			}
			dataList5.value = [res.data.alcoholNum, res.data.timeOutNum, res.data.unCloseNum]
			dataList5.value = [res.data.alcoholNum, res.data.unCloseNum, res.data.timeOutNum]
			nextTick(() => {
			initEchart1()
			})
			@@ -626,12 +626,12 @@
			<div style="display: flex; align-items: center;margin-top: 4px;">
			<div style="width: 12px;height: 12px;background: linear-gradient(to bottom, #50afd3, #1d4861);border-radius: 50%;margin-right: 12px;"></div>
			<div style="color: #FFFFFF;font-size: 14px;font-weight: 400;">领取：</div>
			<div style="color: #00F2F3;font-size: 14px;font-weight: 500;">${params[0].data}个</div>
			<div style="color: #00F2F3;font-size: 14px;font-weight: 500;">${params[0].data}次</div>
			</div>
			<div style="display: flex; align-items: center;margin-top: 4px;">
			<div style="width: 12px;height: 12px;background: linear-gradient(to bottom, rgb(255,184,0), rgba(255, 138, 0, 0.20));border-radius: 50%;margin-right: 12px;"></div>
			<div style="color: #FFFFFF;font-size: 14px;font-weight: 400;">归还：</div>
			<div style="color: #00F2F3;font-size: 14px;font-weight: 500;">${params[1].data}个</div>
			<div style="color: #00F2F3;font-size: 14px;font-weight: 500;">${params[1].data}次</div>
			</div>
			</div>
			`;
			@@ -647,7 +647,7 @@
			},
			yAxis: {
			type: 'value',
			name: '单位：个',
			name: '单位：次',
			minInterval: 1,
			axisLabel: {
			color: '#D2E0FF',

			@@ -25,7 +25,8 @@
			server: {
			proxy: {
			"/system_gateway": {
			target: "http://192.168.1.45:10010",
			// target: "http://192.168.1.45:10010",
			target: "http://10.49.152.112/system_gateway",
			// target: "http://192.168.0.7/system_gateway",
			// target: "http://10.50.250.253:8088/gateway_interface",
			// target: "https://atwl.ahzyssl.com/zhyq_interface",