Merge branch 'master' of ssh://111.61.77.35:15/lizhichao/whp-xl

dcit-hcsystem-hcsystem-master/src/views/Enterprises/EnterprisesMgEdit.vue

@@ -82,18 +82,28 @@
             <el-form-item label="备注" prop="remarks">
                 <el-input type="textarea" v-model.number="editForm.remarks"></el-input>
             </el-form-item>
-            <el-form-item label="经度" prop="longitude">
+            <el-form-item label="经纬度" prop="longitude">
                 <el-row>
-                    <el-col :span="16">
+                    <el-col :span="8">
                         <el-input v-model.number="editForm.longitude"></el-input>
                     </el-col>
                     <el-col :span="8">
+                        <el-input v-model.number="editForm.latitude"></el-input>
+                    </el-col>
+                    <el-col :span="5">
                         <el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
                     </el-col>
                 </el-row>
             </el-form-item>
-            <el-form-item label="纬度" prop="latitude">
-                <el-input v-model="editForm.latitude"></el-input>
+            <el-form-item label="监管分类" prop="regulationBigType">
+                <el-select v-model="editForm.regulationBigType" placeholder="请选择" @change="seletChange" filterable>
+                    <el-option
+                            v-for="item in regulationTypeArr"
+                            :key="item.code"
+                            :label="item.typeName==null?'':item.typeName"
+                            :value="item.code.toString()"
+                    ></el-option>
+                </el-select>
             </el-form-item>
             <el-form-item label="绘制厂区边界">
                 <el-button type="primary" plain @click="MapdialogBFun">绘制</el-button> <span :class="editForm.boundary ? 'colorM' : 'colorR'">{{editForm.boundary ? '已绘制' : '未绘制'}}</span>
@@ -145,6 +155,7 @@ export default class EnterprisesMgEdit extends Vue {
     @Provide() editForm: any = {};
     @Provide() qvvalue: any = []; //区域值
     @Provide() signsArr: any = []; //图例list
+    @Provide() regulationTypeArr: any = [];
     @Provide() dialogTableVisible: Boolean = false;
     @Provide() rules: any = {
         accountStatus: [{
@@ -202,7 +213,8 @@ export default class EnterprisesMgEdit extends Vue {
                         latitude: that.editForm.latitude,
                         longitude: that.editForm.longitude,
                         remarks: that.editForm.remarks,
-                        boundary: that.editForm.boundary
+                        boundary: that.editForm.boundary,
+                        regulationBigType: that.editForm.regulationBigType
                     },
                     function (res: any) {
                         if (res.code == 0) {
@@ -260,6 +272,11 @@ export default class EnterprisesMgEdit extends Vue {
                     trigger: "blur,change",
                     message: "该项为必填项！"
                 }],
+                regulationBigType: [{
+                    required: true,
+                    trigger: "blur,change",
+                    message: "该项为必填项！"
+                }]
             }
         }
         if (v == 4) {
@@ -273,16 +290,42 @@ export default class EnterprisesMgEdit extends Vue {
                     required: true,
                     trigger: "blur",
                     message: "该项为必填项！"
+                }],
+                regulationBigType: [{
+                    required: true,
+                    trigger: "blur,change",
+                    message: "该项为必填项！"
                 }]
             }
         }
     }
+    //监管类型
+    getRegulationType() {
+        let that = this;
+        (that as any).$axios
+            .get(
+                `/regulationType/getRegulationTypeList?page=1&size=10000`
+            )
+            .then((res: any) => {
+                that.regulationTypeArr = res.data.pageData;
+            });
+    }
+    seletChange(code: any) {
+        let that = this,
+            arr;
+        arr = that.regulationTypeArr.filter((ele: any) => code == ele.code);
+    }
     created() {
         this.getDetail();
+        this.getRegulationType();
     }
 }
 </script>
 
 <style lang="scss">
 @import "@/utils/public.scss";
+.el-col {
+    margin-left: 0;
+    margin-right: 10px;
+}
 </style>

dcit-hcsystem-hcsystem-master/src/views/Plans/PlansMgEdit.vue

@@ -123,6 +123,7 @@ import { State, Getter, Mutation, Action } from "vuex-class";
 import City from "@/components/city.vue";
 import METHOD from "@/utils/methods";
 import ice from "@/utils/iceEditor-min.js";
+let uploadfile = require("@/assets/uploadfile.png");
 @Component({
   components: { City },
 })
@@ -157,6 +158,12 @@ export default class PlansMgEdit extends Vue {
     if (val.length > 0) {
       this.editForm.sourceFile = val[0].response.data.viewPath;
       this.editForm.fileOriginalName = val[0].response.data.originalName;
+
+      this.fileList = [];
+      this.fileList.push({
+        name: this.editForm.fileOriginalName,
+        url: uploadfile,
+      });
     } else {
       this.editForm.sourceFile = "";
       this.editForm.fileOriginalName = "";
@@ -272,7 +279,7 @@ export default class PlansMgEdit extends Vue {
         if (that.editForm.fileOriginalName) {
           that.fileList.push({
             name: that.editForm.fileOriginalName,
-            url: that.editForm.sourceFile,
+            url: uploadfile,
           });
         }
       });