Merge pull request '修bug' (#27) from zjl into test

Reviewed-on: #27

.env.dev

@@ -14,13 +14,8 @@ VUE_APP_TITLE = 芋道管理系统
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.49:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48080'
-<<<<<<< HEAD
 VUE_APP_BASE_API = 'http://192.168.0.33:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.188:48080'
-=======
-# VUE_APP_BASE_API = 'http://192.168.0.33:48080'
-VUE_APP_BASE_API = 'http://192.168.1.188:48080'
->>>>>>> test
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/assets/icons/svg/downward.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>下拉展开</title>
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-43" transform="translate(-1870.000000, -119.000000)" fill-rule="nonzero">
+            <g id="下拉展开" transform="translate(1870.000000, 119.000000)">
+                <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="18" height="18"></rect>
+                <path d="M9.79014922,13.2165873 L16.1721224,6.15356667 C16.6092925,5.77338351 16.6092925,5.16518371 16.1721224,4.78500055 C15.964758,4.60350795 15.6800768,4.50112918 15.3827707,4.50112918 C15.0854647,4.50112918 14.8007835,4.60350795 14.5934191,4.78500055 L9.00013482,11.162609 L3.40552499,4.78387137 C3.19816065,4.60237877 2.91347942,4.5 2.61617336,4.5 C2.3188673,4.5 2.03418606,4.60237877 1.82682172,4.78387137 C1.39105943,5.16454327 1.39105943,5.77176559 1.82682172,6.15243749 L8.20879489,13.214329 C8.31400161,13.3066969 8.440317,13.3797143 8.57994259,13.4288732 C8.99637706,13.5753327 9.475517,13.4912854 9.79014922,13.2165873 Z" id="路径" fill="#0B58FF"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/icons/svg/upward.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>收起</title>
+    <g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-43" transform="translate(-1870.000000, -485.000000)" fill-rule="nonzero">
+            <g id="编组-18备份" transform="translate(1.000000, 366.000000)">
+                <g id="收起" transform="translate(1878.000000, 128.000000) scale(1, -1) translate(-1878.000000, -128.000000) translate(1869.000000, 119.000000)">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="18" height="18"></rect>
+                    <path d="M9.79014922,13.2165873 L16.1721224,6.15356667 C16.6092925,5.77338351 16.6092925,5.16518371 16.1721224,4.78500055 C15.964758,4.60350795 15.6800768,4.50112918 15.3827707,4.50112918 C15.0854647,4.50112918 14.8007835,4.60350795 14.5934191,4.78500055 L9.00013482,11.162609 L3.40552499,4.78387137 C3.19816065,4.60237877 2.91347942,4.5 2.61617336,4.5 C2.3188673,4.5 2.03418606,4.60237877 1.82682172,4.78387137 C1.39105943,5.16454327 1.39105943,5.77176559 1.82682172,6.15243749 L8.20879489,13.214329 C8.31400161,13.3066969 8.440317,13.3797143 8.57994259,13.4288732 C8.99637706,13.5753327 9.475517,13.4912854 9.79014922,13.2165873 Z" id="路径" fill="#0B58FF"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/styles/index.scss

@@ -13,8 +13,17 @@ body {
   font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
 }
 
-label {
+// label {
-  font-weight: 700;
+//   font-weight: 700;
+// }
+.searchBarBox .el-form-item--medium .el-form-item__label {
+  line-height: 40px;
+}
+.searchBarBox .el-form-item--medium .el-form-item__content {
+  line-height: 40px;
+}
+.searchBarBox .el-range-editor--small.el-input__inner {
+  height: 34px;
 }
 
 html {

src/main.js

@@ -52,6 +52,13 @@ Vue.prototype.divide = divide;
 Vue.prototype.tableHeight = function(n) {
 	return window.innerHeight - n
 }
+Vue.prototype.searchBarWidth = function(name, num) {
+	if (document.getElementById(name) && document.getElementById(name).offsetWidth < num) {
+		return true
+	} else {
+		return false
+	}
+}
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag);

src/views/energy/analysis/contrastAnalysis/components/searchArea.vue

@@ -1,4 +1,5 @@
 <template>
+  <div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }">
     <el-form :inline="true" class="demo-form-inline">
       <span class="blue-block"></span>
       <el-form-item label="能源类型">
@@ -35,6 +36,7 @@
             popper-class="noneMinute"
             @change="timeSelect"
             size="small"
+            style='width:350px;'
             :clearable="false"
             >
           </el-date-picker>
@@ -50,6 +52,7 @@
             :picker-options="pickerOptions"
             :clearable="false"
             size="small"
+            style='width:350px;'
             @change="timeSelect"
             >
           </el-date-picker>
@@ -59,7 +62,7 @@
             v-model="weekValue1"
             type="week"
             format="yyyy 第 WW 周"
-          style='width:150px;'
+            style='width:170px;'
             :picker-options="pickerOptionsWeek"
             @change="startWeek"
             :clearable="false"
@@ -71,7 +74,7 @@
             type="week"
             format="yyyy 第 WW 周"
             :picker-options="pickerOptionsWeek"
-          style='width:150px;'
+            style='width:170px;'
             @change="endWeek"
             :clearable="false"
             size="small"
@@ -89,13 +92,14 @@
             :clearable="false"
             :picker-options="pickerOptions"
             size="small"
+            style='width:350px;'
             @change="timeSelect"
             >
           </el-date-picker>
         </div>
         <div v-show="queryParams.timeDim === '5'">
           <el-date-picker
-          style='width:100px;'
+            style='width:170px;'
             v-model="yearValue1"
             type="year"
             :picker-options="pickerOptions"
@@ -107,7 +111,7 @@
           >
           </el-date-picker>-
           <el-date-picker
-          style='width:100px;'
+            style='width:170px;'
             v-model="yearValue2"
             type="year"
             :picker-options="pickerOptions"
@@ -146,6 +150,11 @@
         <el-button type="primary" size="small" @click="search">查询</el-button>
       </el-form-item>
     </el-form>
+    <span v-if="isFold" class="foldClass" @click='switchMode'>
+      {{ isExpand ? '收起' : '展开' }}
+      <svg-icon :icon-class="isExpand ? 'upward' : 'downward'" />
+    </span>
+  </div>
 </template>
 <script>
 import { getEnergyTypeListAll } from "@/api/base/energyType"
@@ -155,8 +164,15 @@ import { getEquipmentAll } from "@/api/base/equipment"
 import moment from 'moment'
 export default {
   name: 'searchArea',
+  props: {
+    isFold: {// 多行模式（默认否）
+      type: Boolean,
+      default: false
+    }
+  },
   data() {
     return {
+      isExpand: false, // 展开收起
       // 查询参数
       queryParams: {
         energyTypeId: null,
@@ -396,6 +412,15 @@ export default {
       let newData = year+'-12-31 23:59:59'
       let value = new Date(newData).getTime()
       return value
+    },
+    switchMode() {// 展开和收起切换
+      this.isExpand = !this.isExpand
+      const element = this.$refs.searchBarRef
+      if (this.isExpand) {
+        element.classList.remove('divHeight')
+      } else {
+        element.classList.add('divHeight')
+      }
     }
   }
 }
@@ -422,3 +447,20 @@ export default {
   }
 }
 </style>
+<style scoped>
+.searchBarBox .foldClass {
+  position: absolute;
+  top: 14px;
+  right: 0;
+  cursor: pointer;
+  font-size: 12px;
+  color:#0B58FF;
+}
+.searchBarBox .foldClass .iconfont {
+  font-size: 14px;
+}
+.divHeight {
+  height: 45px;
+  overflow: hidden;
+}
+</style>

src/views/energy/analysis/contrastAnalysis/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="contrastAnalysisBox">
     <!-- 搜索工作栏 -->
-    <search-area @submit="getList"/>
+    <search-area  :isFold="isFold" @submit="getList"/>
     <el-tabs v-model="activeName" @tab-click="switchChart">
       <el-tab-pane label="柱状图" name="bar">
         <bar-chart ref="analysisBarChart" :chartData="chartData" />
@@ -23,11 +23,19 @@ export default {
   components: { SearchArea, BarChart, LineChart },
   data() {
     return {
+      isFold: false,
       activeName: 'bar',
       chartData: []
     }
   },
-  mounted() {},
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+      this.isFold = this.searchBarWidth('contrastAnalysisBox', 1310)
+      // console.log(document.getElementById("contrastAnalysisBox").offsetWidth)
+    })
+    this.isFold = this.searchBarWidth('contrastAnalysisBox', 1310)
+  },
   methods: {
     getList(params) {
       getCompare({ ...params }).then((res) => {

src/views/energy/analysis/trendAnalysis/components/searchArea.vue

@@ -1,4 +1,5 @@
 <template>
+  <div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }">
     <el-form :inline="true" class="demo-form-inline">
       <span class="blue-block"></span>
       <el-form-item label="能源类型">
@@ -45,6 +46,7 @@
             popper-class="noneMinute"
             @change="timeSelect"
             size="small"
+            style='width:350px;'
             >
           </el-date-picker>
         </div>
@@ -59,6 +61,7 @@
             :picker-options="pickerOptions"
             @change="timeSelect"
             size="small"
+            style='width:350px;'
             >
           </el-date-picker>
         </div>
@@ -67,7 +70,7 @@
             v-model="weekValue1"
             type="week"
             format="yyyy 第 WW 周"
-          style='width:150px;'
+            style='width:170px;'
             :picker-options="pickerOptionsWeek"
             @change="startWeek"
             size="small"
@@ -78,7 +81,7 @@
             type="week"
             format="yyyy 第 WW 周"
             :picker-options="pickerOptionsWeek"
-          style='width:150px;'
+            style='width:170px;'
             @change="endWeek"
             size="small"
             placeholder="选择周">
@@ -94,13 +97,14 @@
             value-format="timestamp"
             :picker-options="pickerOptions"
             size="small"
+            style='width:350px;'
             @change="timeSelect"
             >
           </el-date-picker>
         </div>
         <div v-show="queryParams.timeDim === '5'">
           <el-date-picker
-          style='width:100px;'
+            style='width:170px;'
             v-model="yearValue1"
             type="year"
             :picker-options="pickerOptions"
@@ -111,7 +115,7 @@
           >
           </el-date-picker>-
           <el-date-picker
-          style='width:100px;'
+            style='width:170px;'
             v-model="yearValue2"
             type="year"
             :picker-options="pickerOptions"
@@ -127,6 +131,11 @@
         <el-button type="primary" size="small" @click="search">查询</el-button>
       </el-form-item>
     </el-form>
+    <span v-if="isFold" class="foldClass" @click='switchMode'>
+      {{ isExpand ? '收起' : '展开' }}
+      <svg-icon :icon-class="isExpand ? 'upward' : 'downward'" />
+    </span>
+  </div>
 </template>
 <script>
 import { getEnergyTypeListAll } from "@/api/base/energyType"
@@ -134,8 +143,15 @@ import { getTree } from '@/api/base/factory'
 import moment from 'moment'
 export default {
   name: 'searchArea',
+  props: {
+    isFold: {// 多行模式（默认否）
+      type: Boolean,
+      default: false
+    }
+  },
   data() {
     return {
+      isExpand: false, // 展开收起
       // 查询参数
       queryParams: {
         energyTypeId: null,
@@ -356,6 +372,15 @@ export default {
       let newData = year+'-12-31 23:59:59'
       let value = new Date(newData).getTime()
       return value
+    },
+    switchMode() {// 展开和收起切换
+      this.isExpand = !this.isExpand
+      const element = this.$refs.searchBarRef
+      if (this.isExpand) {
+        element.classList.remove('divHeight')
+      } else {
+        element.classList.add('divHeight')
+      }
     }
   }
 }
@@ -386,3 +411,20 @@ export default {
   }
 }
 </style>
+<style scoped>
+.searchBarBox .foldClass {
+  position: absolute;
+  top: 14px;
+  right: 0;
+  cursor: pointer;
+  font-size: 12px;
+  color:#0B58FF;
+}
+.searchBarBox .foldClass .iconfont {
+  font-size: 14px;
+}
+.divHeight {
+  height: 45px;
+  overflow: hidden;
+}
+</style>

src/views/energy/analysis/trendAnalysis/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id="trendAnalysisBox">
     <!-- 搜索工作栏 -->
-    <search-area @submit="getList"/>
+    <search-area :isFold="isFold" @submit="getList"/>
     <el-tabs v-model="activeName" @tab-click="switchChart">
       <el-tab-pane label="柱状图" name="bar">
         <bar-chart ref="analysisBarChart" :chartData="chartData" />
@@ -23,11 +23,18 @@ export default {
   components: { SearchArea, BarChart, LineChart },
   data() {
     return {
+      isFold: false,
       activeName: 'bar',
       chartData: []
     }
   },
-  mounted() {},
+  mounted() {
+    window.addEventListener('resize', () => {
+      this.tableH = this.tableHeight(260)
+      this.isFold = this.searchBarWidth('trendAnalysisBox', 1146)
+    })
+    this.isFold = this.searchBarWidth('trendAnalysisBox', 1146)
+  },
   methods: {
     getList(params) {
       getEnergyTrend({ ...params }).then((res) => {

src/views/energy/base/energyType/components/energyTypeAdd.vue

@@ -37,12 +37,12 @@
     </el-row>
     <el-row>
       <el-col :span="12" v-show="form.pricingMethod === 2">
-        <el-form-item label="单价(元)" prop="singlePrice">
+        <el-form-item label="单价(元)" prop="pricingMethod">
-          <el-input v-model="form.singlePrice"></el-input>
+          <el-input-number v-model="form.singlePrice" :precision="2" :min="0" :max="999999999" style="width: 100%;"></el-input-number>
         </el-form-item>
       </el-col>
       <el-col :span="24"  v-show="form.pricingMethod === 0">
-        <el-form-item label="时间段">
+        <el-form-item label="时间段" prop="pricingMethod">
           <base-table
             :key='timeKye'
             :table-props="tableProps1"
@@ -63,7 +63,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="24" v-show="form.pricingMethod === 1">
-        <el-form-item label="使用量">
+        <el-form-item label="使用量" prop="pricingMethod">
           <base-table
             :key='usedKye'
             :table-props="tableProps2"
@@ -140,12 +140,13 @@ export default {
         name: '',
         code: '',
         nuit: '',
-        pricingMethod: 1,
+        pricingMethod: 2,
         leaderName: ''
       },
       isEdit: false, //是否是编辑
       rules: {
-        name: [{ required: true, message: '能源类型不能为空', trigger: 'blur' }]
+        name: [{ required: true, message: '能源类型不能为空', trigger: 'blur' }],
+        pricingMethod: [{ required: true, message: '计价方式不能为空', trigger: 'change' }]
       },
       timeKye: 0,
       usedKye: 0,
@@ -275,7 +276,7 @@ export default {
               break;
             default:// 固定单价
               if (!this.form.singlePrice) {
-                this.$modal.msgError('单价有误请检查1，请检查')
+                this.$modal.msgError('单价有误请检查，请检查')
                   return false
               }
           }
@@ -321,6 +322,7 @@ export default {
     },
     formClear() {
       this.$refs.form.resetFields()
+      this.form.singlePrice = 0
       this.isEdit = false
       this.timeKye = 0
       this.usedKye = 0

src/views/energy/monitoring/energyReport/index.vue

@@ -1,10 +1,11 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id='energyReportBox'>
 
     <!-- 搜索工作栏 -->
     <search-bar
       :formConfigs="formConfig"
       ref="searchBarForm"
+      :isFold="isFold"
       @headBtnClick="buttonClick"
     />
     <!-- 列表 -->
@@ -72,6 +73,7 @@ export default {
   name: "EnergyLimit",
   data() {
     return {
+      isFold: false,
       formConfig: [
         {
           type: 'select',
@@ -138,10 +140,14 @@ export default {
   created() {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
+      this.isFold = this.searchBarWidth('energyReportBox', 1198)
     })
     this.getList()
     this.getTypeList()
   },
+  mounted() {
+    this.isFold = this.searchBarWidth('energyReportBox', 1198)
+  },
   methods: {
     getTypeList() {
       getEnergyTypeListAll().then((res) => {

src/views/energy/monitoring/energyReportSearch/index.vue

@@ -1,10 +1,11 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" id='energyReportSearchBox'>
 
     <!-- 搜索工作栏 -->
     <search-bar
       :formConfigs="formConfig"
       ref="searchBarForm"
+      :isFold="isFold"
       @headBtnClick="buttonClick"
     />
     <!-- 列表 -->
@@ -53,6 +54,7 @@ export default {
   name: "EnergyReportSearch",
   data() {
     return {
+      isFold: false,
       formConfig: [
         {
           type: 'input',
@@ -117,6 +119,7 @@ export default {
   created() {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
+      this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
     })
     if (this.$route.params.startTime && this.$route.params.endTime) {
       this.formConfig[2].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime]
@@ -128,6 +131,9 @@ export default {
     this.getList()
     this.getTypeList()
   },
+  mounted() {
+    this.isFold = this.searchBarWidth('energyReportSearchBox', 1180)
+  },
   methods: {
     getTypeList() {
       getEnergyTypeListAll().then((res) => {

src/views/group/base/groupTeamScheduling/index.vue

@@ -52,7 +52,6 @@
             <!-- 日期 -->
             <div class="dateStyle">
               {{ Number(data.day.split('-')[2]) }}
-              {{ data.day }}
             </div>
             <!-- 班次班组 -->
             <!-- class有两个样式，一个是类似class1，还有个是选中红框显示 -->

src/views/quality/monitoring/qualityStatistics/index.vue

@@ -67,6 +67,7 @@ export default {
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
+					defaultSelect: [],
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'timerange',
 				},
@@ -212,6 +213,14 @@ export default {
 		},
 	},
 	mounted() {
+		if (this.$route.params.startTime && this.$route.params.endTime) {
+      this.searchBarFormConfig[0].defaultSelect = [this.$route.params.startTime, this.$route.params.endTime]
+			this.queryParams.param = {};
+			this.$set(this.queryParams.param, 'startTime', this.$route.params.startTime);
+			this.$set(this.queryParams.param, 'endTime', this.$route.params.endTime);
+    } else {
+      this.searchBarFormConfig[0].defaultSelect = []
+    }
 		this.getList();
 	},
 	methods: {