Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

src/views/core/accessPlan/index.vue

@@ -1,103 +1,110 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-
-      <el-form-item label="机构类型" prop="orgType">
-        <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择">
-          <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
-            :value="`${dict.value}`"></el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="调阅角色" prop="roleId">
-        <el-select v-model="queryParams.roleId" placeholder="请选择">
-          <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="调阅周期" prop="planCycle">
-        <el-select style="width: 100%;" v-model="queryParams.planCycle" placeholder="请选择">
-          <el-option v-for="dict in dict.type.sys_access_cycle" :key="dict.value" :label="dict.label"
-            :value="`${dict.value}`"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="planStatus">
-        <el-select style="width: 100%;" v-model="queryParams.planStatus" placeholder="请选择">
-          <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
-            :value="`${dict.value}`"></el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="计划名称" prop="planName">
-        <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['system:plan:add']">新增计划</el-button>
-      </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['system:plan:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['system:plan:remove']">删除</el-button>
+    <el-row :gutter="20">
+      <!--机构数据-->
+      <el-col :span="4" :xs="24">
+
+        <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
+          @click="clickTreeNode" hangsheTree></org-tree>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['system:plan:export']">导出</el-button>
-      </el-col> -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+      <!--搜索栏-->
+
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+          <el-form-item label="机构类型" prop="orgType">
+            <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择">
+              <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
+                :value="`${dict.value}`"></el-option>
+            </el-select>
+          </el-form-item>
+
+
+          <el-form-item label="调阅角色" prop="roleId">
+            <el-select v-model="queryParams.roleId" placeholder="请选择">
+              <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="调阅周期" prop="planCycle">
+            <el-select style="width: 100%;" v-model="queryParams.planCycle" placeholder="请选择">
+              <el-option v-for="dict in dict.type.sys_access_cycle" :key="dict.value" :label="dict.label"
+                :value="`${dict.value}`"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="状态" prop="planStatus">
+            <el-select style="width: 100%;" v-model="queryParams.planStatus" placeholder="请选择">
+              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+                :value="`${dict.value}`"></el-option>
+            </el-select>
+          </el-form-item>
 
-    <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="计划所属机构" align="center" prop="orgName" />
-      <el-table-column label="计划名称" align="center" prop="planName" />
+          <el-form-item label="计划名称" prop="planName">
+            <el-input v-model="queryParams.planName" placeholder="请输入计划名称" clearable @keyup.enter.native="handleQuery" />
+          </el-form-item>
 
-      <el-table-column label="机构类型" align="center" key="orgType" prop="orgType"  width="80">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+              v-hasPermi="['system:plan:add']">新增计划</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="planList" @selection-change="handleSelectionChange" row-key="id"
+          :tree-props="{ children: 'children' }">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="计划所属机构" align="center" prop="orgName" />
+          <el-table-column label="计划名称" align="center" prop="planName" />
+
+          <el-table-column label="机构类型" align="center" key="orgType" prop="orgType" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.orgType" />
             </template>
           </el-table-column>
-      <el-table-column label="调阅角色" align="center" prop="roleName" />
+          <el-table-column label="调阅角色" align="center" prop="roleName" />
 
-      <el-table-column label="调阅周期" align="center" key="planCycle" prop="planCycle"  width="80">
+          <el-table-column label="调阅周期" align="center" key="planCycle" prop="planCycle" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_access_cycle" :value="scope.row.planCycle" />
             </template>
           </el-table-column>
-      <el-table-column label="调阅频次" align="center" prop="planFrequency" />
+          <el-table-column label="调阅频次" align="center" prop="planFrequency" />
 
-      <el-table-column label="计划状态" align="center" key="planStatus" prop="planStatus"  width="80">
+          <el-table-column label="计划状态" align="center" key="planStatus" prop="planStatus" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.planStatus" />
             </template>
           </el-table-column>
-      <el-table-column label="修改人" align="center" prop="updateBy" />
-      <el-table-column label="修改时间" align="center" prop="updateTime" />
-      <el-table-column label="备注" align="center" prop="description" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:plan:edit']">修改</el-button>
-          <el-button size="mini" type="text" v-if="scope.row.planStatus!=0" icon="el-icon-add" @click="handDistribute(scope.row)"
-            v-hasPermi="['system:plan:add']">下发</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+          <el-table-column label="修改人" align="center" prop="updateBy" />
+          <el-table-column label="修改时间" align="center" prop="updateTime" />
+          <el-table-column label="备注" align="center" prop="description" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:plan:edit']">修改</el-button>
+              <el-button size="mini" type="text" v-if="scope.row.planStatus != 0" icon="el-icon-add"
+                @click="handDistribute(scope.row)" v-hasPermi="['system:plan:add']">下发</el-button>
+              <el-button size="mini" type="text" v-if="scope.row.planStatus != 0" icon="el-icon-add"
+                @click="handDistribute(scope.row)" v-hasPermi="['system:plan:add']">删除</el-button>
+
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['system:device:remove']">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          @pagination="getList" />
+      </el-col>
+
+    </el-row>
 
     <!-- 添加或修改监控调阅计划对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -107,53 +114,45 @@
         </el-form-item>
 
         <el-form-item label="调阅机构类型" prop="orgType">
-        <el-select style="width: 100%;" v-model="form.orgType" placeholder="请选择">
-          <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
-            :value="`${dict.value}`"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="调阅周期" prop="planCycle">
-        <el-select style="width: 100%;" v-model="form.planCycle" placeholder="请选择">
-          <el-option v-for="dict in dict.type.sys_access_cycle" :key="dict.value" :label="dict.label"
-            :value="`${dict.value}`"></el-option>
-        </el-select>
-      </el-form-item>
+          <el-select style="width: 100%;" v-model="form.orgType" placeholder="请选择">
+            <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
+              :value="`${dict.value}`"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="调阅周期" prop="planCycle">
+          <el-select style="width: 100%;" v-model="form.planCycle" placeholder="请选择">
+            <el-option v-for="dict in dict.type.sys_access_cycle" :key="dict.value" :label="dict.label"
+              :value="`${dict.value}`"></el-option>
+          </el-select>
+        </el-form-item>
 
 
 
 
-            <el-form-item style="width: 100%;" v-if="form.planCycle==0" label="开始时间" prop="startTime">
-              <el-date-picker
-                clearable
-                v-model="form.startTime"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择时间">
-              </el-date-picker>
-            </el-form-item>
+        <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="开始时间" prop="startTime">
+          <el-date-picker clearable v-model="form.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择时间">
+          </el-date-picker>
+        </el-form-item>
 
 
 
 
-            <el-form-item style="width: 100%;" v-if="form.planCycle==0" label="结束时间" prop="endTime">
-              <el-date-picker
-                clearable
-                v-model="form.endTime"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择时间">
-              </el-date-picker>
-            </el-form-item>
+        <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="结束时间" prop="endTime">
+          <el-date-picker clearable v-model="form.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择时间">
+          </el-date-picker>
+        </el-form-item>
 
 
 
-      <el-form-item label="调阅角色" prop="roleId">
-        <el-select style="width: 100%;" v-model="form.roleId" placeholder="请选择">
-          <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
+        <el-form-item label="调阅角色" prop="roleId">
+          <el-select style="width: 100%;" v-model="form.roleId" placeholder="请选择">
+            <el-option v-for="item in roleList" :key="item.id" :label="item.roleName" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="调阅频次" prop="planFrequency">
-          <el-input type="number" v-model.number="form.planFrequency"  placeholder="请输入调阅频次" />
+          <el-input type="number" v-model.number="form.planFrequency" placeholder="请输入调阅频次" />
         </el-form-item>
         <el-form-item label="备注" prop="description">
           <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
@@ -168,18 +167,26 @@
 </template>
 
 <script>
-import { listPlan, getPlan, delPlan, addPlan, updatePlan,distribute } from "@/api/core/accessPlan";
+import { listPlan, getPlan, delPlan, addPlan, updatePlan, distribute } from "@/api/core/accessPlan";
 import { listRole } from "@/api/system/role";
+import tableList from "@/mixins/tableList";
+import orgTree from "@/components/orgTree";
+import { deptTreeSelect } from "@/api/system/public";
+import KFileUpload from "@/components/K-FileUpload/index.vue";
+
 export default {
   name: "Plan",
-  dicts: ['sys_org_type','sys_access_cycle','sys_normal_disable'],
+  dicts: ['sys_org_type', 'sys_access_cycle', 'sys_normal_disable'],
+  components:{
+    orgTree
+  },
   data() {
     return {
       // 遮罩层
       loading: true,
       // 选中数组
       ids: [],
-      names:[],
+      names: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -263,11 +270,32 @@ export default {
       };
       this.resetForm("form");
     },
+    getDefaultKey(key) {
+      this.queryParams.orgId = key;
+      this.getList();
+    },
+    //单选框状态改变
+    checkChange(state) {
+      this.queryParams.checkSub = state;
+      this.handleQuery();
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    // 节点单击事件
+    clickTreeNode(data) {
+      //this.initPlanRoleList();
+      this.queryParams.orgId = data.id;
+      this.handleQuery();
+    },
+    /** 查询机构树数据 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
@@ -276,7 +304,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.names=selection.map(item => item.planName)
+      this.names = selection.map(item => item.planName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -319,7 +347,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      const names=row.planName || this.names;
+      const names = row.planName || this.names;
       this.$modal.confirm('是否确认删除监控调阅计划"' + names + '"的数据项？').then(function () {
         return delPlan(ids);
       }).then(() => {
@@ -327,7 +355,7 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },
-    handDistribute(row){
+    handDistribute(row) {
       this.$modal.confirm('是否确认下发监控调阅计划"' + row.planName + '"的数据项？').then(function () {
         return distribute(row.id);
       }).then(() => {

src/views/system/area/index.vue

@@ -66,7 +66,7 @@
           v-hasPermi="['system:area:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -75,7 +75,7 @@
           @click="handleExport"
           v-hasPermi="['system:area:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/system/check/index.vue

@@ -35,10 +35,10 @@
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['system:check:remove']">删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['system:check:export']">导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/system/dept/index.vue

@@ -93,11 +93,11 @@
     </el-row>
 
     <!-- 添加或修改机构对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" @close="closeHandler" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24">
-            <el-form-item v-if="this.pId != -1" label="上级机构" prop="parentId">
+            <el-form-item v-if="this.pId !=-1" label="上级机构" prop="parentId">
               <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级机构" />
             </el-form-item>
           </el-col>
@@ -234,11 +234,21 @@ export default {
       defaultKeys: []
     };
   },
+  computed: {
+    isShow() {
+      if((this.pId==null&&this.pId!=-1)){
+        return true
+      }
+    }
+  },
   created() {
     this.getDeptTree();
     this.getList();
   },
   methods: {
+    closeHandler(){
+     // alert(11111)
+    },
     getPageIndex($index) {
       //表格序号
       return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1

src/views/system/device/index.vue

@@ -39,10 +39,10 @@
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['system:device:remove']">删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['system:device:export']">导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/system/menu/index.vue

@@ -131,9 +131,9 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime">
-        <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
+        </template> -->
       </el-table-column>
       <el-table-column
         label="操作"