luowei修改bug

src/views/core/accessPlan/index.vue

@@ -89,7 +89,7 @@
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:plan:edit']">修改</el-button>
-              <el-button size="mini" type="text" v-if="scope.row.createType == 0" icon="el-icon-add"
+              <el-button size="mini" type="text" v-if="scope.row.isDistribute == 0" icon="el-icon-add"
                 @click="handDistribute(scope.row)" v-hasPermi="['system:plan:add']">下发</el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                 v-hasPermi="['system:device:remove']">删除</el-button>
@@ -221,7 +221,8 @@ export default {
         planFrequency: null,
         planStatus: null,
         description: null,
-        isDeleted: null
+        isDeleted: null,
+        isDistribute: null,
       },
       // 表单参数
       form: {},

src/views/system/device/index.vue

@@ -1,86 +1,110 @@
 <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="deviceName">
-        <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="资产类别" prop="assetType">
-
-        <el-select style="width: 100%;" v-model="queryParams.assetType" placeholder="请选择">
-          <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
-            :value="`${dict.value}`"></el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="设备分类" prop="deviceType">
-
-        <el-select style="width: 100%;" v-model="queryParams.deviceType" placeholder="请选择">
-          <el-option v-for="dict in dict.type.sys_device_type" :key="dict.value" :label="dict.label"
-            :value="`${dict.value}`"></el-option>
-        </el-select>
-      </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:device: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:device: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:device:remove']">删除</el-button>
+
+      <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="deviceName">
+            <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="资产类别" prop="assetType">
+
+            <el-select style="width: 100%;" v-model="queryParams.assetType" placeholder="请选择">
+              <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
+                :value="`${dict.value}`"></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="设备分类" prop="deviceType">
+
+            <el-select style="width: 100%;" v-model="queryParams.deviceType" placeholder="请选择">
+              <el-option v-for="dict in dict.type.sys_device_type" :key="dict.value" :label="dict.label"
+                :value="`${dict.value}`"></el-option>
+            </el-select>
+          </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:device: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:device: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:device:remove']">删除</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="所属机构" align="center" prop="orgName" />
+          <el-table-column label="设备名称" align="center" prop="deviceName" />
+
+
+          <el-table-column label="资产类别" align="center" key="assetType" prop="assetType" width="80">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_asset_type" :value="scope.row.assetType" />
+            </template>
+          </el-table-column>
+
+          <el-table-column label="设备分类" align="center" key="deviceType" prop="deviceType" width="80">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_device_type" :value="scope.row.deviceType" />
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="设备品牌" align="center" prop="deviceBrand" />
+          <el-table-column label="验收日期" align="center" prop="checkTime" width="160">
+          </el-table-column>
+          <el-table-column label="保修期限" align="center" prop="maintenanceTerm" />
+          <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:device:edit']">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['system:device: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-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['system:device:export']">导出</el-button>
-      </el-col> -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="所属机构" align="center" prop="orgName" />
-      <el-table-column label="设备名称" align="center" prop="deviceName" />
-
-
-      <el-table-column label="资产类别" align="center" key="assetType" prop="assetType" width="80">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_asset_type" :value="scope.row.assetType" />
-        </template>
-      </el-table-column>
-
-      <el-table-column label="设备分类" align="center" key="deviceType" prop="deviceType" width="80">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_device_type" :value="scope.row.deviceType" />
-        </template>
-      </el-table-column>
-
-
-      <el-table-column label="设备品牌" align="center" prop="deviceBrand" />
-      <el-table-column label="验收日期" align="center" prop="checkTime" width="160">
-      </el-table-column>
-      <el-table-column label="保修期限" align="center" prop="maintenanceTerm" />
-      <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:device:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['system:device: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="800px" append-to-body>
@@ -173,15 +197,26 @@
 </template>
 
 <script>
-import OrgTree from '@/components/orgTree'
-import { listDevice, getDevice, delDevice, addDevice, updateDevice, getHostByOrgId } from "@/api/system/device";
+
+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 {
   dicts: ['sys_asset_type', 'sys_device_type'],
   name: "Device",
+  components: { treeselect },
   data() {
     return {
-
+      checkList: [],
+      roleOptions: [],
+      defaultKeys: [],
+      //是否关联下级
+      checked: false,
+      defaultProps: {
+        children: "children",
+        label: "name"
+      },
       rules: {
         deviceName: [
           { required: true, message: '请输入设备名称', trigger: 'change' },
@@ -268,6 +303,11 @@ export default {
     this.getList();
   },
   methods: {
+
+    /** 下穿状态改变*/
+    changeCheckBox() {
+      this.getList();
+    },
     /** 查询机构树数据 */
     getDeptTree() {
       deptTreeSelect().then(response => {
@@ -286,7 +326,11 @@ export default {
         children: node.children
       }
     },
-
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.orgId = data.id;
+      this.handleQuery();
+    },
     changeSelect(val) {
       getHostByOrgId(val).then(response => {
         this.form.hostId = null;
@@ -303,6 +347,26 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询部门下拉树结构 */
+    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();
+      });
+    },
+    tenantIdnormalizer(node, instanceId) {
+      if (node.children && !node.children.length) {
+        delete node.children
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -343,7 +407,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.names= selection.map(item => item.deviceName)
+      this.names = selection.map(item => item.deviceName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -390,7 +454,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      const names=row.deviceName || this.names;
+      const names = row.deviceName || this.names;
       this.$modal.confirm('是否确认删除名称为"' + names + '"的数据项？').then(function () {
         return delDevice(ids);
       }).then(() => {

src/views/system/role/index.vue

@@ -78,7 +78,7 @@
             v-hasPermi="['system:role:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']">删除</el-button>
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+          <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
             v-hasPermi="['system:role:edit']">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
             <el-dropdown-menu slot="dropdown">
@@ -87,7 +87,7 @@
               <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
                 v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
             </el-dropdown-menu>
-          </el-dropdown>
+          </el-dropdown> -->
         </template>
       </el-table-column>
     </el-table>