Parcourir la source

1.解决当pdf组件多出一个块canvas的问题。2.dockerrun文件。

jiaxiaoqiang il y a 10 mois
Parent
commit
aa0056b967

+ 20 - 0
.run/docker_Dockerfile.run.xml

@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="docker/Dockerfile" type="docker-deploy" factoryName="dockerfile" singleton="false" server-name="Docker">
+    <deployment type="dockerfile">
+      <settings>
+        <option name="imageTag" value="qingban-client:latest" />
+        <option name="containerName" value="qingban-client" />
+        <option name="portBindings">
+          <list>
+            <DockerPortBindingImpl>
+              <option name="containerPort" value="80" />
+              <option name="hostPort" value="22000" />
+            </DockerPortBindingImpl>
+          </list>
+        </option>
+        <option name="sourceFilePath" value="docker/Dockerfile" />
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>

+ 15 - 0
src/styles/index.scss

@@ -1,18 +1,22 @@
 @use "./reset";
 @use "./transition";
+
 .app-container {
   padding: 10px;
 }
+
 .el-button-big {
   height: 80px !important;
   border-radius: 40px !important;
   font-size: $f24 !important;
 }
+
 .el-button-update {
   height: 80px !important;
   border-radius: 16px !important;
   font-size: $f24 !important;
 }
+
 .search-container {
   padding: 18px 0 0 10px;
   margin-bottom: 10px;
@@ -26,14 +30,17 @@
 .el-popconfirm__main {
   font-size: 20px;
 }
+
 .el-popconfirm__action {
   height: 40px;
 }
+
 .el-popconfirm__action > button {
   font-size: 20px;
   padding: 10px;
   height: 100%;
 }
+
 //气泡确认框样式(适当调大样式)
 .table-container > .el-card__header {
   padding: calc(var(--el-card-padding) - 8px) var(--el-card-padding);
@@ -86,10 +93,12 @@
   gap: 20px;
   grid-template-columns: 1fr 1fr;
 }
+
 .stepsViewScrollH {
   width: calc((100vw / 6 * 5) - 50px);
   height: calc(100vh - 254px);
 }
+
 //search框样式
 .searchInput {
   height: 50px;
@@ -98,6 +107,7 @@
   border: 1px solid #00000025;
   font-size: $f24;
   color: #00000080;
+
   .el-input {
     --el-input-focus-border: none;
     --el-input-hover-border: none;
@@ -273,3 +283,8 @@
   font-size: $p20;
   color: black;
 }
+
+//解决当pdf组件中,,有写pdf会导致页面右侧多出一个黑色块的canvas
+.hiddenCanvasElement {
+  display: none;
+}

+ 1 - 1
src/views/pro-operation/check-out/index.vue

@@ -26,7 +26,7 @@
           <FirstCheck :user-name="userInfo?.userName" />
         </el-tab-pane>
         <el-tab-pane
-          v-if="store.scanInfo.inspection == 0"
+          v-if="store.scanInfo.inspection == 1"
           label="巡检"
           name="second"
         >

+ 0 - 1
src/views/pro-steps/components/operates.vue

@@ -92,7 +92,6 @@ const stepComponents = ref([
 ]);
 
 onMounted(() => {
-  // TODO: 删掉注释
   if (store.scanInfo.inspection == 1 || store.scanInfo.firstCheck == 1) {
     stepComponents.value.push({
       compentName: "检验",