界面调整

.env.development

@@ -6,9 +6,9 @@ ENV = 'development'
 
 # 开发环境
 #测试地址
-VUE_APP_BASE_API = 'http://10.87.21.107:8080'
+#VUE_APP_BASE_API = 'http://10.87.21.107:8080'
 #罗俊
-# VUE_APP_BASE_API = 'http://10.87.10.49:8080'
+#VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
 # VUE_APP_BASE_API = 'http://10.87.23.62:8080'
 #高雄
@@ -20,7 +20,7 @@ VUE_APP_BASE_API = 'http://10.87.21.107:8080'
 # VUE_APP_BASE_API = 'http://10.87.21.107:8080'
 #VUE_APP_BASE_API = 'http://localhost:8080'
 # 开发环境
-#VUE_APP_BASE_API = 'http://10.87.21.103:8080'
+VUE_APP_BASE_API = 'http://10.87.21.103:8080'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

src/assets/styles/ruoyi.scss

@@ -385,7 +385,7 @@
    }
  }
  .vue-treeselect__single-value{
-   line-height: 30px!important;
+   align-items: center;
    color: #666!important;
  }
  .vue-treeselect__control{
@@ -393,7 +393,6 @@
  }
  .vue-treeselect__input{
    height: 30px!important;
-   line-height: 30px!important;
  }
 
  .el-descriptions-item__label.is-bordered-label{

src/views/dashboard/PanelGroup.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-row :gutter="40" class="panel-group">
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+  <el-row :gutter="20" class="panel-group">
+    <el-col class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
         <div class="card-panel-icon-wrapper icon-people">
           <svg-icon icon-class="peoples" class-name="card-panel-icon" />
@@ -13,7 +13,7 @@
         </div>
       </div>
     </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+    <el-col class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('messages')">
         <div class="card-panel-icon-wrapper icon-message">
           <svg-icon icon-class="message" class-name="card-panel-icon" />
@@ -26,7 +26,7 @@
         </div>
       </div>
     </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+    <el-col class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('purchases')">
         <div class="card-panel-icon-wrapper icon-money">
           <svg-icon icon-class="money" class-name="card-panel-icon" />
@@ -39,7 +39,85 @@
         </div>
       </div>
     </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+    <el-col class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+        <div class="card-panel-icon-wrapper icon-shopping">
+          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            隐患
+          </div>
+          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+    <el-col class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+        <div class="card-panel-icon-wrapper icon-shopping">
+          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            隐患
+          </div>
+          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+    <el-col class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+        <div class="card-panel-icon-wrapper icon-shopping">
+          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            隐患
+          </div>
+          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+    <el-col class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+        <div class="card-panel-icon-wrapper icon-shopping">
+          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            隐患
+          </div>
+          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+    <el-col class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+        <div class="card-panel-icon-wrapper icon-shopping">
+          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            隐患
+          </div>
+          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+    <el-col class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+        <div class="card-panel-icon-wrapper icon-shopping">
+          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">
+            隐患
+          </div>
+          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+        </div>
+      </div>
+    </el-col>
+    <el-col class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('shoppings')">
         <div class="card-panel-icon-wrapper icon-shopping">
           <svg-icon icon-class="shopping" class-name="card-panel-icon" />
@@ -72,12 +150,9 @@ export default {
 
 <style lang="scss" scoped>
 .panel-group {
-  margin-top: 18px;
-
   .card-panel-col {
-    margin-bottom: 32px;
+    margin-bottom: 20px;
   }
-
   .card-panel {
     height: 108px;
     cursor: pointer;

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

@@ -14,7 +14,7 @@
           <!--  -->
           <el-form-item label="作息规则">
             <el-table class="w-auto" height="350" border :data="workTimeList">
-              <el-table-column label="日期" width="160">
+              <el-table-column label="日期" width="160" align="center">
                 <template slot-scope="r" >
                   <el-date-picker
                   :default-timezone="'GMT+8'"
@@ -29,12 +29,12 @@
                   </el-date-picker>
                 </template>
               </el-table-column>
-              <el-table-column label="星期" width="80">
+              <el-table-column label="星期" width="80" align="center">
                 <template slot-scope="r">
                   <span>{{parseTime(r.row.ymdDate ,'dddd')}}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="状态" width="160">
+              <el-table-column label="状态" width="160" align="center">
                 <template slot-scope="r">
 <!--                  <el-switch-->
 <!--                  v-model="r.row.isEnable"-->
@@ -54,7 +54,7 @@
                   </el-radio-group>
                 </template>
               </el-table-column>
-              <el-table-column label="是否值班打卡" width="160">
+              <el-table-column label="是否值班打卡" width="160" align="center">
                 <template slot-scope="r">
                   <el-switch
                   v-model="r.row.isDuty"
@@ -74,7 +74,7 @@
 <!--                  </el-radio-group>-->
                 </template>
               </el-table-column>
-              <el-table-column label="上班时间" width="120">
+              <el-table-column label="上班时间" width="120" align="center">
                 <template slot-scope="r">
                   <el-time-select
                     style="width: 100%"
@@ -84,7 +84,7 @@
                     v-model="r.row.workTime"/>
                 </template>
               </el-table-column>
-              <el-table-column label="营业开始" width="120">
+              <el-table-column label="营业开始" width="120" align="center">
                 <template slot-scope="r">
                   <el-time-select
                     style="width: 100%;"
@@ -114,7 +114,7 @@
 <!--                    v-model="r.row.noonbreakEnd"/>-->
 <!--                </template>-->
 <!--              </el-table-column>-->
-              <el-table-column label="营业结束" width="120">
+              <el-table-column label="营业结束" width="120" align="center">
                 <template slot-scope="r">
                   <el-time-select
                     style="width: 100%"
@@ -124,7 +124,7 @@
                     v-model="r.row.closeTime"/>
                 </template>
               </el-table-column>
-              <el-table-column label="下班时间" width="120">
+              <el-table-column label="下班时间" width="120" align="center">
                 <template slot-scope="r">
                   <el-time-select
                     style="width: 100%"
@@ -134,7 +134,7 @@
                     v-model="r.row.workOffTime"/>
                 </template>
               </el-table-column>
-              <el-table-column label="操作列表" width="140">
+              <el-table-column label="操作列表" width="140" align="center">
                 <template slot-scope="r">
                   <btn-tip type="text" @click="deleteData(r.row,r.$index)">删除</btn-tip>
                   <el-button type="text" @click="coppy(r.$index)">复制至全部</el-button>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="question-infos">
     <DialogCom :title="title" @close="handleClose" :visible.sync="isShow" :close-on-click-modal="false"
-      custom-class="gxDialog" width="1100px" append-to-body>
+      custom-class="gxDialog" width="1200px" append-to-body>
 <!--      <div class="p-5 work-time-modify">-->
         <el-form
             :disabled="title === '查看作息模版'"
@@ -25,115 +25,109 @@
               placeholder="请选择日期">
             </el-date-picker>
           </el-form-item>
-          <!--  -->
-          <div class="grid" >
-            <p>
-              <span style="color: red;"> * </span>作息设置
-            </p >
-            <div class="box">
-              <el-table  border :data="formData.dayOfWeeks">
-                <el-table-column label="星期" width="100px" prop="dayOfWeekText">
-                </el-table-column>
-                <el-table-column label="营业状态">
-                  <template slot-scope="r">
-<!--                    <el-switch-->
-<!--                      v-model="r.row.isWorkday"-->
-<!--                      :active-value="1"-->
-<!--                      :inactive-value="0"-->
-<!--                      @change="onEnableChange(r.row)"-->
-<!--                      active-text="营业"-->
-<!--                      inactive-text="歇业">-->
-<!--                    </el-switch>-->
-                    <el-radio-group
-                        v-model="r.row.isWorkday"
-                        @change="onEnableChange(r.row)">
-                      <el-radio text-color="#48bb78" label="1">营业</el-radio>
-                      <el-radio text-color="#f56565" label="0">歇业</el-radio>
-                    </el-radio-group>
-                  </template>
-                </el-table-column>
-                <el-table-column label="值班打卡">
-                  <template slot-scope="r">
-                    <el-switch
-                      v-model="r.row.isDuty"
-                      active-value="1"
-                      inactive-value="0"
-                      @change="onEnableChange(r.row)"
-                      active-text="是"
-                      inactive-text="否">
-                    </el-switch>
-<!--                    <el-radio-group-->
-<!--                      v-model="r.row.isWorkday"-->
-<!--                      @change="onEnableChange(r.row)">-->
-<!--                      <el-radio text-color="#48bb78" label="1">营业</el-radio>-->
-<!--                      <el-radio text-color="#f56565" label="0">歇业</el-radio>-->
-<!--                    </el-radio-group>-->
-                  </template>
-                </el-table-column>
-                <el-table-column label="上班时间">
-                  <template slot-scope="r">
-                    <el-time-select
-                      style="width: 100%"
-                      size="mini"
-                      :picker-options="pickerOptions"
-                      :disabled="r.row.isWorkday=='0' ||!r.row.isWorkday"
-                      v-model="r.row.workTime"/>
-                  </template>
-                </el-table-column>
-                <el-table-column label="营业开始">
-                  <template slot-scope="r">
-                    <el-time-select
-                      style="width: 100%"
-                      size="mini"
-                      :picker-options="pickerOptions"
-                      :disabled="r.row.isWorkday=='0' ||!r.row.isWorkday"
-                      v-model="r.row.openTime"/>
-                  </template>
-                </el-table-column>
-<!--                <el-table-column label="午休开始">-->
-<!--                  <template slot-scope="r">-->
-<!--                    <el-time-select-->
-<!--                      style="width: 100%"-->
-<!--                      size="mini"-->
-<!--                      :picker-options="pickerOptions"-->
-<!--                      :disabled="!r.row.isWorkday || !r.row.isWorkday"-->
-<!--                      v-model="r.row.noonbreakStart"/>-->
-<!--                  </template>-->
-<!--                </el-table-column>-->
-<!--                <el-table-column label="午休结束">-->
-<!--                  <template slot-scope="r">-->
-<!--                    <el-time-select-->
-<!--                      style="width: 100%"-->
-<!--                      size="mini"-->
-<!--                      :picker-options="pickerOptions"-->
-<!--                      :disabled="!r.row.isWorkday || !r.row.isWorkday"-->
-<!--                      v-model="r.row.noonbreakEnd"/>-->
-<!--                  </template>-->
-<!--                </el-table-column>-->
-                <el-table-column label="营业结束">
-                  <template slot-scope="r">
-                    <el-time-select
-                      style="width: 100%"
-                      size="mini"
-                      :picker-options="pickerOptions"
-                      :disabled="r.row.isWorkday=='0' || !r.row.isWorkday"
-                      v-model="r.row.closeTime"/>
-                  </template>
-                </el-table-column>
-                <el-table-column label="下班时间">
-                  <template slot-scope="r">
-                    <el-time-select
-                      style="width: 100%"
-                      size="small"
-                      :picker-options="pickerOptions"
-                      :disabled="r.row.isWorkday=='0' ||!r.row.isWorkday"
-                      v-model="r.row.workOffTime"/>
-                  </template>
-                </el-table-column>
-              </el-table>
-
-            </div>
-          </div>
+          <el-form-item>
+            <span slot="label"> <span style="color: red"> * </span>作息设置 </span>
+            <el-table  border :data="formData.dayOfWeeks">
+              <el-table-column label="星期" width="100px" prop="dayOfWeekText" align="center">
+              </el-table-column>
+              <el-table-column label="营业状态" align="center" width="180">
+                <template slot-scope="r">
+                  <!--                    <el-switch-->
+                  <!--                      v-model="r.row.isWorkday"-->
+                  <!--                      :active-value="1"-->
+                  <!--                      :inactive-value="0"-->
+                  <!--                      @change="onEnableChange(r.row)"-->
+                  <!--                      active-text="营业"-->
+                  <!--                      inactive-text="歇业">-->
+                  <!--                    </el-switch>-->
+                  <el-radio-group
+                    v-model="r.row.isWorkday"
+                    @change="onEnableChange(r.row)">
+                    <el-radio text-color="#48bb78" label="1">营业</el-radio>
+                    <el-radio text-color="#f56565" label="0">歇业</el-radio>
+                  </el-radio-group>
+                </template>
+              </el-table-column>
+              <el-table-column label="值班打卡" align="center">
+                <template slot-scope="r">
+                  <el-switch
+                    v-model="r.row.isDuty"
+                    active-value="1"
+                    inactive-value="0"
+                    @change="onEnableChange(r.row)"
+                    active-text="是"
+                    inactive-text="否">
+                  </el-switch>
+                  <!--                    <el-radio-group-->
+                  <!--                      v-model="r.row.isWorkday"-->
+                  <!--                      @change="onEnableChange(r.row)">-->
+                  <!--                      <el-radio text-color="#48bb78" label="1">营业</el-radio>-->
+                  <!--                      <el-radio text-color="#f56565" label="0">歇业</el-radio>-->
+                  <!--                    </el-radio-group>-->
+                </template>
+              </el-table-column>
+              <el-table-column label="上班时间" align="center">
+                <template slot-scope="r">
+                  <el-time-select
+                    style="width: 100%"
+                    size="mini"
+                    :picker-options="pickerOptions"
+                    :disabled="r.row.isWorkday=='0' ||!r.row.isWorkday"
+                    v-model="r.row.workTime"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="营业开始" align="center">
+                <template slot-scope="r">
+                  <el-time-select
+                    style="width: 100%"
+                    size="mini"
+                    :picker-options="pickerOptions"
+                    :disabled="r.row.isWorkday=='0' ||!r.row.isWorkday"
+                    v-model="r.row.openTime"/>
+                </template>
+              </el-table-column>
+              <!--                <el-table-column label="午休开始">-->
+              <!--                  <template slot-scope="r">-->
+              <!--                    <el-time-select-->
+              <!--                      style="width: 100%"-->
+              <!--                      size="mini"-->
+              <!--                      :picker-options="pickerOptions"-->
+              <!--                      :disabled="!r.row.isWorkday || !r.row.isWorkday"-->
+              <!--                      v-model="r.row.noonbreakStart"/>-->
+              <!--                  </template>-->
+              <!--                </el-table-column>-->
+              <!--                <el-table-column label="午休结束">-->
+              <!--                  <template slot-scope="r">-->
+              <!--                    <el-time-select-->
+              <!--                      style="width: 100%"-->
+              <!--                      size="mini"-->
+              <!--                      :picker-options="pickerOptions"-->
+              <!--                      :disabled="!r.row.isWorkday || !r.row.isWorkday"-->
+              <!--                      v-model="r.row.noonbreakEnd"/>-->
+              <!--                  </template>-->
+              <!--                </el-table-column>-->
+              <el-table-column label="营业结束" align="center">
+                <template slot-scope="r">
+                  <el-time-select
+                    style="width: 100%"
+                    size="mini"
+                    :picker-options="pickerOptions"
+                    :disabled="r.row.isWorkday=='0' || !r.row.isWorkday"
+                    v-model="r.row.closeTime"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="下班时间" align="center">
+                <template slot-scope="r">
+                  <el-time-select
+                    style="width: 100%"
+                    size="small"
+                    :picker-options="pickerOptions"
+                    :disabled="r.row.isWorkday=='0' ||!r.row.isWorkday"
+                    v-model="r.row.workOffTime"/>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
         </el-form>
       <div style="color: red;font-size: 12px;line-height: 30px;">
         注：保存后生成或更新本月或下月生效日期后的每日作息

src/views/system/workTimeSet/workTime.vue

@@ -32,18 +32,23 @@
                 ></org-tree>
               </el-form-item>
               <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 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="日期范围">
                 <DataRangePicker
+                  style="width: 240px"
                   v-model="queryParams.range"
                   key="daterange"
                   type="daterange"
                   :clearable="false"
-                  range-separator="至"
+                  range-separator="-"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                 />
@@ -53,7 +58,6 @@
                   v-model="queryParams.isEnable"
                   placeholder="请选择"
                   clearable
-                  style="width: 240px"
                 >
                   <el-option
                     v-for="dict in dict.type.sys_business_type"
@@ -170,7 +174,7 @@
               label="操作"
               header-align="center"
               align="left"
-              width="100"
+              width="160"
             >
               <template slot-scope="r">
                 <el-button
@@ -379,6 +383,7 @@ export default {
       this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 10;
       this.queryParams.orgId = this.orgId;
+      this.queryParams.orgType = null;
       this.queryParams.checkSub = true;
       this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub)
       this.queryParams.range = [sDate, eDate];

src/views/system/workTimeSet/workTimeWeek.vue

@@ -25,16 +25,27 @@
                   ref="orgTree"
               ></org-tree>
               </el-form-item>
+              <el-form-item label="机构类型" prop="orgType">
+                <el-select 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="生效日期">
-                <el-date-picker
-                  v-model="dateRange"
+                <DataRangePicker
                   style="width: 240px"
-                  value-format="yyyy-MM-dd hh:mm:ss"
+                  v-model="dateRange"
+                  key="daterange"
                   type="daterange"
+                  :clearable="false"
                   range-separator="-"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
-                ></el-date-picker>
+                />
               </el-form-item>
     <!--          <el-form-item label="仅显示当前生效" label-width="120px">-->
     <!--            <el-switch-->
@@ -106,12 +117,12 @@ import DialogTemplate from './dialog.template'
 /** 引入节点树接口*/
 import { deptTreeSelect} from "@/api/system/public";
 import {weekTableList} from './api'
-import {formatTime} from "@/utils/ruoyi";
 import { mapGetters } from "vuex";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 export default {
   /**  得先引入字典才能使用 */
-  dicts: ['sys_business_type'],
-  components: {OrgTree,DialogTemplate},
+  dicts: ['sys_business_type','sys_org_type'],
+  components: {DataRangePicker, OrgTree,DialogTemplate},
   data() {
     return {
       loading:false,
@@ -141,6 +152,7 @@ export default {
         checkSub: true,
         orgId: null,
         isEnable:false,
+        orgType:null,
       },
       dateRange:[],
       total:0,
@@ -251,7 +263,8 @@ export default {
       this.queryParams.pageNum= 1;
       this.queryParams.pageSize=10;
       this.dateRange = [];
-      this.queryParams.orgId=this.orgId
+      this.queryParams.orgId=this.orgId;
+      this.queryParams.orgType = null;
       this.queryParams.checkSub = true;
       this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub)
       this.getList();