智慧农业后台管理页面
53046c6c8c0bb6be4c8f083a55d7ec84b7c65afd..d0143638597b74b01dd2b04fb57cb0a689c20095
2022-09-06 guoshilong
Merge branch 'master' of http://192.168.0.105:10010/r/zhny_web
d01436 diff | tree
2022-09-06 guoshilong
修复切换农场后查询条件还是别的农场的页码
e9724c diff | tree
6 files modified
79 ■■■■ changed files
src/views/land/cs.vue 1 ●●●● patch | view | raw | blame | history
src/views/land/landAdd.vue 69 ●●●● patch | view | raw | blame | history
src/views/land/landUpdate.vue 2 ●●● patch | view | raw | blame | history
src/views/stock/stockmanage.vue 1 ●●●● patch | view | raw | blame | history
src/views/wel/land.vue 2 ●●● patch | view | raw | blame | history
vue.config.js 4 ●●●● patch | view | raw | blame | history
src/views/land/cs.vue
@@ -144,6 +144,7 @@
        '$farmId': {
            handler (newName, oldName) {
                // this.farm.id = newName
                this.page.currentPage = 1
                //地块页面
                setTimeout(() => {
                    this.onLoad()
src/views/land/landAdd.vue
@@ -1,23 +1,23 @@
<template>
    <el-dialog
        :title="title"
        :modal-append-to-body="false"
        :append-to-body="true"
        :close-on-click-modal="false"
        width="80%"
        :visible.sync="visible"
        top="10vh"
    >
        <avue-form ref="form" v-model="form" :option="option" @submit="submit">
            <!-- 地图插入 -->
            <template slot-scope="{ type, disabled }" slot="line">
                <!-- <getMapDataInThere ref="getMapData" id="getMapData" @setMapData="setMapData"></getMapDataInThere> -->
            </template>
        </avue-form>
        <div class="map">
            <iframe :src="url" frameborder="0" width="100%" height="100%"></iframe>
        </div>
    </el-dialog>
  <el-dialog
    :title="title"
    :modal-append-to-body="false"
    :append-to-body="true"
    :close-on-click-modal="false"
    width="60%"
    :visible.sync="visible"
    top="10vh"
  >
    <avue-form ref="form" v-model="form" :option="option" @submit="submit">
      <!-- 地图插入 -->
      <template slot-scope="{ type, disabled }" slot="line">
        <!-- <getMapDataInThere ref="getMapData" id="getMapData" @setMapData="setMapData"></getMapDataInThere> -->
      </template>
    </avue-form>
    <div class="map">
      <iframe :src="url" frameborder="0" width="100%" height="100%"></iframe>
    </div>
  </el-dialog>
</template>
<script>
@@ -294,24 +294,19 @@
                return
            }
            add(row).then(
                () => {
                    that.$emit("refreshOnLoad")
                    that.$refs.form.resetFields()
                    that.form.landUnit = "0"
                    that.visible = false
                    this.$message({
                        type: "success",
                        message: "操作成功!",
                    })
                    done()
                },
                (error) => {
                    // loading()
                    window.console.log(error)
                }
            )
        },
      add(row).then(() => {
          that.$emit("refreshOnLoad");
          that.$refs.form.resetFields();
          that.form.landUnit = "0";
          that.$parent.onLoad()
          that.visible = false;
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          done();
        })
      },
        setMapData (val) {
            this.LineData = val[0]
src/views/land/landUpdate.vue
@@ -4,7 +4,7 @@
    :modal-append-to-body="false"
    :append-to-body="true"
    :close-on-click-modal="false"
    width="80%"
    width="60%"
    top="10vh"
    :visible.sync="visible"
  >
src/views/stock/stockmanage.vue
@@ -734,6 +734,7 @@
  watch: {
      '$farmId':{
      handler (newName, oldName) {
          this.page.currentPage = 1
          this.farm.id = newName
          //地块页面
          this.onLoad(this.page)
src/views/wel/land.vue
@@ -4,7 +4,7 @@
    :modal-append-to-body="false"
    :append-to-body="true"
    :close-on-click-modal="false"
    width="80%"
    width="60%"
    top="10vh"
    :visible.sync="visible"
  >
vue.config.js
@@ -45,9 +45,9 @@
        proxy: {
            '/api': {
                //本地服务接口地址
                // target: 'http://192.168.0.207:89',
                target: 'http://192.168.0.207:89',
                //远程演示服务地址,可用于直接启动项目
                target: 'http://182.106.212.58:8020/api',
                // target: 'http://182.106.212.58:8013/api',
                ws: true,
                pathRewrite: {
                    '^/api': '/'