submit

src/settings.js

@@ -37,8 +37,8 @@ module.exports = {
   * 服务API地址
   */
   serverUrl: 'http://113.141.93.143:1688', // 正式环境
-  devServerUrl: 'http://113.141.93.143:1688', // 开发环境
-  // devServerUrl: 'http://192.168.3.5:1688', // 开发环境 qu
+  // devServerUrl: 'http://113.141.93.143:1688', // 开发环境
+  devServerUrl: 'http://192.168.3.5:1688', // 开发环境 qu
   // devServerUrl: 'http://192.168.3.201:8080/', // 开发环境  test
   mqttUrl: 'ws://113.141.93.143:8894/mqtt', // mqtt地址
   /**

src/views/goaf/info/components/Goaf.vue

@@ -11,51 +11,51 @@
     <div class="content-container goaf">
       <el-form ref="ruleForm" :model="formData" :rules="rules" label-position="top" class="goaf-form">
         <el-form-item label="采空区名称" prop="goafName">
-          <el-input v-model="formData.goafName" />
+          <el-input v-model="formData.goafName" placeholder="采空区名称" />
         </el-form-item>
-        <el-form-item label="矿带" required>
+        <el-form-item label="矿带" prop="goafOrebelt">
           <el-input-number v-model="formData.goafOrebelt" placeholder="矿带" :controls="false" />
         </el-form-item>
-        <el-form-item label="矿体" required>
+        <el-form-item label="矿体" prop="goafOrebody">
           <el-input-number v-model="formData.goafOrebody" placeholder="矿体" :controls="false" />
         </el-form-item>
-        <el-form-item label="中段" required>
+        <el-form-item label="中段" prop="goafOreheight">
           <el-input-number v-model="formData.goafOreheight" placeholder="中段" :controls="false" />
         </el-form-item>
-        <el-form-item label="水平断面均暴露面积" required>
+        <el-form-item label="水平断面均暴露面积">
           <el-input-number v-model="formData.goafAvexArea" placeholder="水平断面均暴露面积" :controls="false" />
         </el-form-item>
-        <el-form-item label="平均倾向宽度" required>
+        <el-form-item label="平均倾向宽度">
           <el-input-number v-model="formData.goafAvinWidth" placeholder="平均倾向宽度" :controls="false" />
         </el-form-item>
-        <el-form-item label="平均暴露高度" required>
+        <el-form-item label="平均暴露高度">
           <el-input-number v-model="formData.goafAvexHeight" placeholder="平均暴露高度 0.0表示“已填充”" :controls="false" />
         </el-form-item>
-        <el-form-item label="体积" required>
+        <el-form-item label="体积">
           <el-input-number v-model="formData.goafVoidVolume" placeholder="体积 0表示“已填充”" :controls="false" />
         </el-form-item>
-        <el-form-item label="倾向" required>
+        <el-form-item label="倾向">
           <el-input-number v-model="formData.goafKeyTrend" placeholder="倾向" :controls="false" />
         </el-form-item>
-        <el-form-item label="倾角（度）" required>
+        <el-form-item label="倾角（度）">
           <el-input-number v-model="formData.goafKeyDipangle" placeholder="倾角（度）" :controls="false" />
         </el-form-item>
-        <el-form-item label="顶板矿柱厚度" required>
+        <el-form-item label="顶板矿柱厚度">
           <el-input-number v-model="formData.goafRoofpillarThickness" placeholder="顶板矿柱厚度" :controls="false" />
         </el-form-item>
-        <el-form-item label="保安间柱平均厚度" required>
+        <el-form-item label="保安间柱平均厚度">
           <el-input-number v-model="formData.goafIncoavThickness" placeholder="保安间柱平均厚度" :controls="false" />
         </el-form-item>
-        <el-form-item label="勘探位置" prop="goafExpLocation">
+        <el-form-item label="勘探位置">
           <el-input v-model="formData.goafExpLocation" />
         </el-form-item>
-        <el-form-item label="围岩岩性" prop="goafRockLithology">
+        <el-form-item label="围岩岩性">
           <el-input v-model="formData.goafRockLithology" />
         </el-form-item>
-        <el-form-item label="围岩稳定性" prop="goafRockStability">
+        <el-form-item label="围岩稳定性">
           <el-input v-model="formData.goafRockStability" />
         </el-form-item>
-        <el-form-item label="形成时间" prop="goafFormationTime">
+        <el-form-item label="形成时间">
           <el-date-picker
             v-model="formData.goafFormationTime"
             type="date"
@@ -65,25 +65,25 @@
             :default-value="new Date()"
           />
         </el-form-item>
-        <el-form-item label="可充填体积（m³）" required>
+        <el-form-item label="可充填体积（m³）">
           <el-input-number v-model="formData.goafCanfillVolume" placeholder="可充填体积（m³）" :controls="false" />
         </el-form-item>
-        <el-form-item label="剩余可充填体积（m³）" required>
+        <el-form-item label="剩余可充填体积（m³）">
           <el-input-number v-model="formData.goafRemainVolume" placeholder="剩余可充填体积（m³）" :controls="false" />
         </el-form-item>
-        <el-form-item label="充填方式" prop="goafFillMethod">
+        <el-form-item label="充填方式">
           <el-select v-model="formData.goafFillMethod">
             <el-option :value="0" label="废石" />
             <el-option :value="1" label="尾矿" />
           </el-select>
         </el-form-item>
-        <el-form-item label="是否填充" prop="goafIsFill">
+        <el-form-item label="是否填充">
           <el-select v-model="formData.goafIsFill">
             <el-option :value="0" label="是" />
             <el-option :value="1" label="否" />
           </el-select>
         </el-form-item>
-        <el-form-item label="检查表" prop="goafChecklistId">
+        <el-form-item label="检查表">
           <el-select v-model="formData.goafChecklistId" style="width: 100%" filterable placeholder="检查表">
             <el-option
               v-for="item in checklist"
@@ -94,7 +94,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="备注" prop="goafInfoRemak" required>
+        <el-form-item label="备注">
           <el-input v-model="formData.goafInfoRemak" type="textarea" rows="5" />
         </el-form-item>
       </el-form>
@@ -109,7 +109,8 @@
 <script>
 import { createGoaf, updateGoaf } from '@/api/goaf/info'
 import { getChecklist } from '@/api/goaf/check'
-
+import { mapGetters } from 'vuex'
+import { parseTime } from '@/utils'
 export default {
   data() {
     return {
@@ -124,42 +125,43 @@ export default {
       checklist: [],
       dialogVisible: false,
       formData: {
-        'goafId': '',
-        'ocId': '',
-        'goafOrebelt': 0,
-        'goafOrebody': 0,
-        'goafOreheight': 0,
+        'goafOrebelt': undefined,
+        'goafOrebody': undefined,
+        'goafOreheight': undefined,
         'goafName': '',
-        'goafAvexArea': 0,
-        'goafAvinWidth': 0,
-        'goafAvexHeight': 0,
-        'goafVoidVolume': 0,
-        'goafKeyTrend': 0,
-        'goafKeyDipangle': 0,
-        'goafRoofpillarThickness': 0,
-        'goafIncoavThickness': 0,
-        'goafExpLocation': '',
-        'goafRockLithology': '',
-        'goafRockStability': '',
-        'goafFormationTime': new Date(),
-        'goafCanfillVolume': 0,
-        'goafRemainVolume': 0,
-        'goafFillMethod': 0,
-        'goafIsFill': 0,
-        'goafInfoRemak': '',
-        'goafChecklistId': '',
-        'goafChecklistTitle': '',
-        'goafChecklistIsbind': 1
+        'goafAvexArea': undefined,
+        'goafAvinWidth': undefined,
+        'goafAvexHeight': undefined,
+        'goafVoidVolume': undefined,
+        'goafKeyTrend': undefined,
+        'goafKeyDipangle': undefined,
+        'goafRoofpillarThickness': undefined,
+        'goafIncoavThickness': undefined,
+        'goafExpLocation': undefined,
+        'goafRockLithology': undefined,
+        'goafRockStability': undefined,
+        'goafFormationTime': parseTime(new Date()),
+        'goafCanfillVolume': undefined,
+        'goafRemainVolume': undefined,
+        'goafFillMethod': undefined,
+        'goafIsFill': undefined,
+        'goafInfoRemak': undefined,
+        'goafChecklistId': undefined,
+        'goafChecklistTitle': undefined,
+        'goafChecklistIsbind': 0
       },
       rules: {
         goafName: [{ required: true, message: '采空区名称不能为空', trigger: 'blur' }],
-        goafExpLocation: [{ required: true, message: '勘探位置不能为空', trigger: 'blur' }],
-        goafRockLithology: [{ required: true, message: '围岩岩性不能为空', trigger: 'blur' }],
-        goafRockStability: [{ required: true, message: '围岩稳定性不能为空', trigger: 'blur' }],
-        goafFormationTime: [{ required: true, message: '形成时间不能为空', trigger: 'change' }],
-        goafIsFill: [{ required: true, message: '形成时间不能为空', trigger: 'change' }],
-        goafInfoRemak: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
-        goafChecklistId: [{ required: true, message: '请选择检查表', trigger: 'blur' }]
+        goafOrebelt: [{ required: true, message: '矿带不能为空', trigger: 'blur' }],
+        goafOrebody: [{ required: true, message: '矿体不能为空', trigger: 'blur' }],
+        goafOreheight: [{ required: true, message: '中段不能为空', trigger: 'blur' }]
+        // goafExpLocation: [{ required: true, message: '勘探位置不能为空', trigger: 'blur' }],
+        // goafRockLithology: [{ required: true, message: '围岩岩性不能为空', trigger: 'blur' }],
+        // goafRockStability: [{ required: true, message: '围岩稳定性不能为空', trigger: 'blur' }],
+        // goafFormationTime: [{ required: true, message: '形成时间不能为空', trigger: 'change' }],
+        // goafIsFill: [{ required: true, message: '形成时间不能为空', trigger: 'change' }],
+        // goafInfoRemak: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
+        // goafChecklistId: [{ required: true, message: '请选择检查表', trigger: 'blur' }]
       },
       ctrlLevelList: [],
       positionList: [],
@@ -167,12 +169,21 @@ export default {
       actionType: ''
     }
   },
+  computed: {
+    ...mapGetters([
+      'userData'
+    ])
+  },
   created() {
     getChecklist().then((res) => {
       this.checklist = res.data
     })
   },
   methods: {
+    isNull(val) {
+      if (val !== undefined && val !== 'undefined' && val !== null && val !== '') return false
+      return true
+    },
     // Show Add Dialog
     showAddModel(hazardId, hazardTitle) {
       this.resetFormData()
@@ -186,36 +197,40 @@ export default {
       this.actionType = 'UPDATE'
       this.dialogVisible = true
       this.formData = data
+      for (const key in data) {
+        if (data[key] === null) {
+          this.formData[key] = undefined
+        }
+      }
     },
 
     // Reset Form Data
     resetFormData() {
       this.formData = {
-        'ocId': '',
-        'goafOrebelt': 0,
-        'goafOrebody': 0,
-        'goafOreheight': 0,
+        'goafOrebelt': undefined,
+        'goafOrebody': undefined,
+        'goafOreheight': undefined,
         'goafName': '',
-        'goafAvexArea': 0,
-        'goafAvinWidth': 0,
-        'goafAvexHeight': 0,
-        'goafVoidVolume': 0,
-        'goafKeyTrend': 0,
-        'goafKeyDipangle': 0,
-        'goafRoofpillarThickness': 0,
-        'goafIncoavThickness': 0,
-        'goafExpLocation': '',
-        'goafRockLithology': '',
-        'goafRockStability': '',
-        'goafFormationTime': '',
-        'goafCanfillVolume': 0,
-        'goafRemainVolume': 0,
-        'goafFillMethod': 0,
-        'goafIsFill': 0,
-        'goafInfoRemak': '',
-        'goafChecklistId': '',
-        'goafChecklistTitle': '',
-        'goafChecklistIsbind': 1
+        'goafAvexArea': undefined,
+        'goafAvinWidth': undefined,
+        'goafAvexHeight': undefined,
+        'goafVoidVolume': undefined,
+        'goafKeyTrend': undefined,
+        'goafKeyDipangle': undefined,
+        'goafRoofpillarThickness': undefined,
+        'goafIncoavThickness': undefined,
+        'goafExpLocation': undefined,
+        'goafRockLithology': undefined,
+        'goafRockStability': undefined,
+        'goafFormationTime': parseTime(new Date()),
+        'goafCanfillVolume': undefined,
+        'goafRemainVolume': undefined,
+        'goafFillMethod': undefined,
+        'goafIsFill': undefined,
+        'goafInfoRemak': undefined,
+        'goafChecklistId': undefined,
+        'goafChecklistTitle': undefined,
+        'goafChecklistIsbind': 0
       }
     },
 
@@ -223,8 +238,12 @@ export default {
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          const goafChecklist = this.checklist.filter(item => this.formData.goafChecklistId === item.checklistId)[0]
-          this.formData.goafChecklistTitle = goafChecklist.checklistTitle
+          if (!this.isNull(this.formData.goafChecklistId)) {
+            const goafChecklist = this.checklist.filter(item => this.formData.goafChecklistId === item.checklistId)[0]
+            this.formData.goafChecklistTitle = goafChecklist.checklistTitle
+          }
+          this.formData.ocId = this.userData.ocId
+          this.formData.goafChecklistIsbind = this.isNull(this.formData.goafChecklistId) ? 0 : 1
           switch (this.actionType) {
             case 'ADD':
               createGoaf(this.formData).then((resp) => {
@@ -296,16 +315,16 @@ export default {
 
       input, textarea {
         background: transparent;
-        border: 0px;
+        border: undefinedpx;
         -webkit-appearance: none;
-        border-radius: 0px;
+        border-radius: undefinedpx;
         padding: 12px 5px 12px 15px;
         color: $light_gray;
         min-height: 47px;
         caret-color: $cursor;
 
         &:-webkit-autofill {
-          box-shadow: 0 0 0px 1000px $bg inset !important;
+          box-shadow: undefined 0 0px 1000px $bg inset !important;
           -webkit-text-fill-color: $cursor !important;
         }
       }
@@ -332,7 +351,7 @@ export default {
       padding:10px 0;
       text-align: right;
       .el-button {
-        margin: 0 15px;
+        margin: undefined 15px;
       }
       .cancel-btn {
         background: #004F7B;
@@ -372,7 +391,7 @@ export default {
           width: 300px;
           input{
               width: 300px;
-              padding: 0;
+              padding: undefined;
               min-height:40px;
               padding-left: 30px;
               box-sizing: border-box;

src/views/goaf/info/components/GoafInfo.vue

@@ -31,14 +31,14 @@
             <span>{{ convertNum(row.goafOrebelt) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="goafOrebody" label="矿体" />
-        <el-table-column prop="goafOreheight" label="中段" />
-        <el-table-column prop="goafName" label="采空区名称" show-overflow-tooltip />
-        <el-table-column prop="goafRoofpillarThickness" label="顶板矿柱厚度" width="" />
-        <el-table-column prop="goafIncoavThickness" label="	保安间柱平均厚度" width="150" />
-        <el-table-column prop="goafRockLithology" label="围岩岩性" />
-        <el-table-column prop="goafRockStability" label="围岩稳定性" />
-        <el-table-column prop="goafCanfillVolume" label="可充填体积（m³）" width="150" />
+        <el-table-column prop="goafOrebody" label="矿体"><template v-slot="{row}">{{ row.goafOrebody|isNull }}</template></el-table-column>
+        <el-table-column prop="goafOreheight" label="中段"><template v-slot="{row}">{{ row.goafOrebody|isNull }}</template></el-table-column>
+        <el-table-column prop="goafName" label="采空区名称" show-overflow-tooltip><template v-slot="{row}">{{ row.goafName|isNull }}</template></el-table-column>
+        <el-table-column prop="goafRoofpillarThickness" label="顶板矿柱厚度" width="150"><template v-slot="{row}">{{ row.goafRoofpillarThickness|isNull }}</template></el-table-column>
+        <el-table-column prop="goafIncoavThickness" label="	保安间柱平均厚度" width="150"><template v-slot="{row}">{{ row.goafIncoavThickness|isNull }}</template></el-table-column>
+        <el-table-column prop="goafRockLithology" label="围岩岩性"><template v-slot="{row}">{{ row.goafRockLithology|isNull }}</template></el-table-column>
+        <el-table-column prop="goafRockStability" label="围岩稳定性"><template v-slot="{row}">{{ row.goafRockStability|isNull }}</template></el-table-column>
+        <el-table-column prop="goafCanfillVolume" label="可充填体积（m³）" width="150"><template v-slot="{row}">{{ row.goafCanfillVolume|isNull }}</template></el-table-column>
         <el-table-column prop="goafRemainVolume" label="剩余可充填体积（m³）" width="280">
           <template v-slot="{row}">
             <span v-if="row.goafRemainVolumeCanEdit===true" class="table-input-number-box">
@@ -46,7 +46,7 @@
               <el-button size="mini" type="primary" @click="onUpdateGoaf(row)">提交</el-button>
               <el-button size="mini" @click="row.goafRemainVolumeCanEdit=false">取消</el-button>
             </span>
-            <span v-else>{{ row.goafRemainVolume }}</span>
+            <span v-else>{{ row.goafRemainVolume|isNull }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="goafIsFill" label="是否充填" width="80">
@@ -80,6 +80,12 @@ import Detail from './detail'
 import { NumConvertLM, parseTime } from '@/utils'
 export default {
   components: { Pagination, Goaf, Detail },
+  filters: {
+    isNull(val) {
+      if (val !== undefined && val !== 'undefined' && val !== null && val !== '') return val
+      return '未填写'
+    }
+  },
   data() {
     return {
       dataList: [],