Merge remote-tracking branch 'origin/project1' into project1

# Conflicts:
#	src/views/processManagement/draw.vue

src/views/equipment/application.vue

@@ -71,7 +71,7 @@
         <el-col :span="12">
           <el-form-item style="flex-basis: 50%;">
             <el-button type="primary" @click="submitForm">提交</el-button>
-            <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+            <el-button  @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

src/views/equipment/basicInfo.vue

@@ -63,8 +63,7 @@
         </el-table-column>
         <el-table-column label="pgx" prop="pgx">
           <template slot-scope="scope">
-            <span v-if="scope.row.pgx === '001'">压缩</span>
-            <span v-if="scope.row.pgx === '002'">排水</span>
+            <span>{{replace(scope.row.pgx)}}</span>
           </template>
         </el-table-column>
         <el-table-column label="ptype" prop="ptype">
@@ -209,6 +208,7 @@ export default {
   name: 'BasicInfo',
   data() {
     return {
+      dictList: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -312,18 +312,32 @@ export default {
     next()
   },
   created() {
+    this.init()
     if (this.$store.getters.searchParams[this.$route.path]) {
       const { searchParams } = this.$store.getters; const { path } = this.$route
       const param = JSON.parse(searchParams[path]) // 保留着的查询条件
       this.queryParams = { ...param }
     }
     this.getList()
-    this.init()
     // this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
     //   this.statusOptions = response.data;
     // });
   },
   methods: {
+    replace(value) {
+      return this.dictList.find(item => item.dictValue === value).dictLabel
+    },
+    getCodeDict() {
+      const obj = {
+        key: 'GX_CODE'
+      }
+      getDictData(obj).then(res => {
+        console.log('res', res)
+        if (res.code === 200 && res.data !== null) {
+          this.dictList = res.data
+        }
+      })
+    },
     // 回车跳转下一个输入框
     focusNextInput(form) {
       this.$nextTick(() => {
@@ -343,6 +357,7 @@ export default {
     },
     // 初始化要调的接口
     init() {
+      this.getCodeDict()
       this.getDict()
     },
     /** 查询基础信息列表 */

src/views/equipment/draw.vue

@@ -591,6 +591,7 @@ export default {
     // 处理弹窗里的勾选确定
     handleCance() {
       this.loadingDetail = true
+      this.monthDate = false
       this.title = '权限验证'
       if (this.multipleSelection.length === 0) {
         this.$message.warning('请至少选择一个要处理的设备')
@@ -711,7 +712,7 @@ export default {
           this.openHandle = true
         }
       })
-      this.title = '权限验证'
+      this.title = '处理'
       this.loadingDetail = true
     },
 

src/views/equipment/income.vue

@@ -78,7 +78,7 @@
         <el-col :span="12">
           <el-form-item style="flex-basis: 50%;">
             <el-button type="primary" @click="submitForm">提交</el-button>
-            <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+            <el-button  @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

src/views/processManagement/deviceReuse/index.vue

@@ -56,7 +56,7 @@
         <el-col :span="12">
           <el-form-item style="flex-basis: 50%;">
             <el-button type="primary" @click="submitForm">提交</el-button>
-            <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+            <el-button @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>

src/views/processManagement/draw.vue

@@ -419,6 +419,7 @@ export default {
     return {
       // 数据字典列表
       dictList: [],
+      isClose: false,
       number: '',
       menu: false,
       menuform: {
@@ -549,32 +550,9 @@ export default {
     next()
   },
   created() {
-    this.getDict()
     this.getList()
   },
   methods: {
-    replace(value) {
-      let label = ''
-      if (this.dictList.length > 0) {
-        this.dictList.forEach(item => {
-          if (item.dictValue === value) {
-            label = item.dictLabel
-          }
-        })
-      }
-      return label
-    },
-    getDict() {
-      const obj = {
-        key: 'GX_CODE'
-      }
-      getDictData(obj).then(res => {
-        console.log('res', res)
-        if (res.code === 200 && res.data !== null) {
-          this.dictList = res.data
-        }
-      })
-    },
     handlemenuClose() {
       this.menu = false
       this.loadingDetail = false
@@ -586,6 +564,9 @@ export default {
       this.loadingDetail = false
       this.openHandle = true
       this.loginform.password = ''
+      if (!this.isClose) {
+        this.radio1 = '2'
+      }
     },
     handlemenuConfirm() {
       const obj = {
@@ -664,6 +645,7 @@ export default {
       }
       checkPermission(obj).then(res => {
         if (res.code === 200) {
+          this.isClose = true
           this.openLogin = false
           if (this.radio1 === '1') {
             this.$message.success('已切换到设备库')
@@ -693,6 +675,7 @@ export default {
             }
           })
         } else if (res.code === null) {
+          this.isClose = false
           this.$message.warning(res.message)
           if (this.radio1 === '2') {
             this.radio1 = '1'
@@ -701,6 +684,8 @@ export default {
           }
           this.loadingDetail = false
           this.openHandle = true
+          this.loginform.password = ''
+          this.openLogin = false
         }
       })
     },
@@ -708,6 +693,7 @@ export default {
     // 处理弹窗里的勾选确定
     handleCance() {
       this.loadingDetail = true
+      this.monthDate = false
       if (this.multipleSelection.length === 0) {
         this.$message.warning('请至少选择一个要处理的设备')
       } else {