Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lzt push -u or_management_vue into version_report

package-lock.json

@@ -2405,7 +2405,7 @@
     },
     "chromedriver": {
       "version": "2.27.2",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.27.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/chromedriver/download/chromedriver-2.27.2.tgz?cache=0&sync_timestamp=1595604788686&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchromedriver%2Fdownload%2Fchromedriver-2.27.2.tgz",
       "integrity": "sha1-/Y7gPm+N3kfYO5Ub+Z6iaFOBecM=",
       "dev": true,
       "requires": {
@@ -9077,7 +9077,7 @@
     },
     "kew": {
       "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/kew/download/kew-0.7.0.tgz",
       "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=",
       "dev": true
     },

src/views/modules/device-manage/device-list.vue

@@ -6,6 +6,7 @@
           v-model="specReq.count"
           :disabled="departmentReaderOnly"
           @change="changeDepartment(0)"
+          style="width:100px"
         >
           <el-option v-for="item in tCounts" :key="item.num" :label="item.num" :value="item.num"></el-option>
         </el-select>
@@ -36,6 +37,7 @@
           :disabled="departmentReaderOnly"
           placeholder="请选择"
           @change="changeDepartment(3)"
+          style="width:100px"
         >
           <el-option
             v-for="item in stateList"
@@ -51,6 +53,7 @@
           :disabled="departmentReaderOnly"
           placeholder="请选择"
           @change="changeDepartment(4)"
+          style="width:100px"
         >
           <el-option
             v-for="item in otherList"
@@ -70,6 +73,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           @change="changeOutData"
+          style="width:300px"
         ></el-date-picker>
       </el-form-item>
       <el-form-item :label="`入库日期`">
@@ -82,6 +86,7 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           @change="changeInData"
+          style="width:300px"
         ></el-date-picker>
       </el-form-item>
       <el-form-item label="规格">

src/views/modules/result/chart/componments/chart-bar-form/index.vue

@@ -8,7 +8,6 @@
 <script>
   export default{
     props: {
-      total: 100,
       aId: {
         type: String,
         default: 'mycharts'
@@ -24,9 +23,18 @@
         default: () => '分布'
       }
     },
+    data () {
+      return {
+      }
+    },
     mounted () {
       this.initChartBar()
     },
+    watch: { // 监听到数据然后赋值
+      dataInfo () {
+        this.initChartBar()
+      }
+    },
     methods: {
       initChartBar () {
         var staffTotal = this.dataInfo.total
@@ -87,7 +95,9 @@
         var echarts = require('echarts')
         this.chartBar = echarts.init(document.getElementById(this.aId))
         this.chartBar.setOption(option)
-        window.onresize = echarts.getInstanceByDom(document.getElementById(this.aId)).resize()
+        window.addEventListener('resize', () => {
+          this.chartBar.resize()
+        })
       }
     }
   }

src/views/modules/result/chart/componments/query-form/index.vue

@@ -16,7 +16,8 @@
         <el-date-picker
           type="month"
           placeholder="选择月份"
-          v-model="monthTime"
+          v-model="selectMonthTime"
+          value-format="yyyy-MM"
           @change="changeApplyMonth"
         >
         </el-date-picker>
@@ -55,12 +56,7 @@
     },
     data () {
       return {
-        defaultVal: '',
-        defaultValYear: '',
-        defaultValMon: '',
-        Datalist: [],
-        index: null,
-        value2: [],
+        selectMonthTime: this.nowDate(),
         isChooseObj: {},
         isChoose: false,
         menuList: [],
@@ -77,13 +73,14 @@
     beforeMount () { },
     created () {
       this.handleGetMenuList()
-      this.handleChangeData({
-      })
+      this.handleChangeData()
+    },
+    mounted () {},
+    beforeUpdate () {
+      // this.selectMonthTime = this.monthTime
     },
-    mounted () { },
     methods: {
       async  handleChangeData () {
-        this.defaultVal = this.monthTime
         this.onSubmit()
       },
       // 获取侧边架构列表
@@ -93,21 +90,19 @@
       },
       // 修改月份
       changeApplyMonth (val) {
-        this.defaultVal = val.getFullYear() + '-' + (val.getMonth() + 1)
-        this.defaultValYear = val.getFullYear()
-        this.defaultValMon = val.getMonth() + 1
-        console.log(this.defaultVal)
+        this.selectMonthTime = val
+        console.log(val)
       },
       onSubmit () {
         let obj = {
           departmentId: this.formInline.departmentId,
-          monthTime: this.defaultVal
+          selectMonthTime: this.selectMonthTime
         }
         this.$emit('submit', obj)
       },
       restValue () {
         this.formInline = {}
-        this.monthTime = ''
+        this.selectMonthTime = ''
       },
       onsumbit () {
         this.formInline = Object.assign({}, this.formInline, this.isChooseObj)
@@ -118,6 +113,11 @@
           departmentId: a.departmentId,
           departmentName: a.departmentName
         }
+      },
+      nowDate () {
+        var data = new Date()
+        var month = data.getMonth() < 9 ? '0' + (data.getMonth() + 1) : data.getMonth() + 1
+        return data.getFullYear() + '-' + month
       }
     },
     watch: {}

src/views/modules/result/chart/index.vue

@@ -3,7 +3,7 @@
   <div class="staff-archives">
     <el-main :loding="true">
       <el-card>
-        <query-form @submit="submit" :monthTime="dataInfo.monthTime"/>
+        <query-form @submit="submit"/>
       </el-card>
       <div class="staff-archives-chart">
         <el-card v-if="dataInfo.targetDistribution" >