Merge remote-tracking branch 'origin/master'

src/styles/element-ui.scss

@@ -129,6 +129,21 @@ body .el-table th.gutter{
     color: white!important;
   }
 }
+.canleBtn{
+  border: 1px solid #DCDFE6!important;
+  background-color: white!important;
+  color: #606266!important;
+}
+.btn-custom-cancel{
+  border: 1px solid #DCDFE6!important;
+  background-color: white!important;
+  color: #606266!important;
+  &:hover {
+    border: 1px solid #DCDFE6!important;
+    background-color: white!important;
+    color: #606266!important;
+  }
+}
 // 按钮默认颜色(黑)
 .blackBtn{
   border-color: #2C333A;

src/views/productionInfo/badDefinition.vue

@@ -214,18 +214,18 @@
                   <div class="labelName">Specific Explanation</div>
                 </div>
                 <el-col v-for="(item, index) in form.specificExplanations" :key="item" :span="18" style="width: 70%">
-                  <el-input v-model="item.specificExplanation" :maxlength="200" placeholder="" style="width: 70%;margin-bottom: 10px" />
-                  <el-link v-if="form.specificExplanations.length > 1" type="primary" style="width: 20%" @click.prevent="removeDomain(item,index)">删除</el-link>
+                  <el-input v-model="item.specificExplanation" :maxlength="200" placeholder="" style="width: 80%;margin-bottom: 10px" />
+                  <el-button v-if="form.specificExplanations.length > 1" style="margin-left: 5%" icon="el-icon-minus" @click.prevent="removeDomain(item,index)" />
                 </el-col>
                 <el-col :span="6">
-                  <el-link type="primary" @click="addDomain">增加一行</el-link>
+                  <el-button type="primary" @click="addDomain" icon="el-icon-plus" />
                 </el-col>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="cancel">取消</el-button>
+          <el-button class="canleBtn" @click="cancel">取消</el-button>
           <el-button class="redBtn" type="danger" @click="submitForm">确定</el-button>
         </div>
       </el-dialog>
@@ -288,19 +288,19 @@
                   <div class="labelName">具体解释</div>
                   <div class="labelName">Specific Explanation</div>
                 </div>
-                <el-col v-for="(item, index) in form.specificExplanation" :key="item" :span="18" style="width: 70%">
-                  <el-input v-model="item.specificExplanation" :maxlength="200" placeholder="" style="width: 70%;margin-bottom: 10px" />
-                  <el-link v-if="form.specificExplanation.length > 1" type="primary" style="width: 20%" @click.prevent="removeUpdate(item,index)">删除</el-link>
+                <el-col v-for="(item, index) in form.specificExplanation" :key="item" :span="20" style="width: 70%">
+                  <el-input v-model="item.specificExplanation" :maxlength="200" placeholder="" style="width: 80%;margin-bottom: 10px" />
+                  <el-button v-if="form.specificExplanation.length > 1" style="margin-left: 5%" @click.prevent="removeUpdate(item,index)" icon="el-icon-minus" />
                 </el-col>
-                <el-col :span="6">
-                  <el-link type="primary" @click="addUpdate">增加一行</el-link>
+                <el-col :span="4">
+                  <el-button type="primary" @click="addUpdate" icon="el-icon-plus" />
                 </el-col>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="cancel">取消</el-button>
+          <el-button class="canleBtn" @click="cancel">取消</el-button>
           <el-button class="redBtn" type="danger" @click="submitForm">确定</el-button>
         </div>
       </el-dialog>
@@ -434,6 +434,7 @@ export default {
       this.$confirm('本条数据被删除后不可再恢复，是否继续？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning'
       }).then(function() {
         return deleteLogical(badId)
@@ -472,6 +473,7 @@ export default {
       this.$confirm('确认要' + text + '编号为"' + row.rejectCode + '"的状态吗?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning'
       }).then(function() {
         row.specificExplanation = []
@@ -493,6 +495,11 @@ export default {
           if (this.form.businessId !== undefined) {
             this.specificExplanations = []
             this.form.specificExplanation.forEach(item => {
+              for (const key in item) {
+                if (item[key] === '') {
+                  delete item[key]
+                }
+              }
               this.specificExplanations.push(item.specificExplanation)
             })
             this.form.specificExplanations = this.specificExplanations
@@ -514,11 +521,12 @@ export default {
           } else {
             this.form.specificExplanation1 = []
             this.form.specificExplanations.forEach(item => {
-              if (this.form.specificExplanations.length < 1) {
-                this.form.specificExplanation1.push(item.specificExplanation)
-              } else {
-                this.form.specificExplanation1.push(item.specificExplanation)
+              for (const key in item) {
+                if (item[key] === '') {
+                  delete item[key]
                 }
+              }
+              this.form.specificExplanation1.push(item.specificExplanation)
             })
             addBad({
               rejectCode: this.form.rejectCode,
@@ -573,6 +581,7 @@ export default {
       this.$confirm('是否确认导出所有用户信息?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning'
       }).then(function() {
         return exportBad(queryParams).then(response => {
@@ -580,7 +589,7 @@ export default {
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob)// 创建下载的链接
           downloadElement.href = href
-          downloadElement.download = '用户信息' + '.xls' // 下载后文件名
+          downloadElement.download = '缺陷定义信息' + '.xls' // 下载后文件名
           document.body.appendChild(downloadElement)
           downloadElement.click()// 点击下载
           document.body.removeChild(downloadElement)// 下载完成移除元素

src/views/system/dept/index.vue

@@ -259,7 +259,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
+        <el-button class="canleBtn" @click="cancel">取 消</el-button>
         <el-button type="danger" class="redBtn" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
@@ -493,6 +493,7 @@ export default {
       this.$confirm('所选择数据被删除后不可再恢复，是否继续？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning'
       }).then(function() {
         return delDept(row.businessId)

src/views/system/device/index.vue

@@ -230,7 +230,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
+        <el-button class="canleBtn" @click="cancel">取 消</el-button>
         <el-button type="danger" class="redBtn" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
@@ -238,7 +238,7 @@
 </template>
 
 <script>
-import { addDevice, delDevice, getDevice, listDevice, updateDevice, updateDeviceStatus } from '@/api/system/device'
+import { addDevice, delDevice, getDevice, listDevice, updateDevice } from '@/api/system/device'
 import { listPost } from '@/api/badDefinition'
 
 export default {
@@ -371,6 +371,7 @@ export default {
       this.$confirm(`“${row.deviceName}”设备即将被${text}，是否继续？`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         customClass: 'confirmBtnSure',
         type: 'warning'
       }).then(function() {
@@ -439,6 +440,7 @@ export default {
       this.$confirm('所选择数据被删除后不可再恢复，是否继续？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning'
       }).then(function() {
         return delDevice(row.businessId)

src/views/system/dict/data.vue

@@ -94,6 +94,7 @@
         <!--            {{ scope.row.dictCode || '-' }}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
+        <el-table-column type="index" label="序号" width="50" />
         <el-table-column label="字典编码" align="center" prop="businessId">
           <template slot="header">
             <div>字典编码</div>
@@ -254,7 +255,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
+        <el-button class="canleBtn" @click="cancel">取 消</el-button>
         <el-button type="danger" class="redBtn" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
@@ -484,6 +485,7 @@ export default {
       this.$confirm('所选择数据被删除后不可再恢复，是否继续？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning'
       }).then(function() {
         return delData(dictCodes)

src/views/system/dict/index.vue

@@ -119,6 +119,7 @@
       <div class="mb12 font-small-bold" style="margin: 0 0 12px 0;font-size: 14px">字典管理列表</div>
       <el-table v-loading="loading" border :data="typeList" @selection-change="handleSelectionChange">
         <!--        <el-table-column type="selection" width="55" align="center" />-->
+        <el-table-column type="index" label="序号" width="50" />
         <el-table-column align="center" prop="businessId">
           <template slot="header">
             <div>字典编号</div>
@@ -285,7 +286,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
+        <el-button class="canleBtn" @click="cancel">取 消</el-button>
         <el-button type="danger" class="redBtn" :loading="manageLoading" :disabled="manageLoading" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
@@ -588,6 +589,7 @@ export default {
       this.$confirm('是否确认删除字典编号为"' + dictIds + '"的数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning'
       }).then(function() {
         return delType(dictIds)

src/views/system/menu/index.vue

@@ -331,7 +331,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
+        <el-button class="canleBtn" @click="cancel">取 消</el-button>
         <el-button type="danger" class="redBtn" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
@@ -627,6 +627,7 @@ export default {
       this.$confirm('所选择数据被删除后不可再恢复，是否继续？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning'
       }).then(function() {
         return delMenu(row.businessId)

src/views/system/role/index.vue

@@ -238,7 +238,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
+        <el-button class="canleBtn" @click="cancel">取 消</el-button>
         <el-button type="danger" class="redBtn" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
@@ -315,7 +315,7 @@
         </el-col>
       </el-row>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancelDataScope">取 消</el-button>
+        <el-button class="canleBtn" @click="cancelDataScope">取 消</el-button>
         <el-button type="primary" @click="submitDataScope">确 定</el-button>
       </div>
     </el-dialog>
@@ -702,6 +702,7 @@ export default {
       this.$confirm('所选择数据被删除后不可再恢复，是否继续？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning'
       }).then(function() {
         return delRole(roleIds)

src/views/system/user/index.vue

@@ -226,14 +226,6 @@
                 style="margin-left: 10px"
                 @click="handleUpdate(scope.row)"
               >修改</el-link>
-              <el-link
-                v-hasPermi="['sys:user:resetPwd']"
-                size="mini"
-                type="success"
-                style="margin-left: 10px"
-                :loading="addLoading"
-                @click="handleResetPwd(scope.row)"
-              >重置</el-link>
               <el-link
                 v-if="scope.row.businessId !== 1"
                 v-hasPermi="['sys:user:delete']"
@@ -242,6 +234,14 @@
                 style="margin-left: 10px"
                 @click="handleDelete(scope.row)"
               >删除</el-link>
+              <el-link
+                v-hasPermi="['sys:user:resetPwd']"
+                size="mini"
+                type="success"
+                style="margin-left: 10px"
+                :loading="addLoading"
+                @click="handleResetPwd(scope.row)"
+              >重置</el-link>
             </template>
           </el-table-column>
         </el-table>
@@ -418,6 +418,7 @@
               <treeSelect
                 v-model="form.deptId"
                 :disable-branch-nodes="false"
+                :default-expand-level="1"
                 :options="deptOptions"
                 :show-count="true"
                 placeholder="请选择归属部门"
@@ -439,7 +440,7 @@
         <!--        </el-row>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
+        <el-button class="canleBtn" @click="cancel">取 消</el-button>
         <el-button type="danger" class="redBtn" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
@@ -838,6 +839,7 @@ export default {
       this.$confirm('确认要"' + text + '""' + row.username + '"用户吗?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning'
       }).then(function() {
         return changeUserStatus(row.businessId, row.flag)
@@ -1023,6 +1025,7 @@ export default {
       this.$confirm('所选择数据被删除后不可再恢复，是否继续？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning'
       }).then(function() {
         return delUser(userId)
@@ -1040,6 +1043,7 @@ export default {
       this.$confirm('是否确认导出所有用户信息?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
+        cancelButtonClass: 'btn-custom-cancel',
         type: 'warning'
       }).then(function() {
         return exportUser(queryParams).then(response => {
@@ -1209,6 +1213,9 @@ export default {
       right: 13px;
       text-align: center;
     }
+    .el-dialog__body{
+      min-height: 400px!important;
+    }
     .labelClassRequired{
       text-align: center;
       position: relative;