Merge remote-tracking branch 'origin/master'

danger-manage-admin/src/main/resources/application-dev.yml

@@ -21,9 +21,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://36.138.181.113:3306/danger_manage_area_a?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://36.138.181.113:33060/danger_manage_area_a?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: root@123
+                password: zehong_/sjz!D
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

danger-manage-web/src/components/NewSaftyWork/BlindPlate.vue

@@ -229,7 +229,7 @@
         <td colspan="3" v-if="(applyStatus-0) ==1"><input :disabled="item.staffId != $store.state.user.userId" v-model="item.opinion" class="editInput"/></td>
         <td colspan="3" v-if="(applyStatus-0) !=1"><input disabled v-model="item.opinion" class="editInput"/></td>
         <td colspan="1">签字:</td>
-        <td colspan="2"><NewEsign :resultImg.sync ="item.signName" :isDisabled="item.staffId != $store.state.user.userId" :isReWrite="(applyStatus-0) ==1" :width="918" :height="180"/></td>
+        <td colspan="2"><NewEsign :resultImg.sync ="item.signName" :isDisabled="item.staffId != $store.state.user.userId" :isReWrite="(applyStatus-0) ==1 && item.staffId == $store.state.user.userId" :width="918" :height="180"/></td>
         <td colspan="2" v-if="(applyStatus-0) ==1">
           <el-date-picker clearable size="small"
                           v-model="item.signDate"

danger-manage-web/src/components/NewSaftyWork/BreakGround.vue

@@ -240,7 +240,7 @@
         <td colspan="2" v-if="(applyStatus-0) ==1"><input :disabled="item.staffId != $store.state.user.userId" v-model="item.opinion" class="editInput"/></td>
         <td colspan="2" v-if="(applyStatus-0) !=1"><input disabled v-model="item.opinion" class="editInput"/></td>
         <td>签字:</td>
-        <td><NewEsign :resultImg.sync ="item.signName" :isDisabled="item.staffId != $store.state.user.userId" :isReWrite="(applyStatus-0) ==1" :width="918" :height="100"/></td>
+        <td><NewEsign :resultImg.sync ="item.signName" :isDisabled="item.staffId != $store.state.user.userId" :isReWrite="(applyStatus-0) ==1 && item.staffId == $store.state.user.userId" :width="918" :height="100"/></td>
         <td v-if="(applyStatus-0) ==1">
           <el-date-picker clearable size="small"
                           v-model="item.signDate"

danger-manage-web/src/components/NewSaftyWork/FlareUp.vue

@@ -335,7 +335,7 @@
         <td colspan="6" v-if="(applyStatus-0) ==1"><input :disabled="item.staffId != $store.state.user.userId" v-model="item.opinion" class="editInput"/></td>
         <td colspan="6" v-if="(applyStatus-0) !=1"><input disabled v-model="item.opinion" class="editInput"/></td>
         <td colspan="2">签字:</td>
-        <td colspan="4"><NewEsign :resultImg.sync ="item.signName" :isDisabled="item.staffId != $store.state.user.userId" :isReWrite="(applyStatus-0) ==1" :width="918" :height="100"/></td>
+        <td colspan="4"><NewEsign :resultImg.sync ="item.signName" :isDisabled="item.staffId != $store.state.user.userId" :isReWrite="(applyStatus-0) ==1 && item.staffId == $store.state.user.userId" :width="918" :height="100"/></td>
         <td colspan="4" v-if="(applyStatus-0) ==1">
           <el-date-picker clearable size="small"
                           v-model="item.signDate"

danger-manage-web/src/components/NewSaftyWork/HeightWork.vue

@@ -254,7 +254,7 @@
         <td colspan="2" v-if="(applyStatus-0) ==1"><input :disabled="item.staffId != $store.state.user.userId" v-model="item.opinion" class="editInput"/></td>
         <td colspan="2" v-if="(applyStatus-0) !=1"><input disabled v-model="item.opinion" class="editInput"/></td>
         <td>签字:</td>
-        <td><NewEsign :resultImg.sync ="item.signName" :isDisabled="item.staffId != $store.state.user.userId" :isReWrite="(applyStatus-0) ==1" :width="918" :height="100"/></td>
+        <td><NewEsign :resultImg.sync ="item.signName" :isDisabled="item.staffId != $store.state.user.userId" :isReWrite="(applyStatus-0) ==1 && item.staffId == $store.state.user.userId" :width="918" :height="100"/></td>
         <td v-if="(applyStatus-0) ==1">
           <el-date-picker clearable size="small"
                           v-model="item.signDate"