Browse Source

一网通办/气象信息管理/摄像头未覆盖区域/大事记

刘浩男 1 year ago
parent
commit
850d2be084

+ 5 - 5
data-ui/src/views/data/basicdata/carrepair/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"  @submit.native.prevent>
-      <el-form-item label="维修车牌号" prop="licenseNum" label-width="80px">
+      <el-form-item label="维修车牌号" prop="licenseNum" >
         <el-input
           v-model="queryParams.licenseNum"
           placeholder="请输入维修车牌号"
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="维修时间" prop="repairTime" label-width="80px">
+      <el-form-item label="维修时间" prop="repairTime" >
         <el-date-picker clearable
                         v-model="queryParams.repairTime"
                         type="date"
@@ -17,7 +17,7 @@
                         placeholder="请选择维修时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="负责人" prop="charger" label-width="80px">
+      <el-form-item label="负责人" prop="charger" >
         <el-input
           v-model="queryParams.charger"
           placeholder="请输入负责人"
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item prop="deptId" label-width="100px" >
+      <el-form-item prop="deptId" >
         <template slot="label">
           <span @click="changeQueryType" v-if="queryParams.deptName === 0">本级及下级</span>
           <span @click="changeQueryType" v-if="queryParams.deptName === 1">只查询本级</span>
@@ -110,7 +110,7 @@
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="修改人" align="center" prop="updateName"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" >
         <template slot-scope="scope">
           <el-button
             size="mini"

+ 1 - 1
data-ui/src/views/data/digitalagriculture/sowingSchedule/index.vue

@@ -102,7 +102,7 @@
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="修改人" align="center" prop="updateName" />
       <el-table-column label="修改时间" align="center" prop="updateTime" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"  fixed="right">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"  fixed="right" width="120px">
         <template slot-scope="scope">
           <el-button
             size="mini"

+ 3 - 0
data-ui/src/views/data/digitalforest/gridLevel/index.vue

@@ -460,6 +460,9 @@ export default {
       if(this.queryParams.forestGridLevel != null && this.queryParams.forestGridLevel != "") {
         this.queryParams.initParentId = null;
       }
+      if(this.queryParams.deptId != null && this.queryParams.deptId != "") {
+        this.queryParams.initParentId = null;
+      }
       this.getList()
     },
     /** 重置按钮操作 */

+ 1 - 1
data-ui/src/views/data/digitalwater/task/index.vue

@@ -153,7 +153,7 @@
                       placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'"/>
         </el-form-item>
         <el-form-item label="任务轨迹" prop="patrolTrajectory" @dblclick.native="showMapTwo">
-          <el-input v-model="form.patrolTrajectory" placeholder="鼠标双击选择任务轨迹" disabled maxlength="32"/>
+          <el-input v-model="form.patrolTrajectory" placeholder="鼠标双击选择任务轨迹" readonly maxlength="32"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

+ 10 - 0
data-ui/src/views/data/generalbusiness/camera/index.vue

@@ -9,6 +9,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="部门名称" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入部门名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -165,6 +174,7 @@ import ISuperMap from "@/views/data/common/ISuperMapArearAndCameras.vue";
           createName: null,
           updateName: null,
           name: null,
+          deptName:null
         },
         // 表单参数
         form: {},

+ 395 - 371
data-ui/src/views/data/generalbusiness/greatdeeds/index.vue

@@ -1,387 +1,411 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-                       <!-- <el-form-item label="创建人姓名" prop="createName">
-                            <el-input
-                                    v-model="queryParams.createName"
-                                    placeholder="请输入创建人姓名"
-                                    clearable
-                                    size="small"
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>-->
-                       <!-- <el-form-item label="更新人姓名" prop="updateName">
-                            <el-input
-                                    v-model="queryParams.updateName"
-                                    placeholder="请输入更新人姓名"
-                                    clearable
-                                    size="small"
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>-->
-                        <!--<el-form-item label="数据所属部门(政或党的id)" prop="deptId">
-                            <el-input
-                                    v-model="queryParams.deptId"
-                                    placeholder="请输入数据所属部门(政或党的id)"
-                                    clearable
-                                    size="small"
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>
-                        <el-form-item label="${comment}" prop="deptName">
-                            <el-input
-                                    v-model="queryParams.deptName"
-                                    placeholder="请输入${comment}"
-                                    clearable
-                                    size="small"
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>-->
-                        <el-form-item label="标题" prop="name">
-                            <el-input
-                                    v-model="queryParams.name"
-                                    placeholder="请输入标题"
-                                    clearable
-                                    size="small"
-                                    @keyup.enter.native="handleQuery"
-                            />
-                        </el-form-item>
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-        </el-form>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"
+             @submit.native.prevent>
+      <!-- <el-form-item label="创建人姓名" prop="createName">
+           <el-input
+                   v-model="queryParams.createName"
+                   placeholder="请输入创建人姓名"
+                   clearable
+                   size="small"
+                   @keyup.enter.native="handleQuery"
+           />
+       </el-form-item>-->
+      <!-- <el-form-item label="更新人姓名" prop="updateName">
+           <el-input
+                   v-model="queryParams.updateName"
+                   placeholder="请输入更新人姓名"
+                   clearable
+                   size="small"
+                   @keyup.enter.native="handleQuery"
+           />
+       </el-form-item>-->
+      <!--<el-form-item label="数据所属部门(政或党的id)" prop="deptId">
+          <el-input
+                  v-model="queryParams.deptId"
+                  placeholder="请输入数据所属部门(政或党的id)"
+                  clearable
+                  size="small"
+                  @keyup.enter.native="handleQuery"
+          />
+      </el-form-item>
+      <el-form-item label="${comment}" prop="deptName">
+          <el-input
+                  v-model="queryParams.deptName"
+                  placeholder="请输入${comment}"
+                  clearable
+                  size="small"
+                  @keyup.enter.native="handleQuery"
+          />
+      </el-form-item>-->
+      <el-form-item label="标题" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门名称" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入部门名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button
-                        type="primary"
-                        plain
-                        icon="el-icon-plus"
-                        size="mini"
-                        @click="handleAdd"
-                        v-hasPermi="['generalbusiness:greatdeeds:add']"
-                >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                        type="success"
-                        plain
-                        icon="el-icon-edit"
-                        size="mini"
-                        :disabled="single"
-                        @click="handleUpdate"
-                        v-hasPermi="['generalbusiness:greatdeeds:edit']"
-                >修改</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                        type="danger"
-                        plain
-                        icon="el-icon-delete"
-                        size="mini"
-                        :disabled="multiple"
-                        @click="handleDelete"
-                        v-hasPermi="['generalbusiness:greatdeeds:remove']"
-                >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                        type="warning"
-                        plain
-                        icon="el-icon-download"
-                        size="mini"
-                        @click="handleExport"
-                        v-hasPermi="['generalbusiness:greatdeeds:export']"
-                >导出</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['generalbusiness:greatdeeds:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['generalbusiness:greatdeeds:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['generalbusiness:greatdeeds:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['generalbusiness:greatdeeds:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-        <el-table v-loading="loading" :data="greatdeedsList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-                    <el-table-column label="标题" align="center" prop="name" />
+    <el-table v-loading="loading" :data="greatdeedsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="标题" align="center" prop="name"/>
 
-                    <el-table-column label="所属部门" align="center" prop="deptName" @select="hx"/>
-                   <!-- <el-table-column label="日期" align="center" prop="time" />-->
-                    <el-table-column label="日期" align="center" prop="time" width="180">
-                      <template slot-scope="scope">
-                        <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="内容" align="center" prop="content" />
-                    <el-table-column label="创建人" align="center" prop="createName"/>
-                    <el-table-column label="创建时间" align="center" prop="createTime"/>
-                    <el-table-column label="修改人" align="center" prop="updateName"/>
-                    <el-table-column label="修改时间" align="center" prop="updateTime"/>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                    <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-edit"
-                            @click="handleUpdate(scope.row)"
-                            v-hasPermi="['generalbusiness:greatdeeds:edit']"
-                    >修改</el-button>
-                    <el-button
-                            size="mini"
-                            type="text"
-                            icon="el-icon-delete"
-                            @click="handleDelete(scope.row)"
-                            v-hasPermi="['generalbusiness:greatdeeds:remove']"
-                    >删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
+      <el-table-column label="所属部门" align="center" prop="deptName" @select="hx"/>
+      <!-- <el-table-column label="日期" align="center" prop="time" />-->
+      <el-table-column label="日期" align="center" prop="time" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="内容" align="center" prop="content"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['generalbusiness:greatdeeds:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['generalbusiness:greatdeeds:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
-        <pagination
-                v-show="total>0"
-                :total="total"
-                :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize"
-                @pagination="getList"
-        />
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-        <!-- 添加或修改大事迹对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="500px" class="form-style">
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-                               <!-- <el-form-item label="创建人姓名" prop="createName">
-                                    <el-input v-model="form.createName" placeholder="请输入创建人姓名" />
-                                </el-form-item>
-                                <el-form-item label="更新人姓名" prop="updateName">
-                                    <el-input v-model="form.updateName" placeholder="请输入更新人姓名" />
-                                </el-form-item>-->
-                               <!-- <el-form-item label="数据所属部门(政或党的id)" prop="deptId">
-                                    <el-input v-model="form.deptId" placeholder="请输入数据所属部门(政或党的id)" />
-                                </el-form-item>-->
-                                  <!--<el-form-item label="所属部门" prop="deptId">
-                                    <deptselector :setValue=setDataDeptId :dataDeptId="form.deptId"></deptselector>
-                                  </el-form-item>-->
-                                <el-form-item label="标题" prop="name">
-                                  <el-input v-model="form.name" placeholder="请输入标题" maxlength="255"/>
-                                </el-form-item>
-                                <!--<el-form-item label="所属部门" prop="deptId">
-                                  <treeselect :options="deptOptions" v-model="form.deptId" :show-count="true" placeholder="请选择所属部门"
-                                              @select="hx" :disabled="false"/>
-                                </el-form-item>-->
-                           <!--     <el-form-item label="所属部门" prop="deptId" class="form-style">
-                                  <deptselector :setValue=setDataDeptId :dataDeptId="form.deptId" v-if=!disabled
-                                                v-model="form.deptId"></deptselector>
-                                                  </el-form-item>-->
-                                <el-form-item label="所属部门" prop="deptId">
-                                  <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true"
-                                              placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'"/>
-                                </el-form-item>
-                                <el-form-item label="日期" prop="time">
-                                  <el-date-picker clearable size="small"
-                                                  v-model="form.time"
-                                                  type="date"
-                                                  value-format="yyyy-MM-dd"
-                                                  placeholder="选择日期">
-                                  </el-date-picker>
-                                </el-form-item>
-                                <!--el-form-item label="内容">
-                                    <editor v-model="form.content" :min-height="192"/>
-                                </el-form-item>-->
-                              <el-form-item label="内容" prop="content">
-                                <el-input v-model="form.content" type="textarea" placeholder="请输入内容"/>
-                              </el-form-item>
+    <!-- 添加或修改大事迹对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" class="form-style">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <!-- <el-form-item label="创建人姓名" prop="createName">
+             <el-input v-model="form.createName" placeholder="请输入创建人姓名" />
+         </el-form-item>
+         <el-form-item label="更新人姓名" prop="updateName">
+             <el-input v-model="form.updateName" placeholder="请输入更新人姓名" />
+         </el-form-item>-->
+        <!-- <el-form-item label="数据所属部门(政或党的id)" prop="deptId">
+             <el-input v-model="form.deptId" placeholder="请输入数据所属部门(政或党的id)" />
+         </el-form-item>-->
+        <!--<el-form-item label="所属部门" prop="deptId">
+          <deptselector :setValue=setDataDeptId :dataDeptId="form.deptId"></deptselector>
+        </el-form-item>-->
+        <el-form-item label="标题" prop="name">
+          <el-input v-model="form.name" placeholder="请输入标题" maxlength="255"/>
+        </el-form-item>
+        <!--<el-form-item label="所属部门" prop="deptId">
+          <treeselect :options="deptOptions" v-model="form.deptId" :show-count="true" placeholder="请选择所属部门"
+                      @select="hx" :disabled="false"/>
+        </el-form-item>-->
+        <!--     <el-form-item label="所属部门" prop="deptId" class="form-style">
+               <deptselector :setValue=setDataDeptId :dataDeptId="form.deptId" v-if=!disabled
+                             v-model="form.deptId"></deptselector>
+                               </el-form-item>-->
+        <el-form-item label="所属部门" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true"
+                      placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'"/>
+        </el-form-item>
+        <el-form-item label="日期" prop="time">
+          <el-date-picker clearable size="small"
+                          v-model="form.time"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <!--el-form-item label="内容">
+            <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>-->
+        <el-form-item label="内容" prop="content">
+          <el-input v-model="form.content" type="textarea" placeholder="请输入内容"/>
+        </el-form-item>
 
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
-            </div>
-        </el-dialog>
-    </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-    import { listGreatdeeds, getGreatdeeds, delGreatdeeds, addGreatdeeds, updateGreatdeeds } from "@/api/data/generalbusiness/generalbusiness/greatdeeds";
-    import Treeselect from "@riophae/vue-treeselect";
-    import {treeselect} from "@/api/system/dept";
-    import deptselector from '@/views/components/deptselector.vue'
-    import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-    export default {
-        name: "Greatdeeds",
-        components: {
-        Treeselect,
-        deptselector,
+import {
+  listGreatdeeds,
+  getGreatdeeds,
+  delGreatdeeds,
+  addGreatdeeds,
+  updateGreatdeeds
+} from "@/api/data/generalbusiness/generalbusiness/greatdeeds";
+import Treeselect from "@riophae/vue-treeselect";
+import {treeselect} from "@/api/system/dept";
+import deptselector from '@/views/components/deptselector.vue'
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Greatdeeds",
+  components: {
+    Treeselect,
+    deptselector,
+  },
+  data() {
+    return {
+      deptOptions: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 大事迹表格数据
+      greatdeedsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        createName: null,
+        updateName: null,
+        deptId: null,
+        deptName: null,
+        name: null,
+        content: null,
+        time: null,
+      },
+      // 表单参数
+      form: {
+        deptId: 0,
       },
-        data() {
-            return {
-              deptOptions: [],
-                // 遮罩层
-                loading: true,
-                // 选中数组
-                ids: [],
-                // 非单个禁用
-                single: true,
-                // 非多个禁用
-                multiple: true,
-                // 显示搜索条件
-                showSearch: true,
-                // 总条数
-                total: 0,
-                // 大事迹表格数据
-                    greatdeedsList: [],
-                // 弹出层标题
-                title: "",
-                // 是否显示弹出层
-                open: false,
-                // 查询参数
-                queryParams: {
-                    pageNum: 1,
-                    pageSize: 10,
-                    createName: null,
-                    updateName: null,
-                    deptId: null,
-                    deptName: null,
-                    name: null,
-                    content: null,
-                    time: null,
-        },
-            // 表单参数
-            form: {
-              deptId: 0,
-            },
-            // 表单校验
-              rules: {
-                name: [
-                  {required: true, message: "标题不能为空", trigger: "blur"}
-                ],
-                deptId: [
-                  {required: true, message: '所属部门不能为空', trigger: 'change'}
-                ],
-                content: [
-                  {required: true, message: "内容不能为空", trigger: "blur"},
-                  {message: '请输入内容', trigger: 'blur'}
-                ],
-                time: [
-                  {required: true, message: "时间不能为空", trigger: "blur"}
-                ],
-              }
-        };
-        },
-        created() {
-            this.getList();
-            this.getTreeselect();
-        },
-        methods: {
-          setDataDeptId(e) {
-            this.form.deptId = e.deptId
-            this.form.deptName = e.deptName
-          },
-          hx(node) {
-            this.form.deptId = node.id
-            this.form.deptName = node.label
-          },
-          /** 查询部门下拉树结构 */
-          getTreeselect() {
-            treeselect().then(response => {
-              this.deptOptions = response.data;
+      // 表单校验
+      rules: {
+        name: [
+          {required: true, message: "标题不能为空", trigger: "blur"}
+        ],
+        deptId: [
+          {required: true, message: '所属部门不能为空', trigger: 'change'}
+        ],
+        content: [
+          {required: true, message: "内容不能为空", trigger: "blur"},
+          {message: '请输入内容', trigger: 'blur'}
+        ],
+        time: [
+          {required: true, message: "时间不能为空", trigger: "blur"}
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    setDataDeptId(e) {
+      this.form.deptId = e.deptId
+      this.form.deptName = e.deptName
+    },
+    hx(node) {
+      this.form.deptId = node.id
+      this.form.deptName = node.label
+    },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    /** 查询大事迹列表 */
+    getList() {
+      this.loading = true;
+      listGreatdeeds(this.queryParams).then(response => {
+        this.greatdeedsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        createBy: null,
+        createName: null,
+        createTime: null,
+        updateBy: null,
+        updateName: null,
+        updateTime: null,
+        deptId: null,
+        deptName: null,
+        name: null,
+        content: null,
+        time: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加大事记";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getGreatdeeds(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改大事记";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateGreatdeeds(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGreatdeeds(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
-          },
-            /** 查询大事迹列表 */
-            getList() {
-                this.loading = true;
-                listGreatdeeds(this.queryParams).then(response => {
-                    this.greatdeedsList = response.rows;
-                    this.total = response.total;
-                    this.loading = false;
-                });
-            },
-            // 取消按钮
-            cancel() {
-                this.open = false;
-                this.reset();
-            },
-            // 表单重置
-            reset() {
-                this.form = {
-                        id: null,
-                        createBy: null,
-                        createName: null,
-                        createTime: null,
-                        updateBy: null,
-                        updateName: null,
-                        updateTime: null,
-                        deptId: null,
-                        deptName: null,
-                        name: null,
-                        content: null,
-                        time: null,
-            };
-                this.resetForm("form");
-            },
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageNum = 1;
-                this.getList();
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.resetForm("queryForm");
-                this.handleQuery();
-            },
-            // 多选框选中数据
-            handleSelectionChange(selection) {
-                this.ids = selection.map(item => item.id)
-                this.single = selection.length!==1
-                this.multiple = !selection.length
-            },
-            /** 新增按钮操作 */
-            handleAdd() {
-                this.reset();
-                this.open = true;
-                this.title = "添加大事记";
-            },
-            /** 修改按钮操作 */
-            handleUpdate(row) {
-                this.reset();
-                const id = row.id || this.ids
-                getGreatdeeds(id).then(response => {
-                    this.form = response.data;
-                    this.open = true;
-                    this.title = "修改大事记";
-                });
-            },
-            /** 提交按钮 */
-            submitForm() {
-                this.$refs["form"].validate(valid => {
-                    if (valid) {
-                        if (this.form.id != null) {
-                            updateGreatdeeds(this.form).then(response => {
-                                this.$modal.msgSuccess("修改成功");
-                                this.open = false;
-                                this.getList();
-                            });
-                        } else {
-                            addGreatdeeds(this.form).then(response => {
-                                this.$modal.msgSuccess("新增成功");
-                                this.open = false;
-                                this.getList();
-                            });
-                        }
-                    }
-                });
-            },
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                const ids = row.id || this.ids;
-                this.$modal.confirm('是否删除选中的数据?').then(function() {
-                    return delGreatdeeds(ids);
-                }).then(() => {
-                    this.getList();
-                    this.$modal.msgSuccess("删除成功");
-                }).catch(() => {});
-            },
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否删除选中的数据?').then(function () {
+        return delGreatdeeds(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
     /** 导出按钮操作 */
     handleExport() {
-        this.download('sooka-sponest-center-data/greatdeeds/export', {
-            ...this.queryParams
-        }, `大事记_${new Date().getTime()}.xlsx`)
+      this.download('sooka-sponest-center-data/greatdeeds/export', {
+        ...this.queryParams
+      }, `大事记_${new Date().getTime()}.xlsx`)
     }
-    }
-    };
+  }
+};
 </script>

+ 9 - 0
data-ui/src/views/data/generalbusiness/networkprocessing/index.vue

@@ -10,6 +10,15 @@
                         placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="部门名称" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入部门名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <!--  <el-form-item label="部门名称" prop="deptName">
             <el-input
                     v-model="queryParams.deptName"

+ 11 - 1
data-ui/src/views/data/generalbusiness/weatherinformation/index.vue

@@ -31,6 +31,15 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="部门名称" prop="deptName">
+        <el-input
+          v-model="queryParams.deptName"
+          placeholder="请输入部门名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -291,7 +300,8 @@
           weatherinformationTemperature: null,
           forestWeatherinformationLevel: null,
           dataStatus: null,
-          dataDeptId: null
+          dataDeptId: null,
+          deptName:null
         },
         // 表单参数
         form: {},

+ 8 - 2
src/main/resources/mapper/digitalwater/CenterdataTHydraulicPatrolTaskMapper.xml

@@ -51,8 +51,14 @@
             <if test="planId != null  and planId != ''">and a.plan_id = #{planId}</if>
             <if test="planName != null  and planName != ''">and a.plan_name like concat('%', #{planName}, '%')</if>
             <if test="status != null  and status != ''">and a.status = #{status}</if>
-            <if test="deptId != null ">and a.dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''">and a.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="deptId != null">
+                <choose>
+                    <when test="deptName != null and deptName == 0">
+                        and FIND_IN_SET( #{deptId}, CONCAT( d.ancestors, ",", d.dept_id) )
+                    </when>
+                    <otherwise>and d.dept_id = #{deptId}</otherwise>
+                </choose>
+            </if>
             <if test="createName != null  and createName != ''">and a.create_name like concat('%', #{createName}, '%')
             </if>
             <if test="updateName != null  and updateName != ''">and a.update_name like concat('%', #{updateName}, '%')

+ 3 - 0
src/main/resources/mapper/generalbusiness/CenterdataTCameraMapper.xml

@@ -90,6 +90,9 @@
         <if test="name != null and name != ''">
             and name like concat('%', #{name}, '%')
         </if>
+        <if test="deptName != null and deptName != ''">
+            and d.dept_name like concat('%', #{deptName}, '%')
+        </if>
         ${params.dataScope}
         order by create_time desc
     </select>