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

src/views/productionInfo/Station.vue

@@ -115,7 +115,7 @@
           <template slot-scope="scope">
             <el-link
               size="mini"
-              type="primary"
+              type="success"
               style="margin-left: 10px"
               @click="handleUpdate(scope.row)"
             >修改</el-link>
@@ -146,7 +146,7 @@
                 <div class="labelName">工站编号</div>
                 <div class="labelName">Position No</div>
               </div>
-              <el-input :maxlength="30" v-model.trim="form.staCode" placeholder="请输入工站编号" />
+              <el-input :maxlength="50" v-model.trim="form.staCode" placeholder="请输入工站编号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -155,7 +155,7 @@
                 <div class="labelName">工站名称</div>
                 <div class="labelName">Position Name</div>
               </div>
-              <el-input :maxlength="30" v-model.trim="form.staName" placeholder="请输入工站名称" />
+              <el-input :maxlength="100" v-model.trim="form.staName" placeholder="请输入工站名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -192,7 +192,7 @@
                 <div class="labelName">工站简称</div>
                 <div class="labelName">Position Abbr</div>
               </div>
-              <el-input :maxlength="30" v-model.trim="form.staAbbreviation" placeholder="请输入工站简称" />
+              <el-input :maxlength="50" v-model.trim="form.staAbbreviation" placeholder="请输入工站简称" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -252,7 +252,7 @@ export default {
           { required: true, message: '请输入工站名称', trigger: 'blur' }
         ],
         staType: [
-          { required: true, message: '请选择工站类型', trigger: 'blur' }
+          { required: true, message: '请选择工站类型', trigger: 'change' }
         ]
       },
       // 查询设备类型数据字典

src/views/system/device/index.vue

@@ -91,13 +91,19 @@
             <span>{{scope.row.deviceType === 1 ? '生产设备' : '扫描设备'}}</span>
           </template>
         </el-table-column>
+        <el-table-column align="center" prop="factoryType">
+          <template slot="header">
+            <div>工站</div>
+            <div>Position</div>
+          </template>
+        </el-table-column>
         <el-table-column :show-overflow-tooltip="true" align="center" prop="createDate" width="200">
           <template slot="header">
             <div>创建时间</div>
             <div>Build Time</div>
           </template>
           <template slot-scope="scope">
-            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm:ss') }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="updateBy">
@@ -128,7 +134,7 @@
             <el-link
               v-hasPermi="['sys:device:update']"
               size="mini"
-              type="primary"
+              type="success"
               style="margin-left: 10px"
               @click="handleUpdate(scope.row)"
             >修改</el-link>
@@ -160,7 +166,7 @@
                 <div class="labelName">设备名称</div>
                 <div class="labelName">Equipment Name</div>
               </div>
-              <el-input :maxlength="30" v-model.trim="form.deviceName" placeholder="请输入设备名称" />
+              <el-input :maxlength="100" v-model.trim="form.deviceName" placeholder="请输入设备名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -185,16 +191,16 @@
                 <div class="labelName">设备编号</div>
                 <div class="labelName">Equipment Number</div>
               </div>
-              <el-input :maxlength="30" v-model.trim="form.deviceCode" placeholder="请输入设备编号" />
+              <el-input :maxlength="100" v-model.trim="form.deviceCode" placeholder="请输入设备编号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item class="labelHeight" label="工站" prop="staId">
+            <el-form-item class="labelHeight" label="工站" prop="factoryType">
               <div slot="label" class="labelClassRequired">
                 <div class="labelName">工站</div>
                 <div class="labelName">Position</div>
               </div>
-              <el-select v-model="form.staId" placeholder="请选择工站" clearable size="small">
+              <el-select v-model="form.factoryType" placeholder="请选择工站" clearable size="small">
                 <el-option
                   v-for="dict in staOptions"
                   :key="dict.businessId"
@@ -222,7 +228,7 @@
                 <div class="labelName">备注</div>
                 <div class="labelName">PS</div>
               </div>
-              <el-input maxlength="400" show-word-limit v-model.trim="form.remarks" type="textarea" :row="3" placeholder="请输入备注" />
+              <el-input :maxlength="256" show-word-limit v-model.trim="form.remarks" type="textarea" :row="3" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -306,13 +312,10 @@ export default {
           { required: true, message: '请输入设备名称', trigger: 'blur' }
         ],
         deviceType: [
-          { required: true, message: '请选择设备类型', trigger: 'blur' }
+          { required: true, message: '请选择设备类型', trigger: 'change' }
         ],
-        // deviceCode: [
-        //   { required: true, message: '请输入设备编号', trigger: 'blur' }
-        // ],
-        staId: [
-          { required: true, message: '请选择工站', trigger: 'blur' }
+        factoryType: [
+          { required: true, message: '请选择工站', trigger: 'change' }
         ]
       }
     }
@@ -461,6 +464,7 @@ export default {
         deviceType: undefined,
         deviceCode: undefined,
         remarks: undefined,
+        factoryType: undefined,
         flag: '1'
       }
       this.resetForm('form')

src/views/system/role/index.vue

@@ -211,7 +211,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item class="labelHeight" label="菜单权限" prop="menuIds">
-          <div slot="label" class="labelClass">
+          <div slot="label" class="labelClassRequired">
             <div class="labelName">菜单权限</div>
             <div class="labelName">Menu Limit</div>
           </div>

src/views/system/user/index.vue

@@ -1148,27 +1148,27 @@ export default {
         formData.append('file', this.fileList)
         importExcel(formData).then(res => {
           if (res.code === 200) {
-            if (res.data.filename === null) {
-              this.$message.success('导入成功')
-              this.fileList = []
-              // 导入成功后关闭弹出框
-              this.importLoading = false
-              this.upload.open = false
-              // 导入成功后刷新页面
-              this.getList()
-            } else {
-              uploadFalseFile({ fileName: res.data.filename }).then(res => {
-                const blob = new Blob([res])
-                const downloadElement = document.createElement('a')
-                const href = window.URL.createObjectURL(blob) // 创建下载的链接
-                downloadElement.href = href
-                downloadElement.download = '模板错误提示' + '.txt' // 下载后文件名
-                document.body.appendChild(downloadElement)
-                downloadElement.click() // 点击下载
-                document.body.removeChild(downloadElement) // 下载完成移除元素
-                window.URL.revokeObjectURL(href) // 释放掉blob对象
-              })
-            }
+            // if (res.data.filename === null) {
+            this.$message.success('导入成功')
+            this.fileList = []
+            // 导入成功后关闭弹出框
+            this.importLoading = false
+            this.upload.open = false
+            // 导入成功后刷新页面
+            this.getList()
+            // } else {
+            //   uploadFalseFile({ fileName: res.data.filename }).then(res => {
+            //     const blob = new Blob([res])
+            //     const downloadElement = document.createElement('a')
+            //     const href = window.URL.createObjectURL(blob) // 创建下载的链接
+            //     downloadElement.href = href
+            //     downloadElement.download = '模板错误提示' + '.txt' // 下载后文件名
+            //     document.body.appendChild(downloadElement)
+            //     downloadElement.click() // 点击下载
+            //     document.body.removeChild(downloadElement) // 下载完成移除元素
+            //     window.URL.revokeObjectURL(href) // 释放掉blob对象
+            //   })
+            // }
             this.importLoading = false
           } else {
             this.$message.info('上传超时,请重新上传')