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

src/views/resumption/taskManager/dialog.detail.vue

@@ -6,7 +6,11 @@
       width="1200px"
       :destroy-on-close="true"
     >
-      <el-descriptions :column="2" v-if="detail" style="width:80%;margin-left:10%;">
+      <el-descriptions
+        :column="2"
+        v-if="detail"
+        style="width: 80%; margin-left: 10%"
+      >
         <el-descriptions-item label="任务名称">{{
           detail.taskName
         }}</el-descriptions-item>
@@ -35,6 +39,7 @@
         }}</el-descriptions-item>
       </el-descriptions>
       <el-table
+        size="small"
         :data="tableData"
         row-key="itemId"
         height="441"
@@ -46,6 +51,7 @@
         <el-table-column type="expand">
           <template slot-scope="props">
             <el-table
+              size="small"
               v-if="props.row.dataInfoList"
               :data="props.row.dataInfoList"
             >
@@ -96,12 +102,12 @@
               >
               </el-table-column> -->
               <el-table-column
-              label="问题描述"
-              align="center"
-              :show-overflow-tooltip="true"
-              prop="resRemark"
-            >
-            </el-table-column>
+                label="问题描述"
+                align="center"
+                :show-overflow-tooltip="true"
+                prop="resRemark"
+              >
+              </el-table-column>
               <el-table-column label="异常图片" align="center">
                 <template slot-scope="scope">
                   <div
@@ -119,13 +125,12 @@
                     </el-image>
                   </div>
                 </template>
-              </el-table-column>             
+              </el-table-column>
             </el-table>
           </template>
         </el-table-column>
         <el-table-column
           label="履职项"
-          
           prop="itemName"
           :show-overflow-tooltip="true"
         />
@@ -155,7 +160,7 @@ export default {
     getLabel,
     async refresh(id) {
       let detail = (await api.one(id)).data;
-      
+
       if (detail && detail.items && detail.items.length > 0) {
         this.tableData = detail.items;
       } else {

src/views/resumption/taskManager/index.vue

@@ -183,7 +183,7 @@
               header-align="center"
               align="center"
               prop="abnormalDataNums"
-              label="隐患数量"
+              label="隐患问题数"
               width="90"
               v-if="columns[6].visible"
             >

src/views/system/device/index.vue

@@ -37,7 +37,7 @@
                 </el-form-item>
               </el-form>
               <el-row :gutter="10">
-                <el-col :span="1.5">
+                <!-- <el-col :span="1.5">
                   <el-button
                     type="primary"
                     icon="el-icon-search"
@@ -50,7 +50,7 @@
                   <el-button    type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
                   >重置</el-button
                   >
-                </el-col>
+                </el-col> -->
                 <el-col :span="1.5">
                   <el-button
                     type="primary"
@@ -679,6 +679,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.devices = null;
+      this.searchDevices=null;
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/system/workTimeSet/dialog.add.vue

@@ -125,8 +125,8 @@
 <!--      </div>-->
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="handleClose">取消</el-button>
         <btn-tip tip="确定要提交吗?" type="primary" @click="onSubmit">保存</btn-tip>
+        <el-button @click="handleClose">取消</el-button>
       </div>
     </DialogCom>
   </div>

src/views/system/workTimeSet/dialog.edit.vue

@@ -96,8 +96,8 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="handleClose">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
+        <el-button @click="handleClose">取消</el-button>
       </div>
     </DialogCom>
   </div>

src/views/system/workTimeSet/dialog.template.vue

@@ -149,8 +149,8 @@
         center>
       <span>已存在其他生效的配置，将会生成{{checkMsg}}的作息，是否提交?</span>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="handleClose()">取消</el-button>
         <el-button type="primary" @click="checkDataMsg(1)">提交</el-button>
+        <el-button @click="handleClose()">取消</el-button>
       </span>
     </DialogCom>
   </div>

src/views/system/workTimeSet/index.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="app-container" style="padding-top: 0;">
+  <div class="workTime app-container">
 
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="作息配置" name="作息配置">
         <work-time></work-time>
       </el-tab-pane>
-      <el-tab-pane v-hasPermi="['system:time:week']" label="模板配置作息" name="按周配置作息" lazy>
+      <el-tab-pane v-hasPermi="['system:time:week']" label="模板配置作息" name="按周配置作息">
         <work-time-week ></work-time-week>
       </el-tab-pane>
     </el-tabs>
@@ -34,7 +34,17 @@ export default {
 };
 </script>
 <style lang="scss">
-
+.workTime{
+  .el-tabs__header{
+    margin-bottom: 10px;
+    background-color: #fff;
+    padding: 0 10px;
+    box-shadow: 0 2px 8px #eee;
+  }
+  .el-tabs__nav-wrap::after{
+    background-color: #fff;
+  }
+}
 </style>
 <style lang="scss" scoped>
 

src/views/system/workTimeSet/workTime.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="tabs-container">
-    <el-row :gutter="20">
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree
@@ -12,109 +12,107 @@
       </el-col>
       <!--table数据-->
       <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="起止日期">
-            <el-date-picker
-              v-model="queryParams.range"
-              style="width: 240px"
-              value-format="yyyy-MM-dd hh:mm:ss"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :clearable="false"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item label="营业状态" prop="status">
-            <el-select
-              v-model="queryParams.isEnable"
-              placeholder="请选择"
-              clearable
-              style="width: 240px"
-            >
-              <el-option
-                v-for="dict in dict.type.sys_business_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleQuery"
-              >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetForm"
-              >重置</el-button
-            >
-          </el-form-item>
-        </el-form>
-
-        <!--    按纽    -->
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              size="mini"
-              icon="el-icon-thumb"
-              @click="clickAdd"
-              v-hasPermi="['system:time:add']"
-              >新增作息配置</el-button
-            >
-          </el-col>
-          <el-col :span="1.5">
-            <!-- <el-button
-                type="warning"
-                plain
-                icon="el-icon-download"
+        <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="起止日期">
+                <el-date-picker
+                  v-model="queryParams.range"
+                  style="width: 240px"
+                  value-format="yyyy-MM-dd hh:mm:ss"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :clearable="false"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item label="营业状态" prop="status">
+                <el-select
+                  v-model="queryParams.isEnable"
+                  placeholder="请选择"
+                  clearable
+                  style="width: 240px"
+                >
+                  <el-option
+                    v-for="dict in dict.type.sys_business_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </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"
+                >搜索</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetForm"
+                >重置</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  icon="el-icon-thumb"
+                  @click="clickAdd"
+                  v-hasPermi="['system:time:add']"
+                  >新增作息配置</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <!-- <el-button
+                    type="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    v-hasPermi="['system:time:export']">导出</el-button> -->
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
                 size="mini"
-                @click="handleExport"
-                v-hasPermi="['system:time:export']">导出</el-button> -->
-          </el-col>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            size="mini"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
-        </el-row>
-
-        <el-table
-          height="600"
-          size="small"
-          v-loading="loading"
-          style="width: auto"
-          border
-          :data="tableList"
-        >
+                @queryTable="getList"
+              ></right-toolbar>
+            </el-row>
+          </div>
+          <el-table
+            height="595"
+            size="small"
+            v-loading="loading"
+            border
+            :data="tableList"
+          >
           <el-table-column
             label="序号"
             type="index"
             align="center"
-            width="50"
+            width="70"
           ></el-table-column>
           <el-table-column
             v-if="columns[0].visible"
             prop="orgName"
+            align="center"
             label="机构"
             :show-overflow-tooltip="true"
           ></el-table-column>
-          <el-table-column v-if="columns[1].visible" label="日期">
+          <el-table-column align="center" label="日期">
             <span slot-scope="scope">{{ scope.row.ymdDate }}</span>
           </el-table-column>
-          <el-table-column v-if="columns[2].visible" label="营业状态">
+          <el-table-column align="center" label="营业状态">
             <template slot-scope="r">{{
               r.row.isEnable == "1" ? "营业" : "歇业"
             }}</template>
@@ -124,7 +122,7 @@
           <!--              <span>{{r.row.workTime}}-{{r.row.workOffTime}}</span>-->
           <!--            </template>-->
           <!--          </el-table-column>-->
-          <el-table-column v-if="columns[4].visible" label="营业时间段">
+          <el-table-column align="center" label="营业时间段">
             <template slot-scope="r">
               <span>{{ r.row.openTime }}-{{ r.row.closeTime }}</span>
             </template>
@@ -135,20 +133,21 @@
           <!--            </template>-->
           <!--          </el-table-column>-->
           <el-table-column
-            v-if="columns[6].visible"
+            align="center"
             prop="modifiedName"
             label="更新人"
           ></el-table-column>
-          <el-table-column v-if="columns[7].visible" label="更新时间">
+          <el-table-column align="center" label="更新时间">
             <span slot-scope="scope">{{ scope.row.updateTime }}</span>
           </el-table-column>
           <el-table-column
-            v-if="columns[8].visible"
-            label="操作列表"
-            width="100"
-          >
+            label="操作"
+            header-align="center"
+            align="left"
+            width="100">
             <template slot-scope="r">
               <el-button
+                icon="el-icon-edit-outline"
                 type="text"
                 v-if="hideEdit(r.row)"
                 v-hasPermi="['system:time:edit']"
@@ -158,15 +157,15 @@
             </template>
           </el-table-column>
         </el-table>
-
-        <pagination
-          class="pages-box"
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+          <pagination
+            class="pages-box"
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </el-col>
     </el-row>
 
@@ -227,7 +226,7 @@ export default {
         orgId: null,
         isEnable: "1",
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         range: [formatTime(timeb), formatTime(timea)],
       },
       total: 0,

src/views/system/workTimeSet/workTimeWeek.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="tabs-container">
-    <el-row :gutter="20">
+  <div>
+    <el-row :gutter="10">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree
@@ -12,78 +12,77 @@
       </el-col>
       <!--table数据-->
       <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="生效日期">
-            <el-date-picker
-              v-model="dateRange"
-              style="width: 240px"
-              value-format="yyyy-MM-dd hh:mm:ss"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-<!--          <el-form-item label="仅显示当前生效" label-width="120px">-->
-<!--            <el-switch-->
-<!--              v-model="queryParams.isEnable"-->
-<!--              inactive-color="#ccc">-->
-<!--            </el-switch>-->
-<!--          </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="resetForm">重置</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="addTemplate"
-              v-hasPermi="['system:time:add']"
-            >新增作息模板</el-button>
-          </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
-
-        <el-table
-          v-loading="loading"
-          style="width: auto;"
-          border
-          height="600"
-          size="small"
-          :data="tableList">
-          <el-table-column fixed label="序号" type="index" align="center" width="50"></el-table-column>
-          <el-table-column v-if="columns[0].visible" prop="orgName" label="机构" :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column v-if="columns[1].visible" prop="effectiveDate" label="生效日期" ></el-table-column>
-          <el-table-column v-if="columns[2].visible" prop="workDay" label="工作日"></el-table-column>
-          <el-table-column v-if="columns[3].visible" prop="modifiedName" label="更新人"></el-table-column>
-          <el-table-column v-if="columns[4].visible"  prop="updateTime" label="更新时间" ></el-table-column>
-          <el-table-column v-if="columns[5].visible" label="操作" width="100" >
-            <template slot-scope="r">
-<!--                <el-button type="text" v-if="r.row.timeCheck===0||r.row.timeCheck===3" @click="onEdit(r.row)">编辑</el-button>-->
-<!--                <el-button type="text" v-if="r.row.timeCheck===0" @click="onDelete(r.row.id)">删除</el-button>-->
-<!--                <el-button type="text" v-if="r.row.timeCheck===1||r.row.timeCheck===2" @click="lookItem(r.row)">查看</el-button>-->
-                <el-button type="text" @click="lookItem(r.row)">查看</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 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="生效日期">
+                <el-date-picker
+                  v-model="dateRange"
+                  style="width: 240px"
+                  value-format="yyyy-MM-dd hh:mm:ss"
+                  type="daterange"
+                  range-separator="-"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+    <!--          <el-form-item label="仅显示当前生效" label-width="120px">-->
+    <!--            <el-switch-->
+    <!--              v-model="queryParams.isEnable"-->
+    <!--              inactive-color="#ccc">-->
+    <!--            </el-switch>-->
+    <!--          </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="resetForm">重置</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="addTemplate"
+                  v-hasPermi="['system:time:add']"
+                >新增作息模板</el-button>
+              </el-col>
+              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+            </el-row>
+          </div>
+          <el-table
+            v-loading="loading"
+            border
+            height="596"
+            size="small"
+            :data="tableList">
+            <el-table-column label="序号" type="index" align="center" width="70"></el-table-column>
+            <el-table-column prop="orgName" align="center" label="机构" :show-overflow-tooltip="true"></el-table-column>
+            <el-table-column prop="effectiveDate" align="center" label="生效日期" ></el-table-column>
+            <el-table-column prop="workDay" align="center" label="工作日"></el-table-column>
+            <el-table-column prop="modifiedName" align="center" label="更新人"></el-table-column>
+            <el-table-column prop="updateTime" align="center" label="更新时间" ></el-table-column>
+            <el-table-column label="操作" header-align="center" align="left" width="100" >
+              <template slot-scope="r">
+  <!--                <el-button type="text" v-if="r.row.timeCheck===0||r.row.timeCheck===3" @click="onEdit(r.row)">编辑</el-button>-->
+  <!--                <el-button type="text" v-if="r.row.timeCheck===0" @click="onDelete(r.row.id)">删除</el-button>-->
+  <!--                <el-button type="text" v-if="r.row.timeCheck===1||r.row.timeCheck===2" @click="lookItem(r.row)">查看</el-button>-->
+                  <el-button type="text" @click="lookItem(r.row)">查看</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>
 
@@ -129,7 +128,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         checkSub: true,
         orgId: null,
         isEnable:false,