wukai преди 3 месеца
родител
ревизия
d5f38725e9
променени са 6 файла, в които са добавени 401 реда и са изтрити 832 реда
  1. 1 1
      src/router/index.js
  2. 57 424
      src/views/calc/calcDay/index.vue
  3. 66 219
      src/views/calc/calcHour/index.vue
  4. 2 3
      src/views/emp/emp/index.vue
  5. 265 175
      src/views/emp/empCalc/index.vue
  6. 10 10
      src/views/emp/empConfig/index.vue

+ 1 - 1
src/router/index.js

@@ -66,7 +66,7 @@ export const constantRoutes = [
         path: '/index',
         component: () => import('@/views/index'),
         name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
+        meta: { title: '默认', icon: 'dashboard', affix: false }
       }
     ]
   },

+ 57 - 424
src/views/calc/calcDay/index.vue

@@ -17,277 +17,53 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="总米长" prop="length">
-        <el-input
-          v-model="queryParams.length"
-          placeholder="请输入总米长"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总重量" prop="weight">
-        <el-input
-          v-model="queryParams.weight"
-          placeholder="请输入总重量"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="稼动率" prop="efficiency">
-        <el-input
-          v-model="queryParams.efficiency"
-          placeholder="请输入稼动率"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="总电量" prop="kwh">
-        <el-input
-          v-model="queryParams.kwh"
-          placeholder="请输入总电量"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="告警数量" prop="alarm">
-        <el-input
-          v-model="queryParams.alarm"
-          placeholder="请输入告警数量"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="A班米长" prop="lengthA">
-        <el-input
-          v-model="queryParams.lengthA"
-          placeholder="请输入A班米长"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="A班重量" prop="weightA">
-        <el-input
-          v-model="queryParams.weightA"
-          placeholder="请输入A班重量"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="A班稼动率" prop="efficiencyA">
-        <el-input
-          v-model="queryParams.efficiencyA"
-          placeholder="请输入A班稼动率"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="A班开机时间" prop="openTimeA">
-        <el-input
-          v-model="queryParams.openTimeA"
-          placeholder="请输入A班开机时间"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="A班停机时间" prop="closeTimeA">
-        <el-input
-          v-model="queryParams.closeTimeA"
-          placeholder="请输入A班停机时间"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="A班电量" prop="kwhA">
-        <el-input
-          v-model="queryParams.kwhA"
-          placeholder="请输入A班电量"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="A班停经片停机" prop="stop1A">
-        <el-input
-          v-model="queryParams.stop1A"
-          placeholder="请输入A班停经片停机"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="A班CCD停机" prop="stop2A">
-        <el-input
-          v-model="queryParams.stop2A"
-          placeholder="请输入A班CCD停机"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="A班人工停机" prop="stop3A">
-        <el-input
-          v-model="queryParams.stop3A"
-          placeholder="请输入A班人工停机"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="B班米长" prop="lengthB">
-        <el-input
-          v-model="queryParams.lengthB"
-          placeholder="请输入B班米长"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="B班重量" prop="weightB">
-        <el-input
-          v-model="queryParams.weightB"
-          placeholder="请输入B班重量"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="B班稼动率" prop="efficiencyB">
-        <el-input
-          v-model="queryParams.efficiencyB"
-          placeholder="请输入B班稼动率"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="B班开机时间" prop="openTimeB">
-        <el-input
-          v-model="queryParams.openTimeB"
-          placeholder="请输入B班开机时间"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="B班停机时间" prop="closeTimeB">
-        <el-input
-          v-model="queryParams.closeTimeB"
-          placeholder="请输入B班停机时间"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="B班电量" prop="kwhB">
-        <el-input
-          v-model="queryParams.kwhB"
-          placeholder="请输入B班电量"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="B班停经片停机" prop="stop1B">
-        <el-input
-          v-model="queryParams.stop1B"
-          placeholder="请输入B班停经片停机"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="B班CCD停机" prop="stop2B">
-        <el-input
-          v-model="queryParams.stop2B"
-          placeholder="请输入B班CCD停机"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="B班人工停机" prop="stop3B">
-        <el-input
-          v-model="queryParams.stop3B"
-          placeholder="请输入B班人工停机"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="createdBy">
-        <el-input
-          v-model="queryParams.createdBy"
-          placeholder="请输入创建人"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createdTime">
-        <el-date-picker clearable
-          v-model="queryParams.createdTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新人" prop="updatedBy">
-        <el-input
-          v-model="queryParams.updatedBy"
-          placeholder="请输入更新人"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updatedTime">
-        <el-date-picker clearable
-          v-model="queryParams.updatedTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择更新时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @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="Plus"
-          @click="handleAdd"
-          v-hasPermi="['calc:calcDay:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['calc:calcDay:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['calc:calcDay:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['calc:calcDay:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="Plus"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['calc:calcDay:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="Edit"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['calc:calcDay:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="Delete"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['calc:calcDay:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="Download"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['calc:calcDay:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
 
     <el-table v-loading="loading" :data="calcDayList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -327,21 +103,21 @@
           <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updatedBy" />
-      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['calc:calcDay:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['calc:calcDay:remove']">删除</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="更新人" align="center" prop="updatedBy" />-->
+<!--      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">-->
+<!--        <template #default="scope">-->
+<!--          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template #default="scope">-->
+<!--          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['calc:calcDay:edit']">修改</el-button>-->
+<!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['calc:calcDay:remove']">删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -349,123 +125,6 @@
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改日统计数据对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="calcDayRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="时间" prop="time">
-          <el-date-picker clearable
-            v-model="form.time"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="设备ID" prop="deviceId">
-          <el-input v-model="form.deviceId" placeholder="请输入设备ID" />
-        </el-form-item>
-        <el-form-item label="总米长" prop="length">
-          <el-input v-model="form.length" placeholder="请输入总米长" />
-        </el-form-item>
-        <el-form-item label="总重量" prop="weight">
-          <el-input v-model="form.weight" placeholder="请输入总重量" />
-        </el-form-item>
-        <el-form-item label="稼动率" prop="efficiency">
-          <el-input v-model="form.efficiency" placeholder="请输入稼动率" />
-        </el-form-item>
-        <el-form-item label="总电量" prop="kwh">
-          <el-input v-model="form.kwh" placeholder="请输入总电量" />
-        </el-form-item>
-        <el-form-item label="告警数量" prop="alarm">
-          <el-input v-model="form.alarm" placeholder="请输入告警数量" />
-        </el-form-item>
-        <el-form-item label="A班米长" prop="lengthA">
-          <el-input v-model="form.lengthA" placeholder="请输入A班米长" />
-        </el-form-item>
-        <el-form-item label="A班重量" prop="weightA">
-          <el-input v-model="form.weightA" placeholder="请输入A班重量" />
-        </el-form-item>
-        <el-form-item label="A班稼动率" prop="efficiencyA">
-          <el-input v-model="form.efficiencyA" placeholder="请输入A班稼动率" />
-        </el-form-item>
-        <el-form-item label="A班开机时间" prop="openTimeA">
-          <el-input v-model="form.openTimeA" placeholder="请输入A班开机时间" />
-        </el-form-item>
-        <el-form-item label="A班停机时间" prop="closeTimeA">
-          <el-input v-model="form.closeTimeA" placeholder="请输入A班停机时间" />
-        </el-form-item>
-        <el-form-item label="A班电量" prop="kwhA">
-          <el-input v-model="form.kwhA" placeholder="请输入A班电量" />
-        </el-form-item>
-        <el-form-item label="A班停经片停机" prop="stop1A">
-          <el-input v-model="form.stop1A" placeholder="请输入A班停经片停机" />
-        </el-form-item>
-        <el-form-item label="A班CCD停机" prop="stop2A">
-          <el-input v-model="form.stop2A" placeholder="请输入A班CCD停机" />
-        </el-form-item>
-        <el-form-item label="A班人工停机" prop="stop3A">
-          <el-input v-model="form.stop3A" placeholder="请输入A班人工停机" />
-        </el-form-item>
-        <el-form-item label="B班米长" prop="lengthB">
-          <el-input v-model="form.lengthB" placeholder="请输入B班米长" />
-        </el-form-item>
-        <el-form-item label="B班重量" prop="weightB">
-          <el-input v-model="form.weightB" placeholder="请输入B班重量" />
-        </el-form-item>
-        <el-form-item label="B班稼动率" prop="efficiencyB">
-          <el-input v-model="form.efficiencyB" placeholder="请输入B班稼动率" />
-        </el-form-item>
-        <el-form-item label="B班开机时间" prop="openTimeB">
-          <el-input v-model="form.openTimeB" placeholder="请输入B班开机时间" />
-        </el-form-item>
-        <el-form-item label="B班停机时间" prop="closeTimeB">
-          <el-input v-model="form.closeTimeB" placeholder="请输入B班停机时间" />
-        </el-form-item>
-        <el-form-item label="B班电量" prop="kwhB">
-          <el-input v-model="form.kwhB" placeholder="请输入B班电量" />
-        </el-form-item>
-        <el-form-item label="B班停经片停机" prop="stop1B">
-          <el-input v-model="form.stop1B" placeholder="请输入B班停经片停机" />
-        </el-form-item>
-        <el-form-item label="B班CCD停机" prop="stop2B">
-          <el-input v-model="form.stop2B" placeholder="请输入B班CCD停机" />
-        </el-form-item>
-        <el-form-item label="B班人工停机" prop="stop3B">
-          <el-input v-model="form.stop3B" placeholder="请输入B班人工停机" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="form.createdBy" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdTime">
-          <el-date-picker clearable
-            v-model="form.createdTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="form.updatedBy" placeholder="请输入更新人" />
-        </el-form-item>
-        <el-form-item label="更新时间" prop="updatedTime">
-          <el-date-picker clearable
-            v-model="form.updatedTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择更新时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -491,34 +150,8 @@ const data = reactive({
     pageSize: 10,
     time: null,
     deviceId: null,
-    length: null,
-    weight: null,
-    efficiency: null,
-    kwh: null,
-    alarm: null,
-    lengthA: null,
-    weightA: null,
-    efficiencyA: null,
-    openTimeA: null,
-    closeTimeA: null,
-    kwhA: null,
-    stop1A: null,
-    stop2A: null,
-    stop3A: null,
-    lengthB: null,
-    weightB: null,
-    efficiencyB: null,
-    openTimeB: null,
-    closeTimeB: null,
-    kwhB: null,
-    stop1B: null,
-    stop2B: null,
-    stop3B: null,
-    createdBy: null,
-    createdTime: null,
-    updatedBy: null,
-    updatedTime: null,
-    remark: null
+    orderByColumn: 'id',
+    isAsc: 'descending'
   },
   rules: {
   }

+ 66 - 219
src/views/calc/calcHour/index.vue

@@ -9,10 +9,10 @@
           placeholder="请选择日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="小时;0-23" prop="hour">
+      <el-form-item label="小时" prop="hour">
         <el-input
           v-model="queryParams.hour"
-          placeholder="请输入小时;0-23"
+          placeholder="请输入小时"
           clearable
           @keyup.enter="handleQuery"
         />
@@ -25,133 +25,53 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="电量" prop="kwh">
-        <el-input
-          v-model="queryParams.kwh"
-          placeholder="请输入电量"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="重量" prop="weight">
-        <el-input
-          v-model="queryParams.weight"
-          placeholder="请输入重量"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="织造米数" prop="length">
-        <el-input
-          v-model="queryParams.length"
-          placeholder="请输入织造米数"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开机时间" prop="openTime">
-        <el-input
-          v-model="queryParams.openTime"
-          placeholder="请输入开机时间"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="停机时间" prop="closeTime">
-        <el-input
-          v-model="queryParams.closeTime"
-          placeholder="请输入停机时间"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="createdBy">
-        <el-input
-          v-model="queryParams.createdBy"
-          placeholder="请输入创建人"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createdTime">
-        <el-date-picker clearable
-          v-model="queryParams.createdTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="更新人" prop="updatedBy">
-        <el-input
-          v-model="queryParams.updatedBy"
-          placeholder="请输入更新人"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updatedTime">
-        <el-date-picker clearable
-          v-model="queryParams.updatedTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择更新时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @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="Plus"
-          @click="handleAdd"
-          v-hasPermi="['calc:calcHour:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['calc:calcHour:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['calc:calcHour:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['calc:calcHour:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="Plus"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['calc:calcHour:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="Edit"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['calc:calcHour:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="Delete"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['calc:calcHour:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="Download"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['calc:calcHour:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
 
     <el-table v-loading="loading" :data="calcHourList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -161,34 +81,34 @@
           <span>{{ parseTime(scope.row.dataDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="小时;0-23" align="center" prop="hour" />
+      <el-table-column label="小时" align="center" prop="hour" />
       <el-table-column label="设备ID" align="center" prop="deviceId" />
       <el-table-column label="电量" align="center" prop="kwh" />
       <el-table-column label="重量" align="center" prop="weight" />
       <el-table-column label="织造米数" align="center" prop="length" />
       <el-table-column label="开机时间" align="center" prop="openTime" />
       <el-table-column label="停机时间" align="center" prop="closeTime" />
-      <el-table-column label="创建人" align="center" prop="createdBy" />
-      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updatedBy" />
-      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['calc:calcHour:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['calc:calcHour:remove']">删除</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="创建人" align="center" prop="createdBy" />-->
+<!--      <el-table-column label="创建时间" align="center" prop="createdTime" width="180">-->
+<!--        <template #default="scope">-->
+<!--          <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="更新人" align="center" prop="updatedBy" />-->
+<!--      <el-table-column label="更新时间" align="center" prop="updatedTime" width="180">-->
+<!--        <template #default="scope">-->
+<!--          <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template #default="scope">-->
+<!--          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['calc:calcHour:edit']">修改</el-button>-->
+<!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['calc:calcHour:remove']">删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -197,71 +117,6 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改1小时统计数据对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="calcHourRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="日期" prop="dataDate">
-          <el-date-picker clearable
-            v-model="form.dataDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="小时;0-23" prop="hour">
-          <el-input v-model="form.hour" placeholder="请输入小时;0-23" />
-        </el-form-item>
-        <el-form-item label="设备ID" prop="deviceId">
-          <el-input v-model="form.deviceId" placeholder="请输入设备ID" />
-        </el-form-item>
-        <el-form-item label="电量" prop="kwh">
-          <el-input v-model="form.kwh" placeholder="请输入电量" />
-        </el-form-item>
-        <el-form-item label="重量" prop="weight">
-          <el-input v-model="form.weight" placeholder="请输入重量" />
-        </el-form-item>
-        <el-form-item label="织造米数" prop="length">
-          <el-input v-model="form.length" placeholder="请输入织造米数" />
-        </el-form-item>
-        <el-form-item label="开机时间" prop="openTime">
-          <el-input v-model="form.openTime" placeholder="请输入开机时间" />
-        </el-form-item>
-        <el-form-item label="停机时间" prop="closeTime">
-          <el-input v-model="form.closeTime" placeholder="请输入停机时间" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="form.createdBy" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdTime">
-          <el-date-picker clearable
-            v-model="form.createdTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="form.updatedBy" placeholder="请输入更新人" />
-        </el-form-item>
-        <el-form-item label="更新时间" prop="updatedTime">
-          <el-date-picker clearable
-            v-model="form.updatedTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择更新时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -288,16 +143,8 @@ const data = reactive({
     dataDate: null,
     hour: null,
     deviceId: null,
-    kwh: null,
-    weight: null,
-    length: null,
-    openTime: null,
-    closeTime: null,
-    createdBy: null,
-    createdTime: null,
-    updatedBy: null,
-    updatedTime: null,
-    remark: null
+    orderByColumn: 'id',
+    isAsc: 'descending'
   },
   rules: {
   }

+ 2 - 3
src/views/emp/emp/index.vue

@@ -93,7 +93,7 @@
     />
 
     <!-- 添加或修改员工排班对话框 -->
-    <el-dialog :title="title" v-model="open" width="1000px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="1050px" append-to-body>
       <el-form ref="empRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="时间" prop="empDate">
           <el-date-picker clearable
@@ -106,8 +106,7 @@
           <el-col :span="1"></el-col>
           <el-button type="success" icon="DocumentCopy" @click="copy" v-if="isReadOnly">复制排班</el-button>
         </el-form-item>
-        <em>排班明细:多个机台号请使用英文逗号”,“分隔,连续机台号使用”-“,例:1 4
-          5机台号填写为”1,4,5“,1至12号填写为”1-12",1至12号加36号填写为“1-12,36”</em>
+        <em>排班明细:多个机台号请使用英文逗号”,“分隔,连续机台号使用”-“,例:1 4 7机台号填写为”1,4,7“,1至12号填写为”1-12",1至12号加36号填写为“1-12,36”</em>
         <el-row>
           <el-col :span="11">
             <el-divider content-position="center">A班明细信息</el-divider>

+ 265 - 175
src/views/emp/empCalc/index.vue

@@ -3,100 +3,99 @@
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="姓名" prop="empName">
         <el-input
-          v-model="queryParams.empName"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter="handleQuery"
+            v-model="queryParams.empName"
+            placeholder="请输入姓名"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="时间" prop="empDate">
         <el-date-picker clearable
-          v-model="queryParams.empDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择时间">
+                        v-model="queryParams.empDate"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="班组" prop="empTeam">
-        <el-input
-          v-model="queryParams.empTeam"
-          placeholder="请输入班组"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-select clearable v-model="queryParams.empTeam" placeholder="请选择" style="width: 200px">
+          <el-option value="" label=""></el-option>
+          <el-option value="A" label="A班"></el-option>
+          <el-option value="B" label="B班"></el-option>
+        </el-select>
       </el-form-item>
-<!--      <el-form-item label="机台号" prop="deviceId">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.deviceId"-->
-<!--          placeholder="请输入机台号"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="稼动率" prop="efficiency">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.efficiency"-->
-<!--          placeholder="请输入稼动率"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="规格" prop="spec">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.spec"-->
-<!--          placeholder="请输入规格"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="米克重" prop="mick">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.mick"-->
-<!--          placeholder="请输入米克重"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="密度" prop="density">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.density"-->
-<!--          placeholder="请输入密度"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="产量" prop="length">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.length"-->
-<!--          placeholder="请输入产量"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="毛高" prop="height">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.height"-->
-<!--          placeholder="请输入毛高"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="单价" prop="price">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.price"-->
-<!--          placeholder="请输入单价"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="总价" prop="totalPrice">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.totalPrice"-->
-<!--          placeholder="请输入总价"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="机台号" prop="deviceId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.deviceId"-->
+      <!--          placeholder="请输入机台号"-->
+      <!--          clearable-->
+      <!--          @keyup.enter="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="稼动率" prop="efficiency">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.efficiency"-->
+      <!--          placeholder="请输入稼动率"-->
+      <!--          clearable-->
+      <!--          @keyup.enter="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="规格" prop="spec">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.spec"-->
+      <!--          placeholder="请输入规格"-->
+      <!--          clearable-->
+      <!--          @keyup.enter="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="米克重" prop="mick">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.mick"-->
+      <!--          placeholder="请输入米克重"-->
+      <!--          clearable-->
+      <!--          @keyup.enter="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="密度" prop="density">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.density"-->
+      <!--          placeholder="请输入密度"-->
+      <!--          clearable-->
+      <!--          @keyup.enter="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="产量" prop="length">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.length"-->
+      <!--          placeholder="请输入产量"-->
+      <!--          clearable-->
+      <!--          @keyup.enter="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="毛高" prop="height">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.height"-->
+      <!--          placeholder="请输入毛高"-->
+      <!--          clearable-->
+      <!--          @keyup.enter="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="单价" prop="price">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.price"-->
+      <!--          placeholder="请输入单价"-->
+      <!--          clearable-->
+      <!--          @keyup.enter="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="总价" prop="totalPrice">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.totalPrice"-->
+      <!--          placeholder="请输入总价"-->
+      <!--          clearable-->
+      <!--          @keyup.enter="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -104,125 +103,143 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="Plus"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['emp:empCalc:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="Edit"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['emp:empCalc:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="Delete"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['emp:empCalc:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="Plus"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['emp:empCalc:add']"-->
+      <!--        >新增</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="Edit"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--          v-hasPermi="['emp:empCalc:edit']"-->
+      <!--        >修改</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="Delete"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleDelete"-->
+      <!--          v-hasPermi="['emp:empCalc:remove']"-->
+      <!--        >删除</el-button>-->
+      <!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExportD"
+        >日报导出
+        </el-button>
+      </el-col>
+
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['emp:empCalc:export']"
-        >导出</el-button>
+            type="success"
+            plain
+            icon="Download"
+            @click="handleExportM"
+        >月报导出
+        </el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="empCalcList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="统计ID" align="center" prop="calcId" />
-      <el-table-column label="姓名" align="center" prop="empName" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="统计ID" align="center" prop="calcId"/>
+      <el-table-column label="姓名" align="center" prop="empName"/>
       <el-table-column label="时间" align="center" prop="empDate" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.empDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="班组" align="center" prop="empTeam" />
-      <el-table-column label="机台号" align="center" prop="deviceId" />
-      <el-table-column label="稼动率" align="center" prop="efficiency" />
-      <el-table-column label="规格" align="center" prop="spec" />
-      <el-table-column label="米克重" align="center" prop="mick" />
-      <el-table-column label="密度" align="center" prop="density" />
-      <el-table-column label="产量" align="center" prop="length" />
-      <el-table-column label="毛高" align="center" prop="height" />
-      <el-table-column label="单价" align="center" prop="price" />
-      <el-table-column label="总价" align="center" prop="totalPrice" />
-<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-<!--        <template #default="scope">-->
-<!--          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['emp:empCalc:edit']">修改</el-button>-->
-<!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['emp:empCalc:remove']">删除</el-button>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="班组" align="center" prop="empTeam"/>
+      <el-table-column label="机台号" align="center" prop="deviceId"/>
+      <el-table-column label="稼动率" align="center" prop="efficiency">
+        <template #default="scope">
+          <span>{{ (scope.row.efficiency * 100).toFixed(2) }}%</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="规格" align="center" prop="spec"/>
+      <el-table-column label="米克重" align="center" prop="mick"/>
+      <el-table-column label="密度" align="center" prop="density"/>
+      <el-table-column label="产量" align="center" prop="length"/>
+      <el-table-column label="毛高" align="center" prop="height"/>
+      <el-table-column label="单价" align="center" prop="price"/>
+      <el-table-column label="总价" align="center" prop="totalPrice">
+        <template #default="scope">
+          <span>{{ (scope.row.totalPrice).toFixed(2) }}</span>
+        </template>
+      </el-table-column>
+      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--        <template #default="scope">-->
+      <!--          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['emp:empCalc:edit']">修改</el-button>-->
+      <!--          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['emp:empCalc:remove']">删除</el-button>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
     </el-table>
 
     <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
     />
 
     <!-- 添加或修改员工产量统计对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="empCalcRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="姓名" prop="empName">
-          <el-input v-model="form.empName" placeholder="请输入姓名" />
+          <el-input v-model="form.empName" placeholder="请输入姓名"/>
         </el-form-item>
         <el-form-item label="时间" prop="empDate">
           <el-date-picker clearable
-            v-model="form.empDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择时间">
+                          v-model="form.empDate"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="班组" prop="empTeam">
-          <el-input v-model="form.empTeam" placeholder="请输入班组" />
+          <el-input v-model="form.empTeam" placeholder="请输入班组"/>
         </el-form-item>
         <el-form-item label="机台号" prop="deviceId">
-          <el-input v-model="form.deviceId" placeholder="请输入机台号" />
+          <el-input v-model="form.deviceId" placeholder="请输入机台号"/>
         </el-form-item>
         <el-form-item label="稼动率" prop="efficiency">
-          <el-input v-model="form.efficiency" placeholder="请输入稼动率" />
+          <el-input v-model="form.efficiency" placeholder="请输入稼动率"/>
         </el-form-item>
         <el-form-item label="规格" prop="spec">
-          <el-input v-model="form.spec" placeholder="请输入规格" />
+          <el-input v-model="form.spec" placeholder="请输入规格"/>
         </el-form-item>
         <el-form-item label="米克重" prop="mick">
-          <el-input v-model="form.mick" placeholder="请输入米克重" />
+          <el-input v-model="form.mick" placeholder="请输入米克重"/>
         </el-form-item>
         <el-form-item label="密度" prop="density">
-          <el-input v-model="form.density" placeholder="请输入密度" />
+          <el-input v-model="form.density" placeholder="请输入密度"/>
         </el-form-item>
         <el-form-item label="产量" prop="length">
-          <el-input v-model="form.length" placeholder="请输入产量" />
+          <el-input v-model="form.length" placeholder="请输入产量"/>
         </el-form-item>
         <el-form-item label="毛高" prop="height">
-          <el-input v-model="form.height" placeholder="请输入毛高" />
+          <el-input v-model="form.height" placeholder="请输入毛高"/>
         </el-form-item>
         <el-form-item label="单价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入单价" />
+          <el-input v-model="form.price" placeholder="请输入单价"/>
         </el-form-item>
         <el-form-item label="总价" prop="totalPrice">
-          <el-input v-model="form.totalPrice" placeholder="请输入总价" />
+          <el-input v-model="form.totalPrice" placeholder="请输入总价"/>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -232,16 +249,51 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 导出日报 -->
+    <el-dialog title="日报导出" v-model="exportD" width="250px" append-to-body>
+
+      <el-date-picker clearable
+                      v-model="dayTime"
+                      type="date"
+                      value-format="YYYY-MM-DD"
+                      placeholder="请选择时间">
+      </el-date-picker>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="report('D')">确 定</el-button>
+          <el-button @click="cancel('D')">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 导出日报 -->
+    <el-dialog title="月报导出" v-model="exportM" width="250px" append-to-body>
+      <el-date-picker clearable
+                      v-model="monthTime"
+                      type="month"
+                      value-format="YYYY-MM"
+                      placeholder="请选择月份">
+      </el-date-picker>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="report('M')">确 定</el-button>
+          <el-button @click="cancel('M')">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="EmpCalc">
-import { listEmpCalc, getEmpCalc, delEmpCalc, addEmpCalc, updateEmpCalc } from "@/api/emp/empCalc";
+import {addEmpCalc, delEmpCalc, getEmpCalc, listEmpCalc, updateEmpCalc} from "@/api/emp/empCalc";
 
-const { proxy } = getCurrentInstance();
+const {proxy} = getCurrentInstance();
 
 const empCalcList = ref([]);
 const open = ref(false);
+const exportD = ref(false);
+const exportM = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref([]);
@@ -249,6 +301,8 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
+const dayTime = ref("")
+const monthTime = ref("")
 
 const data = reactive({
   form: {},
@@ -266,13 +320,14 @@ const data = reactive({
     length: null,
     height: null,
     price: null,
-    totalPrice: null
+    totalPrice: null,
+    orderByColumn: 'calcId',
+    isAsc: 'descending'
   },
-  rules: {
-  }
+  rules: {}
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 /** 查询员工产量统计列表 */
 function getList() {
@@ -285,9 +340,15 @@ function getList() {
 }
 
 // 取消按钮
-function cancel() {
-  open.value = false;
-  reset();
+function cancel(flag) {
+  if (flag == 'D') {
+    exportD.value = false;
+  } else if (flag == 'M') {
+    exportM.value = false;
+  } else {
+    open.value = false;
+    reset();
+  }
 }
 
 // 表单重置
@@ -371,19 +432,48 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _calcIds = row.calcId || ids.value;
-  proxy.$modal.confirm('是否确认删除员工产量统计编号为"' + _calcIds + '"的数据项?').then(function() {
+  proxy.$modal.confirm('是否确认删除员工产量统计编号为"' + _calcIds + '"的数据项?').then(function () {
     return delEmpCalc(_calcIds);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  }).catch(() => {
+  });
 }
 
 /** 导出按钮操作 */
-function handleExport() {
-  proxy.download('emp/empCalc/export', {
-    ...queryParams.value
-  }, `empCalc_${new Date().getTime()}.xlsx`)
+function handleExportD() {
+  exportD.value = true;
+}
+
+/** 导出日报 */
+function handleExportM() {
+  exportM.value = true;
+  // proxy.download('emp/empCalc/export', {
+  //   ...queryParams.value
+  // }, `empCalc_${new Date().getTime()}.xlsx`)
+}
+
+function report(flag) {
+  let date;
+  let name;
+  let url;
+  if (flag === 'D') {
+    date = dayTime.value;
+    url = '/api/export/productivity-day?date=' + dayTime.value;
+    name = `经编生产绩效日报${dayTime.value}.xlsx`;
+  } else {
+    date = monthTime.value;
+    url = '/api/export/productivity-month?date=' + dayTime.value;
+    name = `经编生产绩效日报${dayTime.value}.xlsx`;
+  }
+
+  if (!date) {
+    proxy.$modal.msgError("请选择导出时间");
+  } else {
+    proxy.download(url, {}, name)
+    cancel(flag);
+  }
 }
 
 getList();

+ 10 - 10
src/views/emp/empConfig/index.vue

@@ -53,15 +53,15 @@
           v-hasPermi="['emp:empConfig:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['emp:empConfig:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="Download"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['emp:empConfig:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -77,7 +77,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"