提交

src/views/core/accessPlan/index.vue

@@ -1,125 +1,116 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
                   <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
                     @click="clickTreeNode" :defaultCheckSub="false"></org-tree>
       </el-col>
       <!--搜索栏-->
-
       <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="planName">
-            <el-input v-model="queryParams.planName" placeholder="请输入关键字" maxlength="50" clearable
-                      @keyup.enter.native="handleQuery"/>
-          </el-form-item>
-          <el-form-item label="机构类型" prop="orgType">
-            <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择机构类型" @change="changeSelect">
-              <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.edu_plan_status" :key="dict.value" :label="dict.label"
-                         :value="`${dict.value}`"></el-option>
-            </el-select>
-          </el-form-item>
-
-
-
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
-                       v-hasPermi="['core:accessPlan:list']">搜索
-            </el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <div class="main-right-box">
+          <div class="main-search-box">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+            <el-form-item label="任务名称" prop="planName">
+              <el-input v-model="queryParams.planName" placeholder="请输入关键字" maxlength="50" clearable @keyup.enter.native="handleQuery"/>
           </el-form-item>
+            <el-form-item label="机构类型" prop="orgType">
+              <el-select style="width: 100%;" v-model="queryParams.orgType" placeholder="请选择机构类型" @change="changeSelect">
+                <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.edu_plan_status" :key="dict.value" :label="dict.label"
+                           :value="`${dict.value}`"></el-option>
+              </el-select>
+            </el-form-item>
         </el-form>
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+                           v-hasPermi="['core:accessPlan:list']">搜索
+                </el-button>
 
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
-                 v-hasPermi="['core:accessPlan:add']"  v-if="check==true" >新增任务
-            </el-button>
-          </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table border
-                  height="600"
-                  size="small"
-                  v-loading="loading" :data="planList" row-key="id">
-                  <el-table-column label="序号" type="index" align="center">
-        <template slot-scope="scope">
-          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
-        </template>
-      </el-table-column>
-          <el-table-column width="140" label="任务名称" align="center" prop="planName"/>
-          <el-table-column width="140" label="创建机构" align="center" prop="orgName"/>
-          <el-table-column width="140" label="行社名称" align="center" prop="organization"/>
-          <el-table-column label="机构类型" align="center" key="orgType" prop="orgType">
-            <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-col>
+              <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+                     v-hasPermi="['core:accessPlan:add']"  v-if="check==true" >新增任务
+                </el-button>
+              </el-col>
+              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+            </el-row>
+          </div>
+          <el-table border
+                    height="600"
+                    size="small"
+                    v-loading="loading" :data="planList" row-key="id">
+            <el-table-column label="序号" type="index" align="center" width="80">
+              <template slot-scope="scope">
+                <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="140" label="任务名称" align="center" prop="planName"/>
+            <el-table-column width="140" label="创建机构" align="center" prop="orgName"/>
+            <el-table-column width="140" label="行社名称" align="center" prop="organization"/>
+            <el-table-column label="机构类型" align="center" key="orgType" prop="orgType">
+              <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" 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" key="planCycle" prop="planCycle" >
+              <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" key="planStatus" prop="planStatus" width="80">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.edu_plan_status" :value="scope.row.planStatus"/>
-            </template>
-          </el-table-column>
-          <!-- <el-table-column label="备注" align="center" prop="description"/> -->
-          <el-table-column label="操作" fixed="right" width="150px" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button size="mini" type="text" v-if="scope.row.parentId==null&& scope.row.orgId==isEdit&&scope.row.isDistribute == 0 && (scope.row.planStatus==0||scope.row.planStatus==2)" icon="el-icon-d-arrow-right" style="transform: rotate(90deg);"
-                         @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">
-              </el-button>
-              <el-button size="mini" type="text" v-if="scope.row.parentId==null&& scope.row.orgId==isEdit&&scope.row.isDistribute == 0 && (scope.row.planStatus==0||scope.row.planStatus==2)"
-                         @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发
-              </el-button>
-              <el-button size="mini" type="text" v-if="scope.row.orgId==isEdit&&scope.row.isDistribute == 1 && scope.row.planStatus==1&&scope.row.parentId==null" icon="el-icon-refresh-left"
-                         @click="handWithdraw(scope.row)" >撤回
-              </el-button>
-              <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-if="scope.row.orgId==isEdit&&check==true"
-                         v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">编辑
-              </el-button>
-         
-              <el-button size="mini" type="text" v-if="scope.row.parentOrgId==isEdit&&scope.row.parentId==null && check==true" icon="el-icon-delete" @click="handleDelete(scope.row)" 
-                         v-hasPermi="['core:accessPlan:remove']">删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+            <el-table-column label="任务状态" align="center" key="planStatus" prop="planStatus" >
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.edu_plan_status" :value="scope.row.planStatus"/>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="备注" align="center" prop="description"/> -->
+            <el-table-column label="操作" fixed="right" width="220px" align="left" class-name="small-padding fixed-width">
+              <template slot-scope="scope">
+                <el-button size="mini" type="text" icon="el-icon-arrow-down" v-if="scope.row.parentId==null&& scope.row.orgId==isEdit&&scope.row.isDistribute == 0 && (scope.row.planStatus==0||scope.row.planStatus==2)"
+                           @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发
+                </el-button>
+                <el-button size="mini" type="text" icon="el-icon-top-left" v-if="scope.row.orgId==isEdit&&scope.row.isDistribute == 1 && scope.row.planStatus==1&&scope.row.parentId==null"
+                           @click="handWithdraw(scope.row)" >撤回
+                </el-button>
+                <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-if="scope.row.orgId==isEdit&&check==true"
+                           v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">编辑
+                </el-button>
 
-                    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                    :limit.sync="queryParams.pageSize"
-                    @pagination="getList"/>
+                <el-button size="mini" type="text" v-if="scope.row.parentOrgId==isEdit&&scope.row.parentId==null && check==true" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                           v-hasPermi="['core:accessPlan: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"/>
+        </div>
       </el-col>
-
     </el-row>
 
     <!-- 添加或修改监控调阅计划对话框 -->
@@ -159,9 +150,9 @@
                 默认从下个周期生成任务，
                 <br/>
                 勾选后从当前周期立即生成任务
-                
+
               </el-checkbox>
-            </el-form-item> 
+            </el-form-item>
         <el-form-item prop="startTime" v-if="form.planCycle == 0" label="开始日期">
           <el-date-picker style="width: 100%;" v-model="form.startTime" @change="startDateChanged" :picker-options="startDatepickerOptions"
                           align="right" type="date" placeholder="选择开始日期" :disabled="form.isEdit||form.isComplete">
@@ -173,8 +164,8 @@
           </el-date-picker>
         </el-form-item>
 
-     
-  
+
+
 
         <el-form-item label="备注" prop="description">
           <el-input v-model="form.description" type="textarea" placeholder="请输入备注" :disabled="form.isEdit||form.isComplete"/>
@@ -423,7 +414,7 @@
         const id = row.id || this.ids
         getPlan(id).then(response => {
           this.form = response.data;
-          this.initNum = response.data.parentFrequency; 
+          this.initNum = response.data.parentFrequency;
 this.issue=response.data.updateBy;
           this.open = true;
           this.title = "编辑监控调阅任务";

src/views/system/device/index.vue

@@ -16,11 +16,11 @@
           <div class="main-search-box">
               <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
                        label-width="68px">
-                <el-form-item label="设备名称" prop="deviceName">
+                <el-form-item label="设备名称" prop="deviceName" label-width="80">
                   <el-input v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
                             @keyup.enter.native="handleQuery" />
                 </el-form-item>
-                <el-form-item label="设备类别" prop="assetType">
+                <el-form-item label="设备类别" prop="assetType" label-width="80">
 
                   <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择设备类别"
                              @change="searchChangeSelectDevice">
@@ -29,7 +29,7 @@
                   </el-select>
                 </el-form-item>
 
-                <el-form-item label="设备分类" prop="deviceType">
+                <el-form-item label="设备分类" prop="deviceType" label-width="80">
 
                   <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择设备种类">
                     <el-option v-for="item in searchDevices" :key="item.dictValue" :label="item.dictLabel"
@@ -38,7 +38,7 @@
                 </el-form-item>
 
                 <el-form-item>
-                  <el-button
+                  <!-- <el-button
                     type="primary"
                     icon="el-icon-search"
                     size="mini"
@@ -47,13 +47,34 @@
                   >
                   <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
                   >重置</el-button
-                  >
+                  > -->
                 </el-form-item>
               </el-form>
               <el-row :gutter="10">
                 <el-col :span="1.5">
                   <el-button
                     type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                  >搜索</el-button
+                  >
+                </el-col>
+                <el-col :span="1.5">
+                  <el-button
+                    type="primary"
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+               
+                  >重置</el-button
+                  >
+                </el-col>
+
+
+                <el-col :span="1.5">
+                  <el-button
+                    type="primary"
                     icon="el-icon-plus"
                     size="mini"
                     @click="handleAdd"