Merge remote-tracking branch 'remotes/origin/dev' into V0.0.2

src/views/system/check/index.vue

@@ -1,63 +1,87 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="采集点名称" prop="checkName">
-        <el-input v-model="queryParams.checkName" placeholder="请输入采集点名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="区域名称" prop="areaId">
-        <el-select v-model="queryParams.areaId" placeholder="请选择">
-          <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="归属部门" prop="orgId">
-        <treeselect style="width: 160px;" v-model="queryParams.orgId" :options="deptOptions" :show-count="true"
-          :normalizer="tenantIdnormalizer" :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属部门" />
-      </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="['system:check:add']">新增</el-button>
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
+            style="margin-bottom: 20px" />
+        </div>
+        <div class="tree-container">
+          <div style="margin-bottom: 10px;">
+            <el-checkbox v-model="queryParams.checkSub" @change="changeCheckBox">是否关联下级机构</el-checkbox>
+          </div>
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+            :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="defaultKeys"
+            :default-checked-keys="defaultKeys" @node-click="handleNodeClick" />
+        </div>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['system:check: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="['system:check:remove']">删除</el-button>
-      </el-col>
-      <!-- <el-col :span="1.5">
+
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="采集点名称" prop="checkName">
+            <el-input v-model="queryParams.checkName" placeholder="请输入采集点名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="区域名称" prop="areaId">
+            <el-select v-model="queryParams.areaId" placeholder="请选择">
+              <el-option v-for="item in areaList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item label="归属部门" prop="orgId">
+            <treeselect style="width: 160px;" v-model="queryParams.orgId" :options="deptOptions" :show-count="true"
+              :normalizer="tenantIdnormalizer" :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择归属部门" />
+          </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="['system:check: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="['system:check: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="['system:check: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="['system:check:export']">导出</el-button>
       </el-col> -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-table v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="采集点名称" align="center" prop="checkName" />
+          <el-table-column label="区域名称" align="center" prop="areaName" />
+          <el-table-column label="归属部门" align="center" prop="orgName" />
+          <el-table-column label="修改人" align="center" prop="updateBy" />
+          <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="['system:check:edit']">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['system:check: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" />
+      </el-col>
+
+
     </el-row>
 
-    <el-table v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
 
-      <el-table-column label="采集点名称" align="center" prop="checkName" />
-      <el-table-column label="区域名称" align="center" prop="areaName" />
-      <el-table-column label="归属部门" align="center" prop="orgName" />
-      <el-table-column label="修改人" align="center" prop="updateBy" />
-      <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="['system:check:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['system:check: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" />
 
     <!-- 添加或修改区域采集点对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -92,6 +116,7 @@
 </template>
 
 <script>
+import tableList from '@/mixins/tableList'
 import { listCheck, getCheck, delCheck, addCheck, updateCheck } from "@/api/system/check";
 import treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -99,7 +124,8 @@ import { deptTreeSelect } from "@/api/system/public";
 import { listArea } from "@/api/system/area";
 export default {
   name: "Check",
-
+  /** 引入基础minxins*/
+  mixins: [tableList],
   components: { treeselect },
   dicts: ['sys_normal_disable'],
   data() {
@@ -108,9 +134,11 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      names:[],
+      names: [],
       // 非单个禁用
       single: true,
+      //搜索tree
+      deptName: null,
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
@@ -120,7 +148,7 @@ export default {
       //搜索tree
       deptName: null,
       // 部门树选项
-      deptOptions: null,
+      deptOptions: [],
       // 总条数
       total: 0,
       //区域集合
@@ -143,19 +171,29 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
- 
+      checkList: [],
+      roleOptions: [],
+      defaultKeys: [],
+      //是否关联下级
+      checked: false,
+      defaultProps: {
+        children: "children",
+        label: "name"
+      },
+
       rules: {
         areaId: [
-            { required: true,message: '请选择区域', trigger: 'blur' },
-          ],
-          orgId:[
-            { required: true,message: '请选择归属部门', trigger: 'blur' },
-          ],
-          checkName: [
-            { required: true,message: '请输入采集点名称', trigger: 'change' }
-          ],
+          { required: true, message: '请选择区域', trigger: 'blur' },
+        ],
+        orgId: [
+          { required: true, message: '请选择归属部门', trigger: 'blur' },
+        ],
+        checkName: [
+          { required: true, message: '请输入采集点名称', trigger: 'change' }
+        ],
       },
       defaultKeys: []
+
     };
   },
   created() {
@@ -165,7 +203,33 @@ export default {
       this.areaList = response.rows;
     })
   },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   methods: {
+    /** 下穿状态改变*/
+    changeCheckBox() {
+      this.getList();
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.orgId = data.id;
+      this.handleQuery();
+    },
+    changeSelectArea(val) {
+
+      getAreaByOrg(val).then(response => {
+        this.roleOptions = response.data;
+      })
+    },
     /** 查询区域采集点列表 */
     getList() {
       this.loading = true;
@@ -180,8 +244,8 @@ export default {
       deptTreeSelect().then(response => {
         this.deptOptions = response.data;
         console.log(this.deptOptions, ' this.deptOptions')
-        // this.defaultKeys.push(response.data[0].id);
-        // this.queryParams.orgId = response.data[0].id;
+        this.defaultKeys.push(response.data[0].id);
+        this.queryParams.orgId = response.data[0].id;
         this.handleQuery();
       });
     },
@@ -195,6 +259,11 @@ export default {
         children: node.children
       }
     },
+        // 节点单击事件
+        handleNodeClick(data) {
+      this.queryParams.orgId = data.id;
+      this.handleQuery();
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -229,7 +298,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.names=selection.map(item => item.checkName)
+      this.names = selection.map(item => item.checkName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -249,7 +318,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
-     
+
       getCheck(id).then(response => {
         this.form = response.data;
         this.roleOptions = response.areas;
@@ -280,7 +349,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      const names=row.checkName || this.names
+      const names = row.checkName || this.names
       this.$modal.confirm('是否确认删除区域采集点名称为"' + names + '"的数据项？').then(function () {
         return delCheck(ids);
       }).then(() => {

src/views/system/dept/extend.vue

@@ -839,6 +839,7 @@
             <image-upload
               :limit="1"
               :fileSize="2"
+              
               @input="uploadorgSuccess"
             ></image-upload>
           </div>

src/views/system/dept/index.vue

@@ -235,7 +235,7 @@
                 v-model="form.type"
                 placeholder="请选择机构类型"
                 clearable
-              >1699249064069677058
+              >
                 <el-option
                   v-for="dict in dict.type.sys_org_type"
                   :key="dict.value"

src/views/system/device/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-
       <!--部门数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
@@ -17,7 +16,6 @@
             :default-checked-keys="defaultKeys" @node-click="handleNodeClick" />
         </div>
       </el-col>
-
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 
@@ -197,12 +195,14 @@
 </template>
 
 <script>
-
+import tableList from '@/mixins/tableList'
 import treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { deptTreeSelect } from "@/api/system/public";
 import { listDevice, getDevice, delDevice, addDevice, updateDevice, getHostByOrgId } from "@/api/system/device";
 export default {
+  /** 引入基础minxins*/
+  mixins: [tableList],
   dicts: ['sys_asset_type', 'sys_device_type'],
   name: "Device",
   components: { treeselect },
@@ -233,9 +233,9 @@ export default {
           { required: true, message: '请选择设备分类', trigger: 'blur' },
 
         ],
-     
-      
-      
+
+
+
       },
       // 遮罩层
       loading: true,
@@ -243,6 +243,8 @@ export default {
       ids: [],
       // 非单个禁用
       single: true,
+      //搜索tree
+      deptName: null,
       // 非多个禁用
       multiple: true,
       // 显示搜索条件
@@ -296,19 +298,36 @@ export default {
     this.getDeptTree();
     this.getList();
   },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   methods: {
 
     /** 下穿状态改变*/
     changeCheckBox() {
       this.getList();
     },
+
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    },
     /** 查询机构树数据 */
+
+    /** 查询部门下拉树结构 */
     getDeptTree() {
       deptTreeSelect().then(response => {
         this.deptOptions = response.data;
+        console.log(this.deptOptions, ' this.deptOptions')
+        this.defaultKeys.push(response.data[0].id);
+        this.queryParams.orgId = response.data[0].id;
+        this.handleQuery();
       });
     },
-
     /** treeSelect组件自定义数据*/
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {