From 8ac30411bb33e406e0ed5a2b6e2edaf7ab59f11f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 23 十一月 2024 17:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue |   97 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 70 insertions(+), 27 deletions(-)

diff --git a/admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue b/admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue
index 4d0089b..8674bad 100644
--- a/admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue
+++ b/admin/src/views/Inspection/components/OperaYwPatrolPointWindow.vue
@@ -1,22 +1,36 @@
 <template>
-  <GlobalWindow
-    :title="title"
-    :visible.sync="visible"
-    :confirm-working="isWorking"
-    @confirm="confirm"
-  >
+  <GlobalWindow :title="title" :visible.sync="visible" width="620px" :confirm-working="isWorking" @confirm="confirm">
     <el-form :model="form" ref="form" :rules="rules">
-      <el-form-item label="鍚嶇О" prop="name">
-        <el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" v-trim/>
+      <el-form-item label="宸℃鐐圭紪鐮�" prop="code">
+        <el-input v-model="form.code" placeholder="璇疯緭鍏ュ悕绉�" v-trim />
       </el-form-item>
-      <el-form-item label="鍥炬爣" prop="imgurl">
-        <el-input v-model="form.imgurl" placeholder="璇疯緭鍏ュ浘鏍�" v-trim/>
+      <el-form-item label="宸℃鐐瑰悕绉�" prop="name">
+        <el-input v-model="form.name" placeholder="璇疯緭鍏ュ贰妫�鐐瑰悕绉�" v-trim />
       </el-form-item>
-      <el-form-item label="鍖哄煙缂栫爜锛堝叧鑱攃ategory)" prop="areaId">
-        <el-input v-model="form.areaId" placeholder="璇疯緭鍏ュ尯鍩熺紪鐮侊紙鍏宠仈category)" v-trim/>
+      <el-form-item label="宸℃璁惧">
+        <el-select v-model="form.deviceId">
+          <el-option v-for="item in deviceList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="鍦板潃" prop="addr">
-        <el-input v-model="form.addr" placeholder="璇疯緭鍏ュ湴鍧�" v-trim/>
+      <el-form-item label="鎵�灞炲尯鍩�" prop="areaId">
+        <el-cascader v-model="form.areaIds" @change="changeSel" placeholder="璇烽�夋嫨宸℃鍖哄煙" clearable :options="cateList"
+          :props="{
+            label: 'name',
+            value: 'id',
+            children: 'childCategoryList',
+            checkStrictly: true
+          }"></el-cascader>
+      </el-form-item>
+      <el-form-item label="缁忕含搴�">
+
+      </el-form-item>
+      <el-form-item label="宸℃鍐呭" prop="content">
+        <el-input type="textarea" :rows="4" v-model="form.content" placeholder="璇疯緭鍏�" />
+      </el-form-item>
+      <el-form-item label="涓婁紶鍥剧墖" prop="imgurl">
+        <UploadAvatarImage :file="{ 'imgurlfull': form.imgurlfull, 'imgurl': form.imgurl }"
+          :uploadData="{ folder: 'projects' }" @uploadSuccess="uploadAvatarSuccess" @uploadEnd="isUploading = false"
+          @uploadBegin="isUploading = true" />
       </el-form-item>
     </el-form>
   </GlobalWindow>
@@ -25,38 +39,67 @@
 <script>
 import BaseOpera from '@/components/base/BaseOpera'
 import GlobalWindow from '@/components/common/GlobalWindow'
+import UploadAvatarImage from '@/components/common/UploadAvatarImage'
+import { fetchList } from '@/api/business/category'
 export default {
   name: 'OperaYwPatrolPointWindow',
   extends: BaseOpera,
-  components: { GlobalWindow },
-  data () {
+  components: { GlobalWindow, UploadAvatarImage },
+  data() {
     return {
       // 琛ㄥ崟鏁版嵁
       form: {
-        id: null,
-        creator: '',
-        createDate: '',
-        editor: '',
-        editDate: '',
-        isdeleted: '',
         name: '',
-        remark: '',
-        status: '',
-        sortnum: '',
+        code: '',
+        content: '',
         imgurl: '',
         areaId: '',
         addr: ''
       },
+      deviceList: [],
+      cateList: [],
       // 楠岃瘉瑙勫垯
       rules: {
-      }
+        name: [{ required: true, message: '璇疯緭鍏�' }],
+        code: [{ required: true, message: '璇疯緭鍏�' }],
+      },
+      isUploading: false,
     }
   },
-  created () {
+  created() {
     this.config({
       api: '/Inspection/ywPatrolPoint',
       'field.id': 'id'
     })
+  },
+  methods: {
+    initData() {
+      fetchList({
+        model: { type: 4 },
+        capacity: 1000,
+        page: 1,
+      }).then(res => {
+        this.cateList = res.records || []
+      })
+
+    },
+    changeSel(e) {
+      if (e && e.length == 1) {
+        this.$set(this.form, 'catePId', e[0])
+        this.$set(this.form, 'cateId', '')
+      } else if (e && e.length == 2) {
+        this.$set(this.form, 'catePId', e[0])
+        this.$set(this.form, 'cateId', e[1])
+      } else {
+        this.$set(this.form, 'catePId', '')
+        this.$set(this.form, 'cateId', '')
+      }
+      this.search()
+    },
+    uploadAvatarSuccess(file) {
+      this.form.imgurl = file.imgurl
+      this.form.imgurlfull = file.imgurlfull
+    },
   }
 }
 </script>

--
Gitblit v1.9.3