Merge branch 'dev' into test

src/views/modules/secretaryLog/difficulty/difficultyForm.vue

@@ -41,7 +41,7 @@
                       style="display: block"
                       prop="scheduledTime"
                       label-width="150px">
-          <el-date-picker class="item_width_1"
+          <el-date-picker class="item_width_2"
                           v-model="formData.scheduledTime"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
@@ -54,7 +54,7 @@
                       style="display: block"
                       prop="remindTime"
                       label-width="150px">
-          <el-date-picker class="item_width_1"
+          <el-date-picker class="item_width_2"
                           v-model="formData.remindTime"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"

src/views/modules/secretaryLog/workLog/index.vue

@@ -150,7 +150,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="50%"
+               width="950px"
                top="5vh"
                class="dialog-h"
                @closed="diaClose">