From e4099fd591269156f1bbfd8a2d3936549f6e0a42 Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Mon, 22 May 2023 15:09:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8D=E5=8D=95=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  3 +-
 .../components/companyDataDialog.vue          | 28 ++++++++++++++++++-
 .../safeIndex/components/indexmassageOne.vue  |  5 ++--
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 030db14..b04d4c8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,7 +4,8 @@ import vm from "../main";
 import { getToken } from '@/utils/auth'
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const request = axios.create({
-  baseURL: 'http://172.18.113.50:8080/zhapi',
+  //baseURL: 'http://172.18.113.50:8080/zhapi',
+  baseURL: 'http://192.168.0.188:8888/zhapi',
   //baseURL: `http://${window.location.host}/zhapi`,
   timeout: 50000,
   headers: { 'content-type': 'application/json' },
diff --git a/src/views/systemManagement/companyList/components/companyDataDialog.vue b/src/views/systemManagement/companyList/components/companyDataDialog.vue
index 88ae0af..9611b10 100644
--- a/src/views/systemManagement/companyList/components/companyDataDialog.vue
+++ b/src/views/systemManagement/companyList/components/companyDataDialog.vue
@@ -15,6 +15,7 @@
           <el-form
             ref="commerceMessage_form"
             :model="form"
+            :rules="rules"
             class="commerceMessage_form"
           >
             <el-form-item label="企业名称" prop="companyName">
@@ -69,6 +70,7 @@
         <el-form
           ref="commerceMessage_form_two"
           :model="form"
+          :rules="rules"
           class="commerceMessage_form_two"
         >
           <el-form-item label="企业登记注册地" prop="registerAddress">
@@ -112,6 +114,7 @@
         <el-form
           ref="company_position_form"
           :model="form"
+          :rules="rules"
           class="company_position_form"
         >
           <el-form-item label="省份名称" prop="provinceName">
@@ -312,6 +315,29 @@ export default {
       upheaders: {
         Authorization: localStorage.getItem("AuthorizationToken"),
       },
+      rules:{
+        companyName: [
+          { required: true, message: "请选择企业", trigger: "change" },
+        ],
+        companyTypes:[
+          { type: 'array', required: true, message: '请至少选择一个企业类型', trigger: 'change' }
+        ],
+        provinceName:[
+          { required: true, message: "请选择省份名称", trigger: "change" },
+        ],
+        cityName:[
+          { required: true, message: "请选择城市名称", trigger: "change" },
+        ],
+        areaName:[
+          { required: true, message: "请选择区县名称", trigger: "change" },
+        ],
+        blockName:[
+          { required: true, message: "请选择街道/乡镇名称", trigger: "change" },
+        ],
+        streetName:[
+          { required: true, message: "请选择社区/村名称", trigger: "change" },
+        ],
+      }
     };
   },
   created() {
@@ -361,7 +387,7 @@ export default {
         Object.assign(this.form, newForm);
       } else if (num === 3) {
         this.dialogTitle = "编辑";
-        console.log("item", item);
+        console.log("item123", item);
         this.imageUrl = item.picUrl;
         this.form = Object.assign(this.form, item);
       }
diff --git a/src/views/systemManagement/safeIndex/components/indexmassageOne.vue b/src/views/systemManagement/safeIndex/components/indexmassageOne.vue
index bbf9e0b..17b5c24 100644
--- a/src/views/systemManagement/safeIndex/components/indexmassageOne.vue
+++ b/src/views/systemManagement/safeIndex/components/indexmassageOne.vue
@@ -21,7 +21,7 @@
           <label slot="label"
             >+&nbsp;&nbsp;&nbsp;{{ item.indexName }}&nbsp;&nbsp;&nbsp;×</label
           >
-          <el-input v-model="item.rate"></el-input>
+          <el-input v-model="item.rate" oninput="value=value.replace(/^0+/,0)"></el-input>
         </el-form-item>
       </el-form>
       <!-- 编辑表单 -->
@@ -34,7 +34,7 @@
           <label slot="label"
             >+&nbsp;&nbsp;&nbsp;{{ item.indexName }}&nbsp;&nbsp;&nbsp;×</label
           >
-          <el-input v-model="item.rate"></el-input>
+          <el-input v-model="item.rate" oninput="value=value.replace(/^0+/,0)"></el-input>
         </el-form-item>
       </el-form>
       <div v-if="btn_flag" class="massage_btn">
@@ -148,6 +148,7 @@ export default {
           // console.log('this.all_data.toFixed(2)',this.all_data.toFixed(2)); 防止精度缺失
         }
       }
+      
       if (isNaN(this.all_data) || this.all_data.toFixed(2) != 1) {
         this.$message.warning("保存失败,各指标占比应大于等于0且总和应等于1");
       } else {
-- 
2.36.3