工作区域接口调用完毕

src/api/mes/wa/workarea.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 
 // 查询硬件类型-列表
-export function listWordarea(query) {
+export function listWorkarea(query) {
   return request({
     url: '/iscs/workarea/getIsWorkareaPage',
     method: 'get',
@@ -13,7 +13,7 @@ export function listWordarea(query) {
 // 获取硬件类型详细信息
 export function getWorkareaInfo(repairId) {
   return request({
-    url: '/iscs/workarea/selectIsWorkareaById/?id=' + repairId,
+    url: '/iscs/workarea/selectIsWorkareaById/?workareaId=' + repairId,
     method: 'get'
   })
 }
@@ -46,7 +46,7 @@ export function updateWorkarea(data) {
 // 删除设备维修单
 export function delWorkarea(repairId) {
   return request({
-    url: '/iscs/workarea/deleteIsWorkareaByWorkareaIds?ids='+ repairId,
+    url: '/iscs/workarea/deleteIsWorkareaByWorkareaIds?workareaIds='+ repairId,
     method: 'post'
 
   })

src/views/mes/wa/workarea/index.vue

@@ -4,65 +4,27 @@
       <el-form-item label="工作区域编码" prop="workareaCode">
         <el-input
           v-model="queryParams.workareaCode"
-          placeholder="请输入隔离点编号"
+          placeholder="请输入工作区域编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="隔离点名称" prop="teamCode">
+      <el-form-item label="工作区域名称" prop="workareaName">
         <el-input
-          v-model="queryParams.teamCode"
+          v-model="queryParams.workareaName"
           placeholder="请输入隔离点名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="calendarType">
-        <el-select v-model="queryParams.calendarType" placeholder="状态">
-          <el-option>正常</el-option>
-          <el-option>异常</el-option>
-          <!--          <el-option-->
-          <!--            v-for="dict in dict.type.mes_calendar_type"-->
-          <!--            :key="dict.value"-->
-          <!--            :label="dict.label"-->
-          <!--            :value="dict.value"-->
-          <!--          />-->
-        </el-select>
-      </el-form-item>
-      <el-form-item label="隔离点类型" prop="calendarType">
-        <el-select v-model="queryParams.calendarType" placeholder="请选择隔离点类型">
-          <el-option
-            v-for="dict in dict.type.mes_calendar_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="危险能量类型" prop="calendarType">
-        <el-select v-model="queryParams.calendarType" placeholder="请选择危险能量类型">
-          <el-option
-            v-for="dict in dict.type.mes_calendar_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="value2"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :picker-options="pickerOptions"
-        >
-        </el-date-picker>
+      <el-form-item label="工作区域类型" prop="workareaType">
+        <el-input
+          v-model="queryParams.workareaType"
+          placeholder="请输入工作区域类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -77,30 +39,29 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['mes:spm:seg:add']"
+          v-hasPermi="['mes:wa:waa:add']"
         >新增
         </el-button>
       </el-col>
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="success"-->
-      <!--          plain-->
-      <!--          icon="el-icon-edit"-->
-      <!--          size="mini"-->
-      <!--          :disabled="single"-->
-      <!--          @click="handleUpdate"-->
-      <!--          v-hasPermi="['mes:cal:team:edit']"-->
-      <!--        >修改</el-button>-->
-      <!--      </el-col>-->
+<!--            <el-col :span="1.5">-->
+<!--              <el-button-->
+<!--                type="success"-->
+<!--                plain-->
+<!--                icon="el-icon-edit"-->
+<!--                size="mini"-->
+<!--                :disabled="single"-->
+<!--                @click="handleUpdate"-->
+<!--                v-hasPermi="['mes:cal:team:edit']"-->
+<!--              >修改</el-button>-->
+<!--            </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
           plain
           icon="el-icon-delete"
           size="mini"
-          :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['mes:spm:seg:batchremove']"
+          v-hasPermi="['mes:wa:waa:batchremove']"
         >批量删除
         </el-button>
       </el-col>
@@ -119,12 +80,22 @@
 
     <el-table v-loading="loading" :data="workareaList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="工作区域编码" align="center" prop="teamCode">
+      <el-table-column label="工作区域Id" align="center" prop="workareaId">
         <template slot-scope="scope">
           <el-button
             type="text"
             @click="handleView(scope.row)"
-            v-hasPermi="['mes:spm:seg:query']"
+            v-hasPermi="['mes:wa:waa:query']"
+          >{{ scope.row.workareaId }}
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="工作区域编码" align="center" prop="workareaCode">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['mes:wa:waa:query']"
           >{{ scope.row.workareaCode }}
           </el-button>
         </template>
@@ -133,18 +104,18 @@
       <el-table-column label="工作区域类型" align="center" prop="workareaType"/>
       <el-table-column label="所属车间Id" align="center" prop="workshopId"/>
 
-      <el-table-column label="状态" align="center" prop="calendarType">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.mes_calendar_type" :value="scope.row.calendarType"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="状态" align="center" prop="calendarType">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.mes_calendar_type" :value="scope.row.calendarType"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="地图" align="center" prop="map">
         <template slot-scope="scope">
-          <img :src="scope.row.map" alt="">
+          {{scope.row.map}}
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark">
-      </el-table-column>
+<!--      <el-table-column label="备注" align="center" prop="remark">-->
+<!--      </el-table-column>-->
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -153,7 +124,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:spm:seg:edit']"
+            v-hasPermi="['mes:wa:waa:edit']"
           >编辑
           </el-button>
           <el-button
@@ -161,7 +132,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:spm:seg:remove']"
+            v-hasPermi="['mes:wa:waa:remove']"
           >删除
           </el-button>
         </template>
@@ -183,8 +154,9 @@
         <span class="title">{{ title }}</span>
       </div>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="区域Id" prop="workareaId">
-          <el-input style="width: 318px" v-model="form.workareaId" placeholder="请输入区域Id"       />
+
+        <el-form-item label="区域名称" prop="workareaName">
+          <el-input style="width: 318px" v-model="form.workareaName" placeholder="请输入区域名称"       />
         </el-form-item>
         <el-form-item label="区域编码" prop="workareaCode" >
           <el-input style="width: 318px"  v-model="form.workareaCode" placeholder="请输入区域编码" />
@@ -203,11 +175,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="地图" prop="map">
-          <ImageUpload :limit="1" :value="form.map" :fileSize="5" @onUploaded="handleImgUplaoded" @onRemoved="handleImgRemoved" ></ImageUpload>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input style="width: 318px" type="textarea"  v-model="form.remark" placeholder="请输入备注" />
+          <el-input style="width: 318px"   v-model="form.map" placeholder="请输入地图" />
+<!--          <ImageUpload :limit="1" :value="form.map" :fileSize="5" @onUploaded="handleImgUplaoded" @onRemoved="handleImgRemoved" ></ImageUpload>-->
         </el-form-item>
+<!--        <el-form-item label="备注" prop="remark">-->
+<!--          <el-input style="width: 318px" type="textarea"  v-model="form.remark" placeholder="请输入备注" />-->
+<!--        </el-form-item>-->
       </el-form>
 
       <div slot="footer" class="dialog-footer">
@@ -220,7 +193,15 @@
 </template>
 
 <script>
-import { listWordarea, getWorkareaInfo, addWorkarea, updateWorkarea, delWorkarea,listAllWorkshop } from '@/api/mes/wa/workarea'
+import {
+  listWorkarea,
+  getWorkareaInfo,
+  addWorkarea,
+  updateWorkarea,
+  delWorkarea,
+  listAllWorkshop,
+
+} from '@/api/mes/wa/workarea'
 
 import { genCode } from '@/api/system/autocode/rule'
 
@@ -255,40 +236,10 @@ export default {
       queryParams: {
         current: 1,
         size: 10,
-        teamCode: null,
-        teamName: null,
-        calendarType: null
-      },
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
+        workareaCode: null,
+        workareaName: null,
+        workareaType: null
       },
-
-      value2: '',
-
       // 表单参数
       form: {},
       WorkShopListOptions:null,//所属车间下拉数据
@@ -315,7 +266,8 @@ export default {
     /** 查询班组列表 */
     getList() {
       this.loading = true
-      listWordarea(this.queryParams).then(response => {
+      listWorkarea(this.queryParams).then(response => {
+        console.log(response,'获取工作取区域allList')
         this.workareaList = response.data.records;
         this.total = response.data.total;
         this.loading = false
@@ -332,14 +284,7 @@ export default {
         })
       })
     },
-    //图片上传成功
-    handleImgUplaoded(imgUrl){
-      this.form.map = imgUrl;
-    },
-    //图片移除
-    handleImgRemoved(imgUrl){
-      this.form.map = null;
-    },
+
     // 取消按钮
     cancel() {
       this.open = false
@@ -355,8 +300,8 @@ export default {
         workareaName: null,
         workareaType: null,
         workshopId: null,
-
       }
+
       this.resetForm('form')
     },
     /** 搜索按钮操作 */
@@ -366,12 +311,19 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams={
+        current: 1,
+        size: 10,
+        workareaCode: null,
+        workareaName: null,
+        workareaType: null,
+      }
       this.resetForm('queryForm')
       this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.teamId)
+      this.ids = selection.map(item => item.workareaId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -385,7 +337,7 @@ export default {
     // 查询明细按钮操作
     handleView(row) {
       this.reset()
-      this.EditId = row.id || this.ids
+      this.EditId = row.workareaId || this.ids
       getWorkareaInfo(this.EditId).then(response => {
         this.form = response.data
         this.open = true
@@ -396,8 +348,10 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-     this.EditId = row.id || this.ids
+      this.EditId = row.workareaId || this.ids
+      console.log(row,'row')
       getWorkareaInfo(this.EditId).then(response => {
+        console.log(response,'获取单条工作区域数据')
         this.form = response.data
         this.open = true
         this.title = '修改工作区域信息'
@@ -426,8 +380,8 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const teamIds = row.id || this.ids
-      this.$modal.confirm('是否确认删除班组编号为"' + teamIds + '"的数据项？').then(function() {
+      const teamIds = row.workareaId || this.ids
+      this.$modal.confirm('是否确认删除工作区域编号为"' + teamIds + '"的数据项？').then(function() {
         return delWorkarea(teamIds)
       }).then(() => {
         this.getList()
@@ -435,22 +389,7 @@ export default {
       }).catch(() => {
       })
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('cal/team/export', {
-        ...this.queryParams
-      }, `team_${new Date().getTime()}.xlsx`)
-    },
-    //自动生成编码
-    handleAutoGenChange(autoGenFlag) {
-      if (autoGenFlag) {
-        genCode('CAL_TEAM_CODE').then(response => {
-          this.form.teamCode = response
-        })
-      } else {
-        this.form.teamCode = null
-      }
-    }
+
   }
 }
 </script>