update

src/assets/sass/common.scss

@@ -141,4 +141,7 @@
   .el-table .warning-row td {
     background: #ff4949 !important;
     color: #fff !important;
+  }
+  input {
+    border: 1px solid #DCDFE6;
   }
\ No newline at end of file

src/components/role/Role.vue

@@ -127,7 +127,7 @@ export default {
             tableHead: {
                 NO: '序号',
                 RoleName: '岗位名称',
-                RoleNo: '岗位编号',
+                Scmsuserno: '岗位编号',
                 RoleDesc: '岗位描述',
                 UpdateUserName: '修改人',
                 UpdateTime: '修改时间'

src/views/education/component/relateDialog.vue

@@ -236,7 +236,6 @@ export default {
         },
         conserve () {
           if (this.relateType) {
-            // var flag = Object.prototype.toString.call(this.relateType)
             if (this.relateType === 'VPID') {
               if (this.currentRow.DateType.indexOf('字符串') !== -1) {
                 return this.$emit('conserve', this.currentRow, this.relateType)
@@ -279,7 +278,14 @@ export default {
               }
             } 
           } else {
-            this.$emit('conserve', this.currentRow)
+              if (this.currentRow.DateType.indexOf('二进制') !== -1) {
+                return this.$emit('conserve', this.currentRow)
+              } else {
+                  this.typeV = '5'
+                  this.deleteShow = true
+                  this.deletetext = '该变量不是二进制变量，请重新选择'
+                return
+              }
           }
            
         },

src/views/education/deviceManage.vue

@@ -214,6 +214,12 @@ export default {
         //添加
         addFun(value){
            let data = value
+           if (value.Proalert.trim() === '') {
+              this.typeV = '5'
+              this.deleteShow = true
+              this.deletetext = '请先关联变量'
+              return
+           }
             this.$axios({
                   method:"post",
                   url:`/api/Device/Device_WindowAddSave`,
@@ -226,7 +232,7 @@ export default {
                          this.typeV = '6'
                          this.cancelFun()
                       }
-                        this.deletetext = res.data.msg
+                      this.deletetext = res.data.msg
                       this.query()
                 }).catch(function(err){
                   console.log('err',err)

src/views/education/materiel.vue

@@ -57,18 +57,19 @@
                         label="最近修改时间"
                         :show-overflow-tooltip="true"
                         prop="UpdateTime"
-                        width="320">
+                        width="240">
                     </el-table-column>
                       <el-table-column
                         label="修改人"
                         :show-overflow-tooltip="true"
                         prop="UpdateUserName"
-                        width="310">
+                        width="300">
                     </el-table-column>
                  
                      <el-table-column
                         label="操作"
-                        show-overflow-tooltip>
+                        show-overflow-tooltip
+                        >
                         <template slot-scope="scope">
                           <div class="table_edit" @click="editFun(scope.row)" >
                             <div class="edit_img"></div>

src/views/education/productManage.vue

@@ -62,7 +62,7 @@
                     <el-table-column
                         label="产品组成(BOM)"
                         :show-overflow-tooltip="true"
-                        width="260">
+                        width="210">
                         <template slot-scope="scope">
                           <div class="BomBtn" @click="BomFun(scope.row)" >
                                <div class="Bom_img"></div>
@@ -85,7 +85,8 @@
                  
                      <el-table-column
                         label="操作"
-                        show-overflow-tooltip>
+                        show-overflow-tooltip
+                        width="170">
                         <template slot-scope="scope">
                           <div class="table_edit" @click="editFun(scope.row)" >
                             <div class="edit_img"></div>