swq 2 달 전
부모
커밋
fee9e66d3d
4개의 변경된 파일26개의 추가작업 그리고 17개의 파일을 삭제
  1. 5 4
      src/views/enterprise/export .vue
  2. 6 5
      src/views/enterprise/exportOutput.vue
  3. 1 2
      src/views/enterprise/export_code.vue
  4. 14 6
      src/views/login.vue

+ 5 - 4
src/views/enterprise/export .vue

@@ -42,14 +42,15 @@
           >
             显示样品名称
           </el-checkbox>
-          <el-button style="margin-left: 2%" @click="printPage">打印</el-button>
+          <el-button style="margin-left: 2%" type="primary" @click="printPage">打印</el-button>
+          <el-button style="margin-left: 2%" type="success" @click="shareData">分享</el-button>
           <el-button style="margin-left: 2%" @click="saveData">保存</el-button>
-          <el-button style="margin-left: 2%" @click="shareData">分享</el-button>
+
         </div>
 
         <div v-else-if="selectedButton === 'output'">
-          <el-button style="margin-left: 2%" @click="printPage">打印</el-button>
-          <el-button style="margin-left: 2%" @click="saveData">保存</el-button>
+          <el-button style="margin-left: 2%" type="primary" @click="printPage">打印</el-button>
+          <el-button style="margin-left: 2%" type="success" @click="saveData">保存</el-button>
         </div>
       </div>
     </div>

+ 6 - 5
src/views/enterprise/exportOutput.vue

@@ -1,22 +1,23 @@
 <template>
   <div class="prep-materials" style="width: 90%;margin-left: 10%;margin-top: 5%">
-    <div style="width: 60%">
+    <div class="prep-materials" style="margin-top: 5%;width: 90%">
       <el-row>
         <el-col :span="24" class="header">xxxx公司2024-01组试验备料单</el-col>
       </el-row>
-      <el-row class="details" style="font-size: 14px;margin-top: 3%">
+      <el-row class="details">
         <el-col :span="6">组编码:2024-01</el-col>
         <el-col :span="6">创建日期:xxxx年xx月xx日</el-col>
         <el-col :span="6">项目结束日期:xxxx年xx月xx日</el-col>
         <el-col :span="6">项目组重复:3次</el-col>
       </el-row>
-      <el-table :data="properties" border style="">
-        <el-table-column fixed prop="property" label="序号" ></el-table-column>
+      <el-table :data="properties" border style="width: 100%;overflow-x: auto;">
+        <el-table-column fixed prop="property" label="序号" width="100"></el-table-column>
         <el-table-column
           v-for="(product, index) in products"
           :key="index"
           :prop="`value${index}`"
-          :label="product['序号']" width="">
+          :label="product['序号']" width="100"
+        >
         </el-table-column>
       </el-table>
     </div>

+ 1 - 2
src/views/enterprise/export_code.vue

@@ -99,8 +99,7 @@
     </tr>
     </tbody>
   </table>
-  <el-button style="margin-left: 30%">打印</el-button>
-  <el-button style="margin-left: 30%">分享</el-button>
+
 </div>
 </template>
 <script>

+ 14 - 6
src/views/login.vue

@@ -100,7 +100,7 @@
               <div style="border-bottom: 1px solid #e6e6e6; width: 80%; margin-top: 5%">
                 <input
                   :type="showPassword? 'text' : 'password'"
-                  style="border: none; width: 96%; height: 30px; font-size: 15px; outline: none"
+                  style="border: none; width: 96%; height: 34px; font-size: 16px; outline: none"
                   name="password"
                   placeholder="输入密码"
                 />
@@ -123,11 +123,11 @@
             </div>
             <div v-if="activeTab === '3'">
               <!-- 二维码登录内容 -->
-              <img src="your_qr_code_image_path.jpg" alt="二维码"
-                   style="width: 100px; height: 100px; margin: 0 auto; display: block;"
-              >
-              <el-button class="gradient-button">立即登录</el-button>
-              <div align="left" style="margin-left: 10%; margin-top: 4%">
+              <img src="https://p0.ssl.img.360kuai.com/t016408070083e8da97.jpg" alt="二维码"
+                   style="width: 160px; height: 160px; margin: 0 auto; display: block;">
+              <span style="font-size: 16px;color: #606266;margin-top: 2px;display: inline-block ">打开手机app扫码登录</span>
+              <el-button class="gradient-button1">立即登录</el-button>
+              <div align="left" style="margin-left: 10%; margin-top: 2%">
                 <el-checkbox v-model="checked" style="">我已阅读并同意蚯蚓农服 <a href="" style="color: #00afff"
                 >许可协议</a>
                   和 <a href="" style="color: #00afff">隐私政策</a></el-checkbox>
@@ -370,6 +370,14 @@ export default {
   font-size: 16px;
   background: linear-gradient(to bottom, #9aecfd, #99e2d9);
 }
+.gradient-button1 {
+  margin-top: 14px;
+  width: 80%;
+  height: 12%;
+  color: white;
+  font-size: 16px;
+  background: linear-gradient(to bottom, #9aecfd, #99e2d9);
+}
 
 .el-checkbox__inner:hover {
   border-color: #00c0bf;