From 7b9ab91c8f4a28cb11fc889bbb1345747436f3a7 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 10 Dec 2024 13:39:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=88=97=E8=A1=A8=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/api/auditPagesApi/index.js                |   9 +
 .../auditPages/assetsManagement/email.vue     | 393 ++++++++--------
 .../auditPages/assetsManagement/index.vue     | 421 ++++++++++--------
 .../assetsManagement/mobileApplication.vue    | 399 +++++++++--------
 .../assetsManagement/officialAccount.vue      | 411 +++++++++--------
 .../auditPages/assetsManagement/program.vue   | 409 +++++++++--------
 src/views/system/user/index.vue               |   2 +-
 8 files changed, 1140 insertions(+), 906 deletions(-)

diff --git a/.env.development b/.env.development
index 99c6de3..6ddf231 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 太仓资产管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.115:9115'
+VUE_APP_BASE_API = 'http://192.168.0.119:9115'
 # VUE_APP_BASE_API = 'http://39.101.188.84:9115'
 
 # 路由懒加载
diff --git a/src/api/auditPagesApi/index.js b/src/api/auditPagesApi/index.js
index a8e0644..4b39bd7 100644
--- a/src/api/auditPagesApi/index.js
+++ b/src/api/auditPagesApi/index.js
@@ -232,4 +232,13 @@ export function editPassword(id) {
     url:"/tc/unit/edit/" + id,
     method:"get"
   })
+}
+
+// 根据资产类型获取组织架构
+export function schema(type){
+  return request({
+    url:"/tc/schema",
+    method:"get",
+    params:type
+  })
 }
\ No newline at end of file
diff --git a/src/views/auditPages/assetsManagement/email.vue b/src/views/auditPages/assetsManagement/email.vue
index d682bfd..43bd2aa 100644
--- a/src/views/auditPages/assetsManagement/email.vue
+++ b/src/views/auditPages/assetsManagement/email.vue
@@ -1,192 +1,218 @@
 <!-- 资产管理 -- 电子邮件 -->
 <template>
-  <div class="L-main" id="L-size-main">
-    <div class="content-search" id="L-header">
-      <div class="search-title">查询条件</div>
-      <el-form :inline="true" ref="queryForm" :model="formInline" size="small" class="demo-form-inline">
-        <el-row>
-          <el-col :span="7">
-            <el-form-item label="所属单位：" prop="dwmc">
-              <el-input v-model="formInline.dwmc" placeholder="请输入所属单位"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="电子邮箱后缀：" prop="dzyxhz">
-              <el-input v-model="formInline.dzyxhz" placeholder="请输入电子邮箱后缀"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="新增时间：" prop="time">
-              <el-date-picker
-                v-model="time"
-                format="yyyy-MM-dd HH:mm:ss"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                type="datetimerange"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                placeholder="请选择"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3" style="text-align: right;">
-            <el-form-item class="unit-form">
-              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
-              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
-          <el-col :span="8">
-            <el-form-item label="单位名称：" prop="dwmc">
-              <el-input v-model="formInline.dwmc" placeholder="请输入单位名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="系统状态：" prop="xtzt">
-              <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
-                <el-option
-                  v-for="dict in dict.type.zc_xtzt"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" style="text-align: right;padding-right: 50px;">
-            <el-form-item>
-              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
-              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-      </el-form>
-    </div>
-    <main>
-      <div class="search-title">
-        <span class="search-title-span">资产列表</span>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-            >导出</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-            >新增资产</el-button>
-          </el-col>
-        </el-row>
+  <el-row :gutter="20" style="height: 100%;background-color: #F2F4F6;display: flex;">
+    <!--部门数据-->
+    <el-col :span="3" :xs="24" style="margin-right: 10px;height: 100%; background-color: #fff;padding-top: 20px;">
+      <div class="head-container">
+        <el-tree
+          :data="deptOptions"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          node-key="id"
+          default-expand-all
+          highlight-current
+          @node-click="handleNodeClick"
+        />
       </div>
-      <section>
-        <el-table v-loading="loading" :data="tableData" :height="tabHeader" :row-class-name="tableRowClassName" :max-height="tabHeader">
-          <el-table-column type="index" width="50" label="序号" align="center"/>
-          <el-table-column label="所属单位" key="ssdw" prop="ssdw" align="center" />
-          <el-table-column label="电子邮箱后缀" key="dzyxhz" prop="dzyxhz" align="center" />
-          <el-table-column label="邮件系统供应商" key="yjxtgys" prop="yjxtgys" align="center">
-            <!-- <template slot-scope="scope">
-              <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
-            </template> -->
-          </el-table-column>
-          <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" />
-          <el-table-column label="邮件系统状态" key="status" prop="status" class-name="table-status" align="center">
-            <template slot-scope="scope">
-              <span  v-if="scope.row.yjxtzc == 1" style="color: #16B771;">
-                正常
-              </span>
-              <span v-if="scope.row.yjxtzc == 2" style="color: #F58A0C;">
-                停用
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
-            <template slot-scope="scope">
-              <div style="display: flex;align-items: center;justify-content: center;">
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,1)">
-                  <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
-                </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
-                  <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
-                </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,3)">
-                  <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" style="color: #F50C0C;margin-right: 15px;">删除</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </section>
-      <my-pagination 
-        id="L-pagination"
-        :total="total"
-        :page="formInline.current"
-        :limit="formInline.size"
-        @pagination="getPagination"
-        :current-page.sync="formInline.current" 
-      ></my-pagination>
-    </main>
-    <!-- 资产导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <!-- <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
-          </div> -->
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+    </el-col>
+    <el-col :span="20" :xs="24" style="height: 100%;flex: 1;">
+      <div class="L-main" id="L-size-main">
+        <div class="content-search" id="L-header">
+          <div class="search-title">查询条件</div>
+          <el-form :inline="true" ref="queryForm" :model="formInline" size="small" class="demo-form-inline">
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="所属单位：" prop="dwmc">
+                  <el-input v-model="formInline.dwmc" placeholder="请输入所属单位"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="电子邮箱后缀：" prop="dzyxhz">
+                  <el-input v-model="formInline.dzyxhz" placeholder="请输入电子邮箱后缀"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="新增时间：" prop="time">
+                  <el-date-picker
+                    v-model="time"
+                    format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    type="datetimerange"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    placeholder="请选择"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6" style="text-align: right;">
+                <el-form-item class="unit-form">
+                  <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- <el-row>
+              <el-col :span="8">
+                <el-form-item label="单位名称：" prop="dwmc">
+                  <el-input v-model="formInline.dwmc" placeholder="请输入单位名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="系统状态：" prop="xtzt">
+                  <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
+                    <el-option
+                      v-for="dict in dict.type.zc_xtzt"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" style="text-align: right;padding-right: 50px;">
+                <el-form-item>
+                  <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row> -->
+          </el-form>
         </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
+        <main>
+          <div class="search-title">
+            <span class="search-title-span">资产列表</span>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="info"
+                  plain
+                  icon="el-icon-upload2"
+                  size="mini"
+                  @click="handleImport"
+                >导入</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                >导出</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                >新增资产</el-button>
+              </el-col>
+            </el-row>
+          </div>
+          <section>
+            <el-table v-loading="loading" :data="tableData" :height="tabHeader" :row-class-name="tableRowClassName" :max-height="tabHeader">
+              <el-table-column type="index" width="50" label="序号" align="center"/>
+              <el-table-column label="所属单位" key="ssdw" prop="ssdw" align="center" />
+              <el-table-column label="电子邮箱后缀" key="dzyxhz" prop="dzyxhz" align="center" />
+              <el-table-column label="邮件系统供应商" key="yjxtgys" prop="yjxtgys" align="center">
+                <!-- <template slot-scope="scope">
+                  <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
+                </template> -->
+              </el-table-column>
+              <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" />
+              <el-table-column label="邮件系统状态" key="status" prop="status" class-name="table-status" align="center">
+                <template slot-scope="scope">
+                  <span  v-if="scope.row.yjxtzc == 1" style="color: #16B771;">
+                    正常
+                  </span>
+                  <span v-if="scope.row.yjxtzc == 2" style="color: #F58A0C;">
+                    停用
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
+                <template slot-scope="scope">
+                  <div style="display: flex;align-items: center;justify-content: center;">
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,1)">
+                      <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                      <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
+                    </div>
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
+                      <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
+                      <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
+                    </div>
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,3)">
+                      <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
+                      <span class="look-info" style="color: #F50C0C;margin-right: 15px;">删除</span>
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </section>
+          <my-pagination 
+            id="L-pagination"
+            :total="total"
+            :page="formInline.current"
+            :limit="formInline.size"
+            @pagination="getPagination"
+            :current-page.sync="formInline.current" 
+          ></my-pagination>
+        </main>
+        <!-- 资产导入对话框 -->
+        <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+            ref="upload"
+            :limit="1"
+            accept=".xlsx, .xls"
+            :headers="upload.headers"
+            :action="upload.url + '?updateSupport=' + upload.updateSupport"
+            :disabled="upload.isUploading"
+            :on-progress="handleFileUploadProgress"
+            :on-success="handleFileSuccess"
+            :auto-upload="false"
+            drag
+          >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__tip text-center" slot="tip">
+              <!-- <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+              </div> -->
+              <span>仅允许导入xls、xlsx格式文件。</span>
+              <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+            </div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+        </el-dialog>
       </div>
-    </el-dialog>
-  </div>
+    </el-col>
+  </el-row>
 </template>
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
 // import myDialog from "@/views/components/myDialog/index.vue"
 import { getToken } from "@/utils/auth";
-import { assetEmailList, deleteAssetEmail } from "@/api/auditPagesApi/index";
+import { assetEmailList, deleteAssetEmail, schema } from "@/api/auditPagesApi/index";
 export default {
   dicts: ['zc_xtzt','zc_xtlx'],
   components:{myPagination},
   data() {
     return {
+      // 部门树选项
+      deptOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       formInline:{
         dzyxhz:"",
         dwmc:"",
@@ -219,6 +245,7 @@ export default {
   },
   mounted(){
     this.getList();
+    this.getDeptTree();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
   },
@@ -226,6 +253,22 @@ export default {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   methods:{
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      schema({type:3}).then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.formInline.deptId = data.id;
+      this.handleQuery();
+    },
     // 获取列表
     getList(){
       this.loading = true;
@@ -239,6 +282,8 @@ export default {
     resetQuery(){
       this.resetForm("queryForm");
       this.time = [];
+      this.formInline.deptId = undefined;
+      this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     // 查询
diff --git a/src/views/auditPages/assetsManagement/index.vue b/src/views/auditPages/assetsManagement/index.vue
index e00fe06..e09bf90 100644
--- a/src/views/auditPages/assetsManagement/index.vue
+++ b/src/views/auditPages/assetsManagement/index.vue
@@ -1,206 +1,232 @@
 <!-- 资产管理 -- web系统 -->
 <template>
-  <div class="L-main" id="L-size-main">
-    <div class="content-search" id="L-header">
-      <div class="search-title">查询条件</div>
-      <el-form :inline="true" ref="queryForm" :model="formInline" size="small" class="demo-form-inline">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="系统名称：" prop="xtmc">
-              <el-input v-model="formInline.xtmc" placeholder="请输入系统名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="系统类型：" prop="xtlx">
-              <el-select v-model="formInline.xtlx" placeholder="请选择系统类型">
-                <el-option
-                  v-for="dict in dict.type.zc_xtlx"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="新增时间：" prop="time">
-              <el-date-picker
-                v-model="formInline.time"
-                format="yyyy-MM-dd HH:mm:ss"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                type="datetimerange"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                placeholder="请选择"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="单位名称：" prop="dwmc">
-              <el-input v-model="formInline.dwmc" placeholder="请输入单位名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="系统状态：" prop="xtzt">
-              <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
-                <el-option
-                  v-for="dict in dict.type.zc_xtzt"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" style="text-align: right;padding-right: 50px;">
-            <el-form-item>
-              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
-              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <main>
-      <div class="search-title">
-        <span class="search-title-span">资产列表</span>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-            >导出</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-            >新增资产</el-button>
-          </el-col>
-        </el-row>
+  <el-row :gutter="20" style="height: 100%;background-color: #F2F4F6;display: flex;">
+    <!--部门数据-->
+    <el-col :span="3" :xs="24" style="margin-right: 10px;height: 100%; background-color: #fff;padding-top: 20px;">
+      <div class="head-container">
+        <el-tree
+          :data="deptOptions"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          node-key="id"
+          default-expand-all
+          highlight-current
+          @node-click="handleNodeClick"
+        />
       </div>
-      <section>
-        <el-table v-loading="loading" :data="tableData" :height="tabHeader" :row-class-name="tableRowClassName" :max-height="tabHeader">
-          <el-table-column type="index" width="50" label="序号" align="center"/>
-          <el-table-column label="系统名称" key="xtmc" width="200px" prop="xtmc" align="center" />
-          <el-table-column label="系统类型" key="xtlx" prop="xtlx" align="center">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.zc_xtlx" :value="scope.row.xtlx"/>
-            </template>
-          </el-table-column>
-          <el-table-column label="单位名称" key="dwmc" prop="dwmc" align="center">
-            <!-- <template slot-scope="scope">
-              <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
-            </template> -->
-          </el-table-column>
-          <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" />
-          <el-table-column label="系统状态" key="status" prop="status" class-name="table-status" align="center">
-            <template slot-scope="scope">
-              <span  v-if="scope.row.xtzt == 1" style="color: #16B771;">
-                已安装
-              </span>
-              <span v-if="scope.row.xtzt == 2" style="color: #F58A0C;">
-                测试中
-              </span>
-              <span v-if="scope.row.xtzt == 3" style="color: #1485EF;">
-                使用中
-              </span>
-              <span v-if="scope.row.xtzt == 4" style="color: #29A07A;">
-                维护中
-              </span>
-              <span v-if="scope.row.xtzt == 5" style="color: #F50C0C;">
-                关停
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
-            <template slot-scope="scope">
-              <div style="display: flex;align-items: center;justify-content: center;">
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,1)">
-                  <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
-                </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
-                  <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
-                </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,3)">
-                  <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" style="color: #F50C0C;margin-right: 15px;">删除</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </section>
-      <my-pagination 
-        id="L-pagination"
-        :total="total"
-        :page="formInline.current"
-        :limit="formInline.size"
-        @pagination="getPagination"
-        :current-page.sync="formInline.current" 
-      ></my-pagination>
-    </main>
-    <!-- 资产导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <!-- <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
-          </div> -->
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+    </el-col>
+    <el-col :span="20" :xs="24" style="height: 100%;flex: 1;">
+      <div class="L-main" id="L-size-main">
+        <div class="content-search" id="L-header">
+          <div class="search-title">查询条件</div>
+          <el-form :inline="true" ref="queryForm" :model="formInline" size="small" class="demo-form-inline">
+            <el-row>
+              <el-col :span="7">
+                <el-form-item label="系统名称：" prop="xtmc">
+                  <el-input v-model="formInline.xtmc" placeholder="请输入系统名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item label="系统类型：" prop="xtlx">
+                  <el-select v-model="formInline.xtlx" placeholder="请选择系统类型">
+                    <el-option
+                      v-for="dict in dict.type.zc_xtlx"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item label="新增时间：" prop="time">
+                  <el-date-picker
+                    v-model="formInline.time"
+                    format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    type="datetimerange"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    placeholder="请选择"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="7">
+                <el-form-item label="单位名称：" prop="dwmc">
+                  <el-input v-model="formInline.dwmc" placeholder="请输入单位名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="7">
+                <el-form-item label="系统状态：" prop="xtzt">
+                  <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
+                    <el-option
+                      v-for="dict in dict.type.zc_xtzt"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="9" style="text-align: right;padding-right: 35px;">
+                <el-form-item>
+                  <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
         </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
+        <main>
+          <div class="search-title">
+            <span class="search-title-span">资产列表</span>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="info"
+                  plain
+                  icon="el-icon-upload2"
+                  size="mini"
+                  @click="handleImport"
+                >导入</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                >导出</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                >新增资产</el-button>
+              </el-col>
+            </el-row>
+          </div>
+          <section>
+            <el-table v-loading="loading" :data="tableData" :height="tabHeader" :row-class-name="tableRowClassName" :max-height="tabHeader">
+              <el-table-column type="index" width="50" label="序号" align="center"/>
+              <el-table-column label="系统名称" key="xtmc" width="200px" prop="xtmc" align="center" />
+              <el-table-column label="系统类型" key="xtlx" prop="xtlx" align="center">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.zc_xtlx" :value="scope.row.xtlx"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="单位名称" key="dwmc" prop="dwmc" align="center">
+                <!-- <template slot-scope="scope">
+                  <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
+                </template> -->
+              </el-table-column>
+              <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" />
+              <el-table-column label="系统状态" key="status" prop="status" class-name="table-status" align="center">
+                <template slot-scope="scope">
+                  <span  v-if="scope.row.xtzt == 1" style="color: #16B771;">
+                    已安装
+                  </span>
+                  <span v-if="scope.row.xtzt == 2" style="color: #F58A0C;">
+                    测试中
+                  </span>
+                  <span v-if="scope.row.xtzt == 3" style="color: #1485EF;">
+                    使用中
+                  </span>
+                  <span v-if="scope.row.xtzt == 4" style="color: #29A07A;">
+                    维护中
+                  </span>
+                  <span v-if="scope.row.xtzt == 5" style="color: #F50C0C;">
+                    关停
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
+                <template slot-scope="scope">
+                  <div style="display: flex;align-items: center;justify-content: center;">
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,1)">
+                      <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                      <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
+                    </div>
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
+                      <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
+                      <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
+                    </div>
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,3)">
+                      <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
+                      <span class="look-info" style="color: #F50C0C;margin-right: 15px;">删除</span>
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </section>
+          <my-pagination 
+            id="L-pagination"
+            :total="total"
+            :page="formInline.current"
+            :limit="formInline.size"
+            @pagination="getPagination"
+            :current-page.sync="formInline.current" 
+          ></my-pagination>
+        </main>
+        <!-- 资产导入对话框 -->
+        <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+            ref="upload"
+            :limit="1"
+            accept=".xlsx, .xls"
+            :headers="upload.headers"
+            :action="upload.url + '?updateSupport=' + upload.updateSupport"
+            :disabled="upload.isUploading"
+            :on-progress="handleFileUploadProgress"
+            :on-success="handleFileSuccess"
+            :auto-upload="false"
+            drag
+          >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__tip text-center" slot="tip">
+              <!-- <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+              </div> -->
+              <span>仅允许导入xls、xlsx格式文件。</span>
+              <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+            </div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+        </el-dialog>
       </div>
-    </el-dialog>
-  </div>
+    </el-col>
+  </el-row>
 </template>
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
 // import myDialog from "@/views/components/myDialog/index.vue"
 import { getToken } from "@/utils/auth";
-import { assetUnit, deleteAssetInfo } from "@/api/auditPagesApi/index";
+import { assetUnit, deleteAssetInfo, schema } from "@/api/auditPagesApi/index";
 export default {
   dicts: ['zc_xtzt','zc_xtlx'],
   components:{myPagination},
   data() {
     return {
+      // 部门树选项
+      deptOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       formInline:{
         xtmc:"",
         xtlx:"",
@@ -235,6 +261,7 @@ export default {
   },
   mounted(){
     this.getList();
+    this.getDeptTree();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
   },
@@ -242,6 +269,22 @@ export default {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   methods:{
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      schema({type:0}).then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.formInline.deptId = data.id;
+      this.handleQuery();
+    },
     // 获取列表
     getList(){
       this.loading = true;
@@ -254,6 +297,8 @@ export default {
     // 重置
     resetQuery(){
       this.resetForm("queryForm");
+      this.formInline.deptId = undefined;
+      this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     // 查询
diff --git a/src/views/auditPages/assetsManagement/mobileApplication.vue b/src/views/auditPages/assetsManagement/mobileApplication.vue
index 234b02f..068c0b9 100644
--- a/src/views/auditPages/assetsManagement/mobileApplication.vue
+++ b/src/views/auditPages/assetsManagement/mobileApplication.vue
@@ -1,195 +1,221 @@
 <!-- 资产管理 -- 移动应用系统 -->
 <template>
-  <div class="L-main" id="L-size-main">
-    <div class="content-search" id="L-header">
-      <div class="search-title">查询条件</div>
-      <el-form :inline="true" ref="queryForm" :model="formInline" size="small" class="demo-form-inline">
-        <el-row>
-          <el-col :span="7">
-            <el-form-item label="所属单位：" prop="dwmc">
-              <el-input v-model="formInline.dwmc" placeholder="请输入所属单位"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="移动应用名称：" prop="yymc">
-              <el-input v-model="formInline.yymc" placeholder="请输入移动应用名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="新增时间：" prop="time">
-              <el-date-picker
-                v-model="time"
-                format="yyyy-MM-dd HH:mm:ss"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                type="datetimerange"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                placeholder="请选择"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3" style="text-align: right;">
-            <el-form-item class="unit-form">
-              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
-              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
-          <el-col :span="8">
-            <el-form-item label="单位名称：" prop="dwmc">
-              <el-input v-model="formInline.dwmc" placeholder="请输入单位名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="系统状态：" prop="xtzt">
-              <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
-                <el-option
-                  v-for="dict in dict.type.zc_xtzt"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" style="text-align: right;padding-right: 50px;">
-            <el-form-item>
-              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
-              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-      </el-form>
-    </div>
-    <main>
-      <div class="search-title">
-        <span class="search-title-span">资产列表</span>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-            >导出</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-            >新增资产</el-button>
-          </el-col>
-        </el-row>
+  <el-row :gutter="20" style="height: 100%;background-color: #F2F4F6;display: flex;">
+    <!--部门数据-->
+    <el-col :span="3" :xs="24" style="margin-right: 10px;height: 100%; background-color: #fff;padding-top: 20px;">
+      <div class="head-container">
+        <el-tree
+          :data="deptOptions"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          node-key="id"
+          default-expand-all
+          highlight-current
+          @node-click="handleNodeClick"
+        />
       </div>
-      <section>
-        <el-table v-loading="loading" :data="tableData" :height="tabHeader" :row-class-name="tableRowClassName" :max-height="tabHeader">
-          <el-table-column type="index" width="50" label="序号" align="center"/>
-          <el-table-column label="移动应用名称" key="appName" prop="appName" align="center" />
-          <el-table-column label="所属单位" key="ssdw" prop="ssdw" align="center" />
-          <!-- <el-table-column label="icp备案状态" key="dwmc" prop="dwmc" align="center">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
-            </template>
-          </el-table-column> -->
-          <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" />
-          <el-table-column label="icp备案状态" key="status" prop="status" class-name="table-status" align="center">
-            <template slot-scope="scope">
-              <span  v-if="scope.row.icpState == 1" style="color: #F58A0C;">
-                未备案
-              </span>
-              <span v-if="scope.row.icpState == 2" style="color: #16B771;">
-                已备案
-              </span>
-              <span v-if="scope.row.icpState == 3" style="color: #1485EF;">
-                非网站系统
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
-            <template slot-scope="scope">
-              <div style="display: flex;align-items: center;justify-content: center;">
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,1)">
-                  <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
-                </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
-                  <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
-                </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,3)">
-                  <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" style="color: #F50C0C;margin-right: 15px;">删除</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </section>
-      <my-pagination 
-        id="L-pagination"
-        :total="total"
-        :page="formInline.current"
-        :limit="formInline.size"
-        @pagination="getPagination"
-        :current-page.sync="formInline.current" 
-      ></my-pagination>
-    </main>
-    <!-- 资产导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <!-- <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
-          </div> -->
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+    </el-col>
+    <el-col :span="20" :xs="24" style="height: 100%;flex: 1;">
+      <div class="L-main" id="L-size-main">
+        <div class="content-search" id="L-header">
+          <div class="search-title">查询条件</div>
+          <el-form :inline="true" ref="queryForm" :model="formInline" size="small" class="demo-form-inline">
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="所属单位：" prop="dwmc">
+                  <el-input v-model="formInline.dwmc" placeholder="请输入所属单位"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="移动应用名称：" prop="yymc">
+                  <el-input v-model="formInline.yymc" placeholder="请输入移动应用名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="新增时间：" prop="time">
+                  <el-date-picker
+                    v-model="time"
+                    format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    type="datetimerange"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    placeholder="请选择"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6" style="text-align: right;">
+                <el-form-item class="unit-form">
+                  <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- <el-row>
+              <el-col :span="8">
+                <el-form-item label="单位名称：" prop="dwmc">
+                  <el-input v-model="formInline.dwmc" placeholder="请输入单位名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="系统状态：" prop="xtzt">
+                  <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
+                    <el-option
+                      v-for="dict in dict.type.zc_xtzt"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" style="text-align: right;padding-right: 50px;">
+                <el-form-item>
+                  <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row> -->
+          </el-form>
         </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
+        <main>
+          <div class="search-title">
+            <span class="search-title-span">资产列表</span>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="info"
+                  plain
+                  icon="el-icon-upload2"
+                  size="mini"
+                  @click="handleImport"
+                >导入</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                >导出</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                >新增资产</el-button>
+              </el-col>
+            </el-row>
+          </div>
+          <section>
+            <el-table v-loading="loading" :data="tableData" :height="tabHeader" :row-class-name="tableRowClassName" :max-height="tabHeader">
+              <el-table-column type="index" width="50" label="序号" align="center"/>
+              <el-table-column label="移动应用名称" key="appName" prop="appName" align="center" />
+              <el-table-column label="所属单位" key="ssdw" prop="ssdw" align="center" />
+              <!-- <el-table-column label="icp备案状态" key="dwmc" prop="dwmc" align="center">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
+                </template>
+              </el-table-column> -->
+              <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" />
+              <el-table-column label="icp备案状态" key="status" prop="status" class-name="table-status" align="center">
+                <template slot-scope="scope">
+                  <span  v-if="scope.row.icpState == 1" style="color: #F58A0C;">
+                    未备案
+                  </span>
+                  <span v-if="scope.row.icpState == 2" style="color: #16B771;">
+                    已备案
+                  </span>
+                  <span v-if="scope.row.icpState == 3" style="color: #1485EF;">
+                    非网站系统
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
+                <template slot-scope="scope">
+                  <div style="display: flex;align-items: center;justify-content: center;">
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,1)">
+                      <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                      <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
+                    </div>
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
+                      <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
+                      <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
+                    </div>
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,3)">
+                      <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
+                      <span class="look-info" style="color: #F50C0C;margin-right: 15px;">删除</span>
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </section>
+          <my-pagination 
+            id="L-pagination"
+            :total="total"
+            :page="formInline.current"
+            :limit="formInline.size"
+            @pagination="getPagination"
+            :current-page.sync="formInline.current" 
+          ></my-pagination>
+        </main>
+        <!-- 资产导入对话框 -->
+        <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+            ref="upload"
+            :limit="1"
+            accept=".xlsx, .xls"
+            :headers="upload.headers"
+            :action="upload.url + '?updateSupport=' + upload.updateSupport"
+            :disabled="upload.isUploading"
+            :on-progress="handleFileUploadProgress"
+            :on-success="handleFileSuccess"
+            :auto-upload="false"
+            drag
+          >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__tip text-center" slot="tip">
+              <!-- <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+              </div> -->
+              <span>仅允许导入xls、xlsx格式文件。</span>
+              <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+            </div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+        </el-dialog>
       </div>
-    </el-dialog>
-  </div>
+    </el-col>
+  </el-row>
 </template>
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
 // import myDialog from "@/views/components/myDialog/index.vue"
 import { getToken } from "@/utils/auth";
-import { assetAppList, deleteAssetApp } from "@/api/auditPagesApi/index";
+import { assetAppList, deleteAssetApp, schema } from "@/api/auditPagesApi/index";
 export default {
   dicts: ['zc_xtzt','zc_xtlx'],
   components:{myPagination},
   data() {
     return {
+      // 部门树选项
+      deptOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       formInline:{
         dwmc:"",
         yymc:"",
@@ -222,6 +248,7 @@ export default {
   },
   mounted(){
     this.getList();
+    this.getDeptTree();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
   },
@@ -229,6 +256,22 @@ export default {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   methods:{
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      schema({type:4}).then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.formInline.deptId = data.id;
+      this.handleQuery();
+    },
     // 获取列表
     getList(){
       this.loading = true;
@@ -242,6 +285,8 @@ export default {
     resetQuery(){
       this.resetForm("queryForm");
       this.time = [];
+      this.formInline.deptId = undefined;
+      this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     // 查询
diff --git a/src/views/auditPages/assetsManagement/officialAccount.vue b/src/views/auditPages/assetsManagement/officialAccount.vue
index e769871..03dbaaa 100644
--- a/src/views/auditPages/assetsManagement/officialAccount.vue
+++ b/src/views/auditPages/assetsManagement/officialAccount.vue
@@ -1,201 +1,227 @@
 <!-- 资产管理 -- 公众号 -->
 <template>
-  <div class="L-main" id="L-size-main">
-    <div class="content-search" id="L-header">
-      <div class="search-title">查询条件</div>
-      <el-form :inline="true" ref="queryForm" :model="formInline" size="small" class="demo-form-inline">
-        <el-row>
-          <el-col :span="7">
-            <el-form-item label="所属单位：" prop="dwmc">
-              <el-input v-model="formInline.dwmc" placeholder="请输入所属单位"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="公众号名称：" prop="gzhmc">
-              <el-input v-model="formInline.gzhmc" placeholder="请输入公众号名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="新增时间：" prop="time">
-              <el-date-picker
-                v-model="time"
-                format="yyyy-MM-dd HH:mm:ss"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                type="datetimerange"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                placeholder="请选择"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3" style="text-align: right;">
-            <el-form-item class="unit-form">
-              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
-              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
-          <el-col :span="8">
-            <el-form-item label="单位名称：" prop="dwmc">
-              <el-input v-model="formInline.dwmc" placeholder="请输入单位名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="系统状态：" prop="xtzt">
-              <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
-                <el-option
-                  v-for="dict in dict.type.zc_xtzt"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" style="text-align: right;padding-right: 50px;">
-            <el-form-item>
-              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
-              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-      </el-form>
-    </div>
-    <main>
-      <div class="search-title">
-        <span class="search-title-span">资产列表</span>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-            >导出</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-            >新增资产</el-button>
-          </el-col>
-        </el-row>
+  <el-row :gutter="20" style="height: 100%;background-color: #F2F4F6;display: flex;">
+    <!--部门数据-->
+    <el-col :span="3" :xs="24" style="margin-right: 10px;height: 100%; background-color: #fff;padding-top: 20px;">
+      <div class="head-container">
+        <el-tree
+          :data="deptOptions"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          node-key="id"
+          default-expand-all
+          highlight-current
+          @node-click="handleNodeClick"
+        />
       </div>
-      <section>
-        <el-table v-loading="loading" :data="tableData" :height="tabHeader" :row-class-name="tableRowClassName" :max-height="tabHeader">
-          <el-table-column type="index" width="50" label="序号" align="center"/>
-          <el-table-column label="公众号名称" key="gzhmc" prop="gzhmc" align="center" />
-          <el-table-column label="所属单位" key="ssdw" prop="ssdw" align="center" />
-          <!-- <el-table-column label="单位名称" key="dwmc" prop="dwmc" align="center">
-          </el-table-column> -->
-          <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" />
-          <el-table-column label="公众号状态" key="status" prop="status" class-name="table-status" align="center">
-            <template slot-scope="scope">
-              <span  v-if="scope.row.gzhzt == 1" style="color: #16B771;">
-                正常
-              </span>
-              <span v-if="scope.row.gzhzt == 2" style="color: #F58A0C;">
-                注销
-              </span>
-              <span v-if="scope.row.gzhzt == 3" style="color: #1485EF;">
-                迁移
-              </span>
-              <span v-if="scope.row.gzhzt == 4" style="color: #29A07A;">
-                受限
-              </span>
-              <span v-if="scope.row.gzhzt == 5" style="color: #F50C0C;">
-                违规
-              </span>
-              <span v-if="scope.row.gzhzt == 6" style="color: #F58A0C;">
-                未知
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
-            <template slot-scope="scope">
-              <div style="display: flex;align-items: center;justify-content: center;">
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,1)">
-                  <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
-                </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
-                  <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
-                </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,3)">
-                  <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" style="color: #F50C0C;margin-right: 15px;">删除</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </section>
-      <my-pagination 
-        id="L-pagination"
-        :total="total"
-        :page="formInline.current"
-        :limit="formInline.size"
-        @pagination="getPagination"
-        :current-page.sync="formInline.current" 
-      ></my-pagination>
-    </main>
-    <!-- 资产导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <!-- <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
-          </div> -->
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+    </el-col>
+    <el-col :span="20" :xs="24" style="height: 100%;flex: 1;">
+      <div class="L-main" id="L-size-main">
+        <div class="content-search" id="L-header">
+          <div class="search-title">查询条件</div>
+          <el-form :inline="true" ref="queryForm" :model="formInline" size="small" class="demo-form-inline">
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="所属单位：" prop="dwmc">
+                  <el-input v-model="formInline.dwmc" placeholder="请输入所属单位"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="公众号名称：" prop="gzhmc">
+                  <el-input v-model="formInline.gzhmc" placeholder="请输入公众号名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="新增时间：" prop="time">
+                  <el-date-picker
+                    v-model="time"
+                    format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    type="datetimerange"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    placeholder="请选择"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6" style="text-align: right;">
+                <el-form-item class="unit-form">
+                  <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- <el-row>
+              <el-col :span="8">
+                <el-form-item label="单位名称：" prop="dwmc">
+                  <el-input v-model="formInline.dwmc" placeholder="请输入单位名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="系统状态：" prop="xtzt">
+                  <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
+                    <el-option
+                      v-for="dict in dict.type.zc_xtzt"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" style="text-align: right;padding-right: 50px;">
+                <el-form-item>
+                  <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row> -->
+          </el-form>
         </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
+        <main>
+          <div class="search-title">
+            <span class="search-title-span">资产列表</span>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="info"
+                  plain
+                  icon="el-icon-upload2"
+                  size="mini"
+                  @click="handleImport"
+                >导入</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                >导出</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                >新增资产</el-button>
+              </el-col>
+            </el-row>
+          </div>
+          <section>
+            <el-table v-loading="loading" :data="tableData" :height="tabHeader" :row-class-name="tableRowClassName" :max-height="tabHeader">
+              <el-table-column type="index" width="50" label="序号" align="center"/>
+              <el-table-column label="公众号名称" key="gzhmc" prop="gzhmc" align="center" />
+              <el-table-column label="所属单位" key="ssdw" prop="ssdw" align="center" />
+              <!-- <el-table-column label="单位名称" key="dwmc" prop="dwmc" align="center">
+              </el-table-column> -->
+              <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" />
+              <el-table-column label="公众号状态" key="status" prop="status" class-name="table-status" align="center">
+                <template slot-scope="scope">
+                  <span  v-if="scope.row.gzhzt == 1" style="color: #16B771;">
+                    正常
+                  </span>
+                  <span v-if="scope.row.gzhzt == 2" style="color: #F58A0C;">
+                    注销
+                  </span>
+                  <span v-if="scope.row.gzhzt == 3" style="color: #1485EF;">
+                    迁移
+                  </span>
+                  <span v-if="scope.row.gzhzt == 4" style="color: #29A07A;">
+                    受限
+                  </span>
+                  <span v-if="scope.row.gzhzt == 5" style="color: #F50C0C;">
+                    违规
+                  </span>
+                  <span v-if="scope.row.gzhzt == 6" style="color: #F58A0C;">
+                    未知
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
+                <template slot-scope="scope">
+                  <div style="display: flex;align-items: center;justify-content: center;">
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,1)">
+                      <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                      <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
+                    </div>
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
+                      <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
+                      <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
+                    </div>
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,3)">
+                      <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
+                      <span class="look-info" style="color: #F50C0C;margin-right: 15px;">删除</span>
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </section>
+          <my-pagination 
+            id="L-pagination"
+            :total="total"
+            :page="formInline.current"
+            :limit="formInline.size"
+            @pagination="getPagination"
+            :current-page.sync="formInline.current" 
+          ></my-pagination>
+        </main>
+        <!-- 资产导入对话框 -->
+        <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+            ref="upload"
+            :limit="1"
+            accept=".xlsx, .xls"
+            :headers="upload.headers"
+            :action="upload.url + '?updateSupport=' + upload.updateSupport"
+            :disabled="upload.isUploading"
+            :on-progress="handleFileUploadProgress"
+            :on-success="handleFileSuccess"
+            :auto-upload="false"
+            drag
+          >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__tip text-center" slot="tip">
+              <!-- <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+              </div> -->
+              <span>仅允许导入xls、xlsx格式文件。</span>
+              <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+            </div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+        </el-dialog>
       </div>
-    </el-dialog>
-  </div>
+    </el-col>
+  </el-row>
 </template>
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
 // import myDialog from "@/views/components/myDialog/index.vue"
 import { getToken } from "@/utils/auth";
-import { assetOfficialAccountList, deleteAssetOfficialAccount } from "@/api/auditPagesApi/index";
+import { assetOfficialAccountList, deleteAssetOfficialAccount, schema } from "@/api/auditPagesApi/index";
 export default {
   dicts: ['zc_xtzt','zc_xtlx'],
   components:{myPagination},
   data() {
     return {
+      // 部门树选项
+      deptOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       formInline:{
         gzhmc:"",
         dwmc:"",
@@ -228,6 +254,7 @@ export default {
   },
   mounted(){
     this.getList();
+    this.getDeptTree();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
   },
@@ -235,6 +262,22 @@ export default {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   methods:{
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      schema({type:2}).then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.formInline.deptId = data.id;
+      this.handleQuery();
+    },
     // 获取列表
     getList(){
       this.loading = true;
@@ -248,6 +291,8 @@ export default {
     resetQuery(){
       this.resetForm("queryForm");
       this.time = [];
+      this.formInline.deptId = undefined;
+      this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     // 查询
diff --git a/src/views/auditPages/assetsManagement/program.vue b/src/views/auditPages/assetsManagement/program.vue
index 5b8645a..3cdd72a 100644
--- a/src/views/auditPages/assetsManagement/program.vue
+++ b/src/views/auditPages/assetsManagement/program.vue
@@ -1,200 +1,226 @@
 <!-- 资产管理 -- 小程序 -->
 <template>
-  <div class="L-main" id="L-size-main">
-    <div class="content-search" id="L-header">
-      <div class="search-title">查询条件</div>
-      <el-form :inline="true" ref="queryForm" :model="formInline" size="small" class="demo-form-inline" label-width="100px">
-        <el-row>
-          <el-col :span="7">
-            <el-form-item label="所属单位：" prop="dwmc">
-              <el-input v-model="formInline.dwmc" placeholder="请输入所属单位"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="小程序名称：" prop="xcxmc">
-              <el-input v-model="formInline.xcxmc" placeholder="请输入小程序名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="新增时间：" prop="time">
-              <el-date-picker
-                v-model="time"
-                format="yyyy-MM-dd HH:mm:ss"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                type="datetimerange"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                placeholder="请选择"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3" style="text-align: right;">
-            <el-form-item class="unit-form">
-              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
-              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <!-- <el-row>
-          <el-col :span="8">
-            <el-form-item label="小程序状态：" prop="xtzt">
-              <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
-                <el-option
-                  v-for="dict in dict.type.gzh_state"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="16" style="text-align: right;padding-right: 30px;">
-            <el-form-item>
-              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
-              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-      </el-form>
-    </div>
-    <main>
-      <div class="search-title">
-        <span class="search-title-span">资产列表</span>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-            >导出</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-            >新增资产</el-button>
-          </el-col>
-        </el-row>
+  <el-row :gutter="20" style="height: 100%;background-color: #F2F4F6;display: flex;">
+    <!--部门数据-->
+    <el-col :span="3" :xs="24" style="margin-right: 10px;height: 100%; background-color: #fff;padding-top: 20px;">
+      <div class="head-container">
+        <el-tree
+          :data="deptOptions"
+          :props="defaultProps"
+          :expand-on-click-node="false"
+          :filter-node-method="filterNode"
+          ref="tree"
+          node-key="id"
+          default-expand-all
+          highlight-current
+          @node-click="handleNodeClick"
+        />
       </div>
-      <section>
-        <el-table v-loading="loading" :data="tableData" :height="tabHeader" :row-class-name="tableRowClassName" :max-height="tabHeader">
-          <el-table-column type="index" width="50" label="序号" align="center"/>
-          <el-table-column label="小程序名称" key="xcxmc" prop="xcxmc" align="center">
-            <!-- <template slot-scope="scope">
-              <dict-tag :options="dict.type.zc_xtlx" :value="scope.row.xtlx"/>
-            </template> -->
-          </el-table-column>
-          <el-table-column label="所属单位" key="ssdw" prop="ssdw" align="center" />
-          <!-- <el-table-column label="单位名称" key="dwmc" prop="dwmc" align="center">
-          </el-table-column> -->
-          <!-- <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" /> -->
-          <el-table-column label="小程序状态" key="state" prop="state" class-name="table-status" align="center">
-            <template slot-scope="scope">
-              <span  v-if="scope.row.state == 1" style="color: #16B771;">
-                正常
-              </span>
-              <span v-if="scope.row.state == 2" style="color: #F58A0C;">
-                注销
-              </span>
-              <span v-if="scope.row.state == 3" style="color: #1485EF;">
-                迁移
-              </span>
-              <span v-if="scope.row.state == 4" style="color: #29A07A;">
-                受限
-              </span>
-              <span v-if="scope.row.state == 5" style="color: #F50C0C;">
-                违规
-              </span>
-              <span v-if="scope.row.state == 6" style="color: #F58A0C;">
-                未知
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
-            <template slot-scope="scope">
-              <div style="display: flex;align-items: center;justify-content: center;">
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,1)">
-                  <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
-                </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
-                  <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
-                  <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
-                </div>
-                <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,3)">
-                  <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
-                  <span class="look-info" style="color: #F50C0C;margin-right: 15px;">删除</span>
-                </div>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </section>
-      <my-pagination 
-        id="L-pagination"
-        :total="total"
-        :page="formInline.current"
-        :limit="formInline.size"
-        @pagination="getPagination"
-        :current-page.sync="formInline.current" 
-      ></my-pagination>
-    </main>
-    <!-- 资产导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <!-- <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
-          </div> -->
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+    </el-col>
+    <el-col :span="20" :xs="24" style="height: 100%;flex: 1;">
+      <div class="L-main" id="L-size-main">
+        <div class="content-search" id="L-header">
+          <div class="search-title">查询条件</div>
+          <el-form :inline="true" ref="queryForm" :model="formInline" size="small" class="demo-form-inline" label-width="100px">
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="所属单位：" prop="dwmc">
+                  <el-input v-model="formInline.dwmc" placeholder="请输入所属单位"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="小程序名称：" prop="xcxmc">
+                  <el-input v-model="formInline.xcxmc" placeholder="请输入小程序名称"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="新增时间：" prop="time">
+                  <el-date-picker
+                    v-model="time"
+                    format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    type="datetimerange"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    placeholder="请选择"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6" style="text-align: right;">
+                <el-form-item class="unit-form">
+                  <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <!-- <el-row>
+              <el-col :span="8">
+                <el-form-item label="小程序状态：" prop="xtzt">
+                  <el-select v-model="formInline.xtzt" placeholder="请选择系统状态">
+                    <el-option
+                      v-for="dict in dict.type.gzh_state"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="16" style="text-align: right;padding-right: 30px;">
+                <el-form-item>
+                  <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+                  <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row> -->
+          </el-form>
         </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
+        <main>
+          <div class="search-title">
+            <span class="search-title-span">资产列表</span>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="info"
+                  plain
+                  icon="el-icon-upload2"
+                  size="mini"
+                  @click="handleImport"
+                >导入</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                >导出</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                >新增资产</el-button>
+              </el-col>
+            </el-row>
+          </div>
+          <section>
+            <el-table v-loading="loading" :data="tableData" :height="tabHeader" :row-class-name="tableRowClassName" :max-height="tabHeader">
+              <el-table-column type="index" width="50" label="序号" align="center"/>
+              <el-table-column label="小程序名称" key="xcxmc" prop="xcxmc" align="center">
+                <!-- <template slot-scope="scope">
+                  <dict-tag :options="dict.type.zc_xtlx" :value="scope.row.xtlx"/>
+                </template> -->
+              </el-table-column>
+              <el-table-column label="所属单位" key="ssdw" prop="ssdw" align="center" />
+              <!-- <el-table-column label="单位名称" key="dwmc" prop="dwmc" align="center">
+              </el-table-column> -->
+              <!-- <el-table-column label="新增时间" key="createTime" prop="createTime" align="center" /> -->
+              <el-table-column label="小程序状态" key="state" prop="state" class-name="table-status" align="center">
+                <template slot-scope="scope">
+                  <span  v-if="scope.row.state == 1" style="color: #16B771;">
+                    正常
+                  </span>
+                  <span v-if="scope.row.state == 2" style="color: #F58A0C;">
+                    注销
+                  </span>
+                  <span v-if="scope.row.state == 3" style="color: #1485EF;">
+                    迁移
+                  </span>
+                  <span v-if="scope.row.state == 4" style="color: #29A07A;">
+                    受限
+                  </span>
+                  <span v-if="scope.row.state == 5" style="color: #F50C0C;">
+                    违规
+                  </span>
+                  <span v-if="scope.row.state == 6" style="color: #F58A0C;">
+                    未知
+                  </span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" prop="userId" class-name="table-operation" align="center">
+                <template slot-scope="scope">
+                  <div style="display: flex;align-items: center;justify-content: center;">
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,1)">
+                      <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                      <span class="look-info" style="color: #1485EF;margin-right: 15px;">查看</span>
+                    </div>
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,2)">
+                      <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
+                      <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
+                    </div>
+                    <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row,3)">
+                      <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;">
+                      <span class="look-info" style="color: #F50C0C;margin-right: 15px;">删除</span>
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </section>
+          <my-pagination 
+            id="L-pagination"
+            :total="total"
+            :page="formInline.current"
+            :limit="formInline.size"
+            @pagination="getPagination"
+            :current-page.sync="formInline.current" 
+          ></my-pagination>
+        </main>
+        <!-- 资产导入对话框 -->
+        <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+            ref="upload"
+            :limit="1"
+            accept=".xlsx, .xls"
+            :headers="upload.headers"
+            :action="upload.url + '?updateSupport=' + upload.updateSupport"
+            :disabled="upload.isUploading"
+            :on-progress="handleFileUploadProgress"
+            :on-success="handleFileSuccess"
+            :auto-upload="false"
+            drag
+          >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__tip text-center" slot="tip">
+              <!-- <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+              </div> -->
+              <span>仅允许导入xls、xlsx格式文件。</span>
+              <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+            </div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitFileForm">确 定</el-button>
+            <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+        </el-dialog>
       </div>
-    </el-dialog>
-  </div>
+    </el-col>
+  </el-row>
 </template>
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
 // import myDialog from "@/views/components/myDialog/index.vue"
 import { getToken } from "@/utils/auth";
-import { miniProgramsList, deleteMiniPrograms } from "@/api/auditPagesApi/index";
+import { miniProgramsList, deleteMiniPrograms, schema } from "@/api/auditPagesApi/index";
 export default {
   dicts: ['gzh_state'],
   components:{myPagination},
   data() {
     return {
+      // 部门树选项
+      deptOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       formInline:{
         dwmc:"",
         xcxmc:"",
@@ -227,6 +253,7 @@ export default {
   },
   mounted(){
     this.getList();
+    this.getDeptTree();
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
   },
@@ -234,6 +261,22 @@ export default {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   methods:{
+    /** 查询部门下拉树结构 */
+    getDeptTree() {
+      schema({type:1}).then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.formInline.deptId = data.id;
+      this.handleQuery();
+    },
     // 获取列表
     getList(){
       this.loading = true;
@@ -247,6 +290,8 @@ export default {
     resetQuery(){
       this.resetForm("queryForm");
       this.time = [];
+      this.formInline.deptId = undefined;
+      this.$refs.tree.setCurrentKey(null);
       this.handleQuery();
     },
     // 查询
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f3fa14c..18e316c 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -285,7 +285,7 @@
                       <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
                       <span class="look-info" style="color: #1485EF;">编辑</span>
                     </div>
-                    <div v-if="roles.includes('admin')" style="display: flex;align-items: center;cursor: pointer; margin-left: 10px;" @click="changePassword(scope.row)">
+                    <div v-if="roles.includes('admin') || roles.includes('common')" style="display: flex;align-items: center;cursor: pointer; margin-left: 10px;" @click="changePassword(scope.row)">
                       <!-- <img src="@/assets/images/del.png" alt="" style="width: 20px;margin-right: 5px;"> -->
                       <i class="el-icon-refresh-right" style="width: 20px;margin-right: 5px;color: #1485EF;font-size: 20px;"></i>
                       <span class="look-info" style="color: #1485EF;">重置密码</span>