提交

src/views/aqpt/danger/components/DangerInfo.vue

@@ -52,7 +52,7 @@
       <div v-if="viewData.rectifyAccountId" class="text-row">
         <div v-if="viewData.rectifyAccountId" class="text-item">
           <span class="text-label right">整改人员：</span>
-          <span> {{ viewData.rectifyAccountName }}( {{ viewData.rectifyAccountName }} ) </span>
+          <span> {{ viewData.rectifyAccountName }}( {{ viewData.          }} ) </span>
         </div>
         <div v-if="viewData.rectifyGroupName" class="text-item">
           <span class="text-label right">所在部门：</span>

src/views/goaf/sensor/Model.vue

@@ -8,11 +8,40 @@
     :visible.sync="dialogVisible"
   >
     <el-form ref="ruleForm" :model="formData" :rules="rules" label-position="right" label-width="160px">
+      <el-form-item label="请输入设备名称" required>
+        <el-input-number v-model="formData.name" placeholder="请输入设备名称" :controls="false" />
+      </el-form-item>
+      <el-form-item label="安全区域" required>
+        <div class="safe-area">
+          <el-select v-model="formData.goafOrebelt" class="safe-area-item" filterable placeholder="矿带">
+            <el-option :value="0" label="请选择矿带" disabled />
+            <el-option v-for="item in goaf" :key="item.id" :value="item.id" :label="item.name" />
+          </el-select>/
+          <el-select v-model="formData.goafOrebody" class="safe-area-item" filterable placeholder="矿体">
+            <el-option :value="0" label="请选择矿体" disabled />
+            <el-option v-for="item in goaf" :key="item.id" :value="item.id" :label="item.name" />
+          </el-select>/
+          <el-select v-model="formData.goafOreheight" class="safe-area-item" filterable placeholder="中段">
+            <el-option :value="0" label="请选择中段" disabled />
+            <el-option v-for="item in goaf" :key="item.id" :value="item.id" :label="item.name" />
+          </el-select>/
+          <el-select v-model="formData.goafName" class="safe-area-item" filterable placeholder="采空区名称">
+            <el-option :value="0" label="请选择采空区" disabled />
+            <el-option v-for="item in goaf" :key="item.id" :value="item.id" :label="item.name" />
+          </el-select>
+        </div>
+      </el-form-item>
+      <el-form-item label="请输入设备名称" required>
+        <el-input-number v-model="formData.name" placeholder="请输入设备名称" :controls="false" />
+      </el-form-item>
       <el-form-item label="传感器类型">
         <el-select v-model="formData.sensorTypeId" style="width:200px">
           <el-option v-for="item in sensors" :key="item.id" :value="item.id" :label="item.name" />
         </el-select>
       </el-form-item>
+      <el-form-item label="执行人员" prop="executeAccountId">
+        <user-selector :default-val="formData.executeAccountId" @setUserInfo="handleUserSelect" />
+      </el-form-item>
     </el-form>
     <div class="btn-group">
       <el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
@@ -22,8 +51,15 @@
 </template>
 
 <script>
+import { getSensorCat } from '@/api/goaf/sensorCatApi'
+import { getGoafBaseInfo } from '@/api/goaf/info'
 import { createSensor, updateSensor } from '@/api/goaf/sensor'
+import UserSelector from '@/components/UserSelector/index'
 export default {
+  name: 'SensorModel',
+  components: {
+    UserSelector
+  },
   data() {
     return {
       title: '传感器配置',
@@ -41,11 +77,17 @@ export default {
         { id: 3, name: '位移传感器' },
         { id: 4, name: '气体传感器' }
       ],
+      sensorCats: [],
+      goaf: [],
       formData: {
+        'goafOrebelt': 0,
+        'goafOrebody': 0,
+        'goafOreheight': 0,
+        'goafName': '',
         'sensorTypeId': '',
-        'ocId': '',
         'sensorType': '',
-        'sensorTypeName': ''
+        'sensorTypeName': '',
+        'executeAccountId': ''
       },
       rules: {
       },
@@ -56,9 +98,17 @@ export default {
     }
   },
   mounted() {
+    this.init()
   },
   methods: {
-
+    init() {
+      getSensorCat().then((res) => {
+        console.log({ res })
+      })
+      getGoafBaseInfo.then((goaf) => {
+        console.log({ goaf })
+      })
+    },
     // Show Add Dialog
     showAddModel(hazardId, hazardTitle) {
       this.resetFormData()
@@ -85,7 +135,12 @@ export default {
         'sensorTypeName': ''
       }
     },
-
+    // 选择执行人员
+    handleUserSelect(obj) {
+      this.formData.executeAccountId = obj.accountId
+      this.formData.executeGroupId = obj.groupId
+      this.formData.executePosition = obj.positionId
+    },
     // 提交
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
@@ -137,9 +192,19 @@ export default {
   }
 }
 </script>
-<style scoped>
+<style lang="scss" scoped>
 .btn-group{
   padding-left: 160px;
   margin-top: 50px;
 }
+.safe-area{
+  color: #fff;
+  display: flex;
+  flex-wrap: wrap;
+  .safe-area-item{
+    margin:0 5px 10px 0;
+    width: 20%;
+    min-width: 120px;
+  }
+}
 </style>