Revert "中图20240924下午版本更新"

This reverts commit be63d59ca50611639ce3ad3a15933784559e97c2.

src/api/zt/ztApi.js

@@ -7,6 +7,7 @@ import { Notification, MessageBox, Message, Loading } from "element-ui";
 import { saveAs } from "file-saver";
 import { getToken } from "@/utils/auth";
 axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
+
 // 是否显示重新登录
 export let isReloginShow = false;
 // 创建axios实例
@@ -528,14 +529,14 @@ export function getCqBcbzList(query) {
 // 拆迁 补偿标准 getbyid
 export function getCqBcbzById(id) {
   return request({
-    url: "/model/cqbczd/" + id,
+    url: "/model/cqbcbz/" + id,
     method: "get",
   });
 }
 //添加 拆迁 补偿标准 add
 export function addCqBcbz(data) {
   return request({
-    url: "/model/cqbczd",
+    url: "/model/cqbcbz",
     method: "post",
     data: data,
   });
@@ -543,15 +544,15 @@ export function addCqBcbz(data) {
 // 更新 拆迁 补偿标准 update
 export function updateCqBcbz(data) {
   return request({
-    url: "/model/cqbczd",
-    method: "put",
+    url: "/model/cqbcbz",
+    method: "post",
     data: data,
   });
 }
 // 删除 拆迁 补偿标准 delbyid
-export function delCqBcbz(ids) {
+export function delCqBcbz(id) {
   return request({
-    url: "/model/cqbczd/" + ids,
+    url: "/model/cqbcbz/" + id,
     method: "delete",
   });
 }
@@ -587,9 +588,9 @@ export function updateCqBcbzItem(data) {
   });
 }
 // 删除 拆迁 补偿标准项 delbyid
-export function delCqBcbzItem(ids) {
+export function delCqBcbzItem(id) {
   return request({
-    url: "/model/cqbcbzitem/" + ids,
+    url: "/model/cqbcbzitem/" + id,
     method: "delete",
   });
 }

src/views/ConstructionApplication3D/Demolition/CQSetInfo.vue

@@ -53,7 +53,7 @@
       <el-button type="primary" @click="saveAs()">另存为</el-button>
       <el-button type="primary" @click="reset()">重置</el-button>
     </el-row>
-    <el-dialog title="标准名称设置" :modal="false" :visible.sync="dialogFormVisible" append-to-body="true" width="20rem">
+    <el-dialog title="标准名称设置" :modal="false" :visible.sync="dialogFormVisible" modal-append-to-body>
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm">
         <el-form-item label="名称" prop="name">
           <el-input v-model="ruleForm.name" autocomplete="off"></el-input>
@@ -65,7 +65,7 @@
       </div>
     </el-dialog>
     <el-dialog title="编辑" :modal="false" :visible.sync="editFormVisible" append-to-body="true" width="20rem">
-      <el-form :model="oldRow" :rules="rowRules" ref="rowForm">
+      <el-form :model="oldRow" :rules="rules" ref="oldRow">
         <el-form-item label="房屋结构" prop="jg">
           <el-select v-model="oldRow.jg">
             <el-option label="框架结构" value="框架结构"></el-option>
@@ -76,10 +76,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="房屋等级" prop="grade">
-          <el-input v-model.number="oldRow.grade" type="number" min="1" max="5"></el-input>
+          <el-input v-model="oldRow.grade" type="number" min="1" max="5" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="单价(元/平方米)" prop="bz">
-          <el-input v-model.number="oldRow.bz" type="number" min="0" max="10000000000"></el-input>
+          <el-input type="number" min="0" max="100000000" v-model="oldRow.bz" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="规格" prop="des">
           <el-input type="textarea" :rows="4" v-model="oldRow.des" autocomplete="off"></el-input>
@@ -95,20 +95,12 @@
 <script>
 import {
   getCqBcbzList, getCqBcbzItemList,
-  addCqBcbz, updateCqBcbz, updateCqBcbzItem, delCqBcbzItem
+  addCqBcbz, updateCqBcbz, addCqBcbzItem, updateCqBcbzItem, delCqBcbzItem
 } from "@/api/zt/ztApi.js";
 export default {
   props: ["cqValue"],
   name: "ZDShowInfo",
   data() {
-    var bzValidate = (rule, value, callback) => {
-      if (value == "" || value == null)
-        callback(new Error("不能为空"))
-      else if (value < 0) {
-        callback(new Error("不能小于0"))
-      }
-      else callback()
-    };
     return {
       editFormVisible: false,
       dialogFormVisible: false,
@@ -118,36 +110,31 @@ export default {
       rules: {
         name: [
           { required: true, message: "请输入名称", trigger: "blur" },
-
           // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
       },
-      rulesEdit: {
-        grade: [
-          { validate: bzValidate, trigger: 'blur' }
-        ],
-        bz: [
-          { validate: bzValidate, trigger: 'blur' }
-        ],
-      },
-
       // rowForm: {
       //     JG: "框架结构",
       //     GRADE: 1,
       //     BZ: 1350,
       //     DES: ''
       // },
-
       rowRules: {
-
+        jg: [
+          { required: true, message: "请选择结构", trigger: "blur" },
+          // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        ],
         grade: [
-          // { required: true, message: "不能为空", trigger: "blur" },
-          { type: 'number', min: 1, max: 5, message: "范围1-5之间", trigger: 'blur' }
+          { required: true, message: "请选择等级", trigger: "blur" },
+          // { min: 1, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
         bz: [
-          // { required: true, message: "不能为空", trigger: "blur" },
-          //　/^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/
-          { type: 'number', min: 0, max: 10000000000, message: "不能小于0", trigger: 'blur' }
+          { required: true, message: "请输入名称", trigger: "blur" },
+          // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        ],
+        des: [
+          { required: true, message: "请输入规划", trigger: "blur" },
+          // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
       },
       /**
@@ -274,7 +261,7 @@ export default {
      */
     initForm() {
       debugger;
-
+      console.log(this.cqValue);
       // if (this.cqValue && this.cqValue != "") {
       //   this.bcbz = this.cqValue;
       //   var item = this.bcbzList.find((t) => t.value == this.bcbz);
@@ -355,6 +342,8 @@ export default {
         that.$layer.alert("请选择补偿标准");
         return;
       }
+
+      debugger;
       if (window.isUseDB) {
         var item = {
           id: that.curBCBZ.id,
@@ -405,17 +394,17 @@ export default {
     saveData() {
       debugger;
       var val = (window.ZSBC.CQBCList.length + 1).toString();
-      var that = this;
+      var that=this;
       var newBCBZ = {
-        id: val,
-        name: that.ruleForm.name,
-        bcbz: that.curBCBZ.bcbz,
-      };
+          id: val,
+          name: that.ruleForm.name,
+          bcbz: that.curBCBZ.bcbz,
+        };
       if (window.isUseDB) {
-        addCqBcbz(newBCBZ).then((res) => {
-          if (res)
-            that.$layer.alert("保存完成");
-        }).catch((err) => {
+        addCqBcbz(newBCBZ).then((res)=>{
+          if(res)
+          that.$layer.alert("保存完成");
+        }).catch((err)=>{
           console.log(err)
         })
       }
@@ -430,23 +419,16 @@ export default {
      */
     handleClick(row) {
       debugger
-
       this.oldRow = row;
       this.editFormVisible = true;
     },
     handleDeleteClick(row) {
-      var that = this;
       if (row == undefined)
         return;
-      var index = that.curBCBZ.bcbz.findIndex(t => t.id = row.id)
-      var formId = that.$layer.confirm("确定要删除吗？", {}, function () {
+      this.$layer.confirm("确定要删除吗？", {}, function () {
         delCqBcbzItem([row.id]).then((res) => {
-          if (res) {
-            that.$message("数据已删除!");
-            if (index > -1)
-              that.curBCBZ.bcbz.splice(index, 1)
-            that.$layer.close(formId)
-          }
+          if (res)
+            this.$layer.alert("数据已删除!");
         }).catch((err) => {
           console.log(err)
         })
@@ -463,27 +445,9 @@ export default {
     handleSetFoucsSetData(row) {
       this.oldRow = row;
     },
-    submitEditForm(formName) {
-      // if (!this.chageBCBZ())
-      //   return false;
-      // else {
-      console.log(this.oldRow.bz)
-      console.log(this.oldRow.grade)
-      this.$refs[formName].validate((valid) => {
-
-        if (valid) {
-          // alert('submit!');
-          this.editFormVisible = false;
-          this.updateItem();
-          // this.$layer.alert("保存完成");
-          return true
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      })
-
-      // }
+    submitEditForm() {
+      this.editFormVisible = false;
+      this.updateItem()
     },
     /**
      * 
@@ -515,18 +479,6 @@ export default {
     saveHandleClick(row) {
       row.seen = false;
     },
-    chageBCBZ() {
-      if (this.oldRow.grade < 1) {
-        this.$message.warning('不能小于1')
-        return false
-      }
-      if (this.oldRow.bz < 0) {
-        this.$message.warning('不能小于0')
-        return false
-      }
-
-      return true;
-    }
   },
 };
 </script>

src/views/ConstructionApplication3D/Demolition/QMSetInfo.vue

@@ -12,23 +12,21 @@
 
     <el-row>
       <el-col :span="6">农作物补偿：</el-col>
-      <el-col :span="16"><el-input style="width: 100%" type="number" min="0" placeholder="请输入" v-model="curBCBZ.nzw"
-          @change="changeBCBZ" @input="inputChange"> </el-input>
+      <el-col :span="16"><el-input style="width: 100%" type="number" placeholder="请输入"
+          v-model="curBCBZ.nzw"></el-input>
       </el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
     <el-row>
       <el-col :span="6">经济作物：</el-col>
       <el-col :span="16">
-        <el-input style="width: 100%" placeholder="请输入" type="number" min="0" v-model="curBCBZ.jjzw"
-          @change="changeBCBZ" @input="inputChange"></el-input></el-col>
+        <el-input style="width: 100%" placeholder="请输入" type="number" v-model="curBCBZ.jjzw"></el-input></el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
     <el-row>
       <el-col :span="6">树木补偿：</el-col>
       <el-col :span="16">
-        <el-input style="width: 100%" placeholder="请输入" type="number" min="0" v-model="curBCBZ.sm"
-          @change="changeBCBZ" @input="inputChange"></el-input></el-col>
+        <el-input style="width: 100%" placeholder="请输入" type="number" v-model="curBCBZ.sm"></el-input></el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
     <el-row justify="center" type="flex">
@@ -145,13 +143,10 @@ export default {
      * 保存修改
      */
     save() {
-
       if (this.bcbz == "") {
         this.$layer.alert("请选择补偿标准");
         return;
       }
-      if (!this.changeBCBZ())
-        return;
       debugger;
       var model = {
         "id": this.curBCBZ.id,
@@ -161,6 +156,7 @@ export default {
         "sm": this.curBCBZ.sm,
       }
       if (window.isUseDB) {//数据库
+
         updateQmbcbz(model).then((response) => {
           if (response.code == 200) {
             this.$layer.alert("保存完成");
@@ -182,12 +178,9 @@ export default {
      * 另存为
      */
     saveAs() {
-      if (!this.changeBCBZ())
-        return ;
       this.dialogFormVisible = true;
     },
     submitForm(formName) {
-
       this.$refs[formName].validate((valid) => {
         if (valid) {
           // alert('submit!');
@@ -199,7 +192,6 @@ export default {
           return false;
         }
       });
-
     },
     /**
      * 另存数据
@@ -232,25 +224,6 @@ export default {
         this.curBCBZ = this.bcbzList.find(t => t.id == this.bcbz);
       }
     },
-    changeBCBZ() {
-      if (this.curBCBZ.sm < 0) {
-        this.$message.warning("输入数值不能小于0")
-        return false;
-      }
-      if (this.curBCBZ.jjzw < 0) {
-        this.$message.warning("输入数值不能小于0")
-        return false;
-      }
-      if (this.curBCBZ.nzw < 0) {
-        this.$message.warning("输入数值不能小于0")
-        return false;
-      }
-      return true;
-    },
-    inputChange(){
-      this.changeBCBZ()
-    }
-    
   }
 };
 </script>

src/views/ConstructionApplication3D/Demolition/ZDSetInfo.vue

@@ -14,8 +14,8 @@
     </el-row>
     <el-row>
       <el-col :span="6">土地年产值：</el-col>
-      <el-col :span="16"><el-input style="width: 100%" type="number" min="0" placeholder="请输入"
-          v-model.number="curBCBZ.tdcz" @change="changeZDBZ"  @input="inputChange"></el-input>
+      <el-col :span="16"><el-input style="width: 100%" type="number" placeholder="请输入" v-model="curBCBZ.tdcz"
+          @change="changeZDBZ"></el-input>
       </el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
@@ -25,13 +25,13 @@
     </el-row>
     <el-row>
       <el-col :span="6">综合补偿倍数：</el-col>
-      <el-col :span="16"><el-input style="width: 100%" type="number" min="0" placeholder="请输入"
-          v-model.number="curBCBZ.tdbcbs" @change="changeZDBZ" @input="inputChange"></el-input></el-col>
+      <el-col :span="16"><el-input style="width: 100%" type="number" placeholder="请输入" v-model="curBCBZ.tdbcbs"
+          @change="changeZDBZ"></el-input></el-col>
     </el-row>
     <el-row>
       <el-col :span="6">土地补偿费：</el-col>
       <el-col :span="16">
-        <el-input placeholder="自动计算" readonly type="number" v-model.number="curBCBZ.tdbcf"></el-input></el-col>
+        <el-input placeholder="自动计算" readonly type="number" v-model="curBCBZ.tdbcf"></el-input></el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
     <el-row class="subtitle">
@@ -40,13 +40,12 @@
     </el-row>
     <el-row>
       <el-col :span="6">综合补偿倍数</el-col>
-      <el-col :span="16"><el-input type="number" min="0" style="width: 100%" placeholder="请输入" v-model="curBCBZ.azbcbs"
-          @change="changeZDBZ"  @input="inputChange"></el-input></el-col>
+      <el-col :span="16"><el-input type="number" style="width: 100%" placeholder="请输入" v-model="curBCBZ.azbcbs"
+          @change="changeZDBZ"></el-input></el-col>
     </el-row>
     <el-row>
       <el-col :span="6">安置补偿费：</el-col>
-      <el-col :span="16"><el-input v-model.number="curBCBZ.azbcf" readonly type="number"
-          placeholder="自动计算"></el-input></el-col>
+      <el-col :span="16"><el-input v-model="curBCBZ.azbcf" readonly type="number" placeholder="自动计算"></el-input></el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
     <el-row class="subtitle">
@@ -55,8 +54,7 @@
     </el-row>
     <el-row>
       <el-col :span="6">征地补偿合计：</el-col>
-      <el-col :span="16"><el-input v-model.number="curBCBZ.bchj" readonly type="number"
-          placeholder="自动计算"></el-input></el-col>
+      <el-col :span="16"><el-input v-model="curBCBZ.bchj" readonly type="number" placeholder="自动计算"></el-input></el-col>
       <el-col :span="2">元/亩</el-col>
     </el-row>
     <el-row justify="center" type="flex">
@@ -86,7 +84,6 @@ export default {
   props: ["zdValue"],
   name: "ZDShowInfo",
   data() {
-
     return {
       dialogFormVisible: false,
       ruleForm: {
@@ -185,25 +182,12 @@ export default {
      * 选择标准改变
      */
     changeZDBZ() {
-      if (this.curBCBZ.tdcz < 0) {
-        this.$message.warning("输入数值不能小于0")
-        return false;
-      }
-      if (this.curBCBZ.tdbcbs < 0) {
-        this.$message.warning("输入数值不能小于0")
-        return false;
-      }
-      if (this.curBCBZ.azbcbs < 0) {
-        this.$message.warning("输入数值不能小于0")
-        return false;
-      }
       this.curBCBZ.tdbcf =
-        parseFloat( this.curBCBZ.tdcz) *  parseFloat(this.curBCBZ.tdbcbs);
+        this.curBCBZ.tdcz * this.curBCBZ.tdbcbs;
       this.curBCBZ.azbcf =
-      parseFloat(this.curBCBZ.tdcz) * parseFloat( this.curBCBZ.azbcbs);
+        this.curBCBZ.tdcz * this.curBCBZ.azbcbs;
       this.curBCBZ.bchj =
-      parseFloat(this.curBCBZ.tdbcf) +  parseFloat(this.curBCBZ.azbcf);
-      return true;
+        this.curBCBZ.tdbcf + this.curBCBZ.azbcf;
     },
     /**
      * 重置
@@ -215,41 +199,39 @@ export default {
      * 保存修改
      */
     save() {
-      var that = this;
-      if (that.bcbz == "") {
-        that.$layer.alert("请选择补偿标准");
+      if (this.bcbz == "") {
+        this.$layer.alert("请选择补偿标准");
         return;
       }
-      if (!that.changeZDBZ())
-        return;
       debugger;
       if (window.isUseDB) {
         var Model =
         {
-          "azbcbs": that.curBCBZ.azbcbs,
-          "azbcf": that.curBCBZ.azbcf,
-          "bchj": that.curBCBZ.bchj,
-          "id": that.curBCBZ.id,
-          "name": that.curBCBZ.name,
-          "tbcz": that.curBCBZ.tbcz,
-          "tdbcbs": that.curBCBZ.tdbcbs,
-          "tdbcf": that.curBCBZ.tdbcf,
+          "azbcbs": this.curBCBZ.azbcbs,
+          "azbcf": this.curBCBZ.azbcf,
+          "bchj": this.curBCBZ.bchj,
+          "id": this.curBCBZ.id,
+          "name": this.curBCBZ.name,
+          "tbcz": this.curBCBZ.tbcz,
+          "tdbcbs": this.curBCBZ.tdbcbs,
+          "tdbcf": this.curBCBZ.tdbcf,
         };
         updateZdBcbz(Model).then((response) => {
+
           if (response && response.code == 200) {
-            that.$layer.alert("保存完成");
+            this.$layer.alert("保存完成");
             that.getInitData();
           }
-
+         
         }).catch((err) => {
           console.log(err)
         });
       }
       else {
-        var index = window.ZSBC.ZDBCList.findIndex((t) => t.value == that.bcbz);
+        var index = window.ZSBC.ZDBCList.findIndex((t) => t.value == this.bcbz);
         if (index > -1) {
-          window.ZSBC.ZDBCList[index] = that.curBCBZ;
-          that.$layer.alert("保存完成");
+          window.ZSBC.ZDBCList[index] = this.curBCBZ;
+          this.$layer.alert("保存完成");
         }
       }
     },
@@ -257,28 +239,21 @@ export default {
      * 另存为
      */
     saveAs() {
-      if (!this.changeZDBZ())
-        return
+
       this.dialogFormVisible = true;
     },
     submitForm(formName) {
-      var that = this;
-      if (!that.changeZDBZ())
-        return false;
-      else {
-        that.$refs[formName].validate((valid) => {
-          if (valid) {
-            // alert('submit!');
-            that.dialogFormVisible = false;
-            that.saveData();
-            // this.$layer.alert("保存完成");
-          } else {
-            console.log("error submit!!");
-            return false;
-          }
-        });
-
-      }
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          // alert('submit!');
+          this.dialogFormVisible = false;
+          this.saveData();
+          // this.$layer.alert("保存完成");
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
     },
     /**
      * 另存数据
@@ -286,7 +261,7 @@ export default {
     saveData() {
       debugger;
       var val = (window.ZSBC.ZDBCList.length + 1)
-      var that = this
+      var that=this;
       var newBCBZ =
       {
         "azbcbs": that.curBCBZ.azbcbs,
@@ -294,7 +269,7 @@ export default {
         "bchj": that.curBCBZ.bchj,
         "id": val,
         "name": that.ruleForm.name,
-        "tdcz": that.curBCBZ.tdcz,
+        "tbcz": that.curBCBZ.tbcz,
         "tdbcbs": that.curBCBZ.tdbcbs,
         "tdbcf": that.curBCBZ.tdbcf,
       };
@@ -317,10 +292,6 @@ export default {
       }
 
     },
-    inputChange()
-    {
-      this.changeZDBZ();
-    }
   },
 };
 </script>

src/views/ConstructionApplication3D/billboard/billboardCheckList.vue

@@ -170,7 +170,7 @@ export default {
      * @param {*} row
      */
     check(row) {
-      // this.locationClick(row);
+      this.locationClick(row);
       if (this.deltailLayerId != null) this.$layer.close(this.deltailLayerId);
       var width = 400;