基层登图标替换、规章制度取消按钮样式冲突、人力资源查看按钮修改

src/assets/icons/svg/一周.svg

@@ -0,0 +1 @@
+<svg t="1649143182235" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5575" width="200" height="200"><path d="M972.8 433.152H56.32V242.176c0-63.488 51.2-114.688 114.688-114.688h687.616c63.488 0 114.688 51.2 114.688 114.688v190.976h-0.512zM132.608 356.864h763.904V242.176c0-20.992-16.896-38.4-38.4-38.4H171.008c-20.992 0-38.4 16.896-38.4 38.4v114.688z" fill="#FFFFFF" p-id="5576"></path><path d="M858.112 967.68H171.008C107.52 967.68 56.32 916.48 56.32 852.992v-496.64h916.48v496.64c0 63.488-51.2 114.688-114.688 114.688zM132.608 433.152v419.84c0 20.992 16.896 38.4 38.4 38.4h687.616c20.992 0 38.4-16.896 38.4-38.4v-419.84H132.608z m190.976-114.688c-20.992 0-38.4-16.896-38.4-38.4V89.6c0-20.992 16.896-38.4 38.4-38.4 20.992 0 38.4 16.896 38.4 38.4v190.976c0 20.992-17.408 37.888-38.4 37.888z m381.952 0c-20.992 0-38.4-16.896-38.4-38.4V89.6c0-20.992 16.896-38.4 38.4-38.4 20.992 0 37.888 16.896 38.4 38.4v190.976c0 20.992-17.408 37.888-38.4 37.888z" fill="#FFFFFF" p-id="5577"></path><path d="M543.744 570.368H399.872V509.44h229.376v44.544c-76.288 83.968-85.504 141.824-91.136 261.12H457.216c6.656-100.864 23.552-165.376 86.528-244.736z" fill="#FFFFFF" p-id="5578"></path></svg>

src/assets/icons/svg/人员名册.svg

@@ -0,0 +1 @@
+<svg t="1649143138762" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5444" width="200" height="200"><path d="M849.408 958.976l-640.512 0.512c-53.248 0-96.256-42.496-96.256-95.744l-0.512-97.28 64-0.512 0.512 97.28c0 17.92 14.336 32.256 32.256 31.744l640.512-0.512c17.92 0 32.256-14.336 31.744-32.256l-2.56-702.464c0-17.92-14.336-32.256-32.256-31.744l-641.024 1.024c-17.92 0-32.256 14.336-31.744 32.256l0.512 95.232-64 0.512-0.512-95.232c0-53.248 42.496-96.256 95.744-96.256l640.512-0.512c53.248 0 96.256 42.496 96.256 95.744l2.56 702.464c0.512 52.224-42.496 95.744-95.232 95.744z" fill="#FFFFFF" p-id="5445"></path><path d="M111.616 385.536h64l1.024 256H112.64l-1.024-256z m-32.768-95.744l128-0.512V353.28l-128 0.512V289.792z m1.536 384l128-0.512V737.28l-128 0.512v-64z m270.336-470.528c-17.92 0-32.256 14.336-32.256 32.256 0 17.408 14.336 31.744 32.256 31.744s32.256-14.336 31.744-32.256c0-17.408-14.336-31.744-31.744-31.744z m64.512 143.872c0 35.328-128 35.84-128 0.512-0.512-35.84 28.16-71.168 63.488-71.168 35.328-0.512 64.512 35.328 64.512 70.656zM350.72 427.008c-17.92 0-32.256 14.336-32.256 32.256 0 17.408 14.336 31.744 32.256 31.744s32.256-14.336 31.744-32.256c0-17.408-14.336-31.744-31.744-31.744z m64.512 143.872c0 35.328-128 35.84-128 0.512s28.16-70.656 64-71.168c34.816 0 64 35.328 64 70.656z m-64.512 80.384c-17.92 0-32.256 14.336-32.256 32.256 0 17.408 14.336 31.744 32.256 31.744s32.256-14.336 31.744-32.256c0-17.408-14.336-31.744-31.744-31.744z m64.512 143.872c0 35.328-128 35.84-128 0.512s28.16-70.656 64-71.168 64 35.328 64 70.656zM512 257.024h320v64H512V257.024z m0 223.232h320v64H512V480.256z m0 223.744h320V768H512v-64z" fill="#FFFFFF" p-id="5446"></path></svg>

src/assets/icons/svg/人员基本.svg

@@ -0,0 +1 @@
+<svg t="1649142848878" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5314" width="200" height="200"><path d="M169.984 927.744v-53.248c0-180.224 138.752-328.704 315.904-345.6h0.512c10.752-1.024 22.016-1.536 32.768-1.536h5.12c38.912-3.072 98.304-12.288 129.536-39.936l15.36-11.776c59.392-46.08 93.184-115.2 93.184-189.44 0-133.12-109.056-241.152-242.688-241.152C385.536 45.056 276.48 153.6 276.48 286.208c0 74.24 33.792 143.36 93.184 189.44l15.36 11.776-17.92 7.168C209.408 557.568 107.52 706.56 107.52 874.496v83.968c0 16.896 13.824 31.232 31.232 31.232h457.216c-14.848-18.944-27.648-39.936-37.888-61.952H169.984zM339.456 286.208c0-98.816 80.896-179.2 180.224-179.2s180.224 80.384 180.224 179.2-80.896 179.2-180.224 179.2c-99.84 0-180.224-80.384-180.224-179.2z m267.776 287.744h241.152c16.896 0 30.208 13.312 30.208 30.208s-13.312 30.208-30.208 30.208h-241.152c-16.896 0-30.208-13.312-30.208-30.208s13.824-30.208 30.208-30.208z m0 131.584h241.152c16.896 0 30.208 13.312 30.208 30.208 0 16.384-13.312 30.208-30.208 30.208h-241.152c-16.896 0-30.208-13.824-29.696-30.72 0.512-16.384 13.312-29.696 29.696-29.696z m0 131.584h241.152c16.896 0 30.208 13.312 30.208 30.208s-13.312 30.208-30.208 30.208h-241.152c-16.896 0-30.208-13.824-29.696-30.72 0.512-16.384 13.312-29.184 29.696-29.696z" fill="#FFFFFF" p-id="5315"></path></svg>

src/assets/icons/svg/登记薄.svg

@@ -0,0 +1 @@
+<svg t="1649143214356" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5707" width="200" height="200"><path d="M189.44 103.936c-35.84 0-65.024 29.184-65.024 65.024v747.008c0 35.84 29.184 65.024 65.024 65.024h649.216c17.408 0 33.792-6.656 46.08-18.944s18.944-28.672 18.944-46.08v-747.52c0-35.84-29.184-65.024-65.024-65.024H727.04l32.256 32.256V87.04c0-26.624-22.016-48.64-48.64-48.64h-394.24c-26.624 0-48.64 21.504-48.64 48.64v48.64l32.256-32.256-110.592 0.512z m143.872 64.512V87.552c0 9.216-7.168 16.384-16.384 16.384h394.24c-6.656 0-12.8-4.096-14.848-10.24-1.024-2.048-1.024-4.096-1.024-6.144V168.96h143.872v747.008H189.952V168.96h111.616l31.744-0.512z m361.472 16.384c0-9.216 7.168-16.384 16.384-16.384h-394.24c9.216 0 16.384 7.168 16.384 16.384v-48.64c-0.512-17.92-15.872-31.744-33.792-31.232-16.896 0.512-30.72 14.336-31.232 31.232v48.64c0 26.624 22.016 48.64 48.64 48.64h394.24c26.624 0 48.64-21.504 48.64-48.64v-48.64c-0.512-17.92-15.872-31.744-33.792-31.232-16.896 0.512-30.72 14.336-31.232 31.232v48.64z" fill="#FFFFFF" p-id="5708"></path><path d="M716.288 471.04l-108.032-107.008c-4.608-2.56-9.216-4.096-14.336-4.608s-10.752 1.024-14.336 4.608l-268.288 268.8c-2.56 4.096-4.096 9.216-4.608 14.336v107.008c0 5.12 2.048 10.24 5.632 13.824 3.584 3.584 8.704 5.632 13.824 5.632h108.032c5.12 0.512 10.752-1.024 14.336-4.608l160.256-161.28c7.168-8.192 7.168-20.48 0-28.672-8.192-7.168-20.48-7.168-28.672 0l-155.648 154.624H345.088v-78.848L593.92 407.04l78.848 78.336-21.504 26.112-40.448-40.448c-8.192-7.168-20.48-7.168-28.672 0-7.168 8.192-7.168 20.48 0 28.672l52.736 54.784c4.608 2.56 9.216 4.096 14.336 4.608s10.752-1.024 14.336-4.608l52.736-54.784c2.56-4.608 4.096-9.216 4.608-14.336 1.024-5.12-1.024-10.752-4.608-14.336z" fill="#FFFFFF" p-id="5709"></path></svg>

src/assets/icons/svg/记事本.svg

@@ -0,0 +1 @@
+<svg t="1649143251080" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5838" width="200" height="200"><path d="M946.176 199.68c-1.024-1.536-13.824-9.728-20.992-13.312-8.704-4.096-17.92-6.144-27.136-6.656-16.896 0-33.28 8.192-43.52 21.504l-35.84 50.688-244.736 381.952c-1.024 1.536-1.536 4.096-2.56 5.632l-1.024 1.024-48.64 130.56c-1.536 7.68 1.536 15.872 8.704 19.968 6.656 4.096 15.36 4.096 22.016 0l102.912-92.16c1.536-1.024 1.536-2.56 3.584-3.584l2.56-2.56 257.536-380.928c8.704-12.288 29.184-41.472 35.84-53.248 15.36-25.088-2.56-53.76-8.704-58.88zM283.648 330.24H619.52c19.968-0.512 36.352-16.896 35.84-37.376v-0.512c0.512-19.968-15.36-36.864-35.328-37.376H283.648c-19.968 0.512-36.352 16.896-35.84 37.376v0.512c0 20.48 15.872 37.376 35.84 37.376z" fill="#FFFFFF" p-id="5839"></path><path d="M779.264 747.008v134.656H155.648V140.8h623.616v34.304h76.288V138.24c0-39.936-33.28-72.192-73.728-72.192H152.576c-40.96 0-73.728 32.256-73.728 72.192v746.496c0 39.936 33.28 72.192 73.728 72.192h629.248c40.96 0 73.728-32.256 73.728-72.192V747.52h-76.288v-0.512z" fill="#FFFFFF" p-id="5840"></path><path d="M542.208 455.168H283.136c-20.992 0-37.888 17.408-37.376 38.4v0.512c0 21.504 16.896 38.4 37.376 38.4h259.072c20.992 0 37.888-17.408 37.376-38.4v-0.512c1.024-20.992-15.872-37.888-37.376-38.4 0.512 0 0.512 0 0 0z m-259.072 278.528h117.248c20.992 0 37.888-17.408 37.376-38.4v-0.512c0.512-20.992-16.384-38.4-37.376-38.4H283.136c-20.992 0-37.888 17.408-37.376 38.4v0.512c0 21.504 16.384 38.4 37.376 38.4z" fill="#FFFFFF" p-id="5841"></path></svg>

src/assets/styles/global.css

@@ -411,7 +411,7 @@ color: #fff;
   font-size: 14px;
   text-align: center;
   margin-top: 1px;
-  padding-top: 10px !important;
+  padding-top: 10px ;
 }
 
 .el-icon-refresh {

src/views/pt.vue

@@ -560,7 +560,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="button1" v-if="ggflg" @click="submitForm">确 定</button>
-        <button @click="cancel">取 消</button>
+        <button @click="cancel" >取 消</button>
       </div>
     </el-dialog>
   </div>
@@ -1512,14 +1512,14 @@ hr {
 }
 .dialog-footer button {
   width: 60px;
-  height: 25px;
+  height: 30px;
   text-align: center;
   line-height: 21px;
-  color: #000;
+  color: #fff;
   border-radius: 3px;
   border: none;
-  background-color: #fff;
-  margin-top: 10px;
+  background-color: #196299;
+  margin-top: 20px;
 }
 .dialog-footer .button1 {
   background-color: #409eff;

src/views/regulations/fileinfo/index.vue

@@ -1302,6 +1302,7 @@ table {
 /* 输入框背景 */
 ::v-deep .el-input__inner {
   background-color: #004d86;
+  border: 1px solid white !important;
   /* width: 270px; */
 }
 ::v-deep .filename .el-input__inner {
@@ -1459,4 +1460,7 @@ body,
   background-color: #1263aa !important;
   color: #fff !important;
 }
+::v-deep .el-dialog__footer .dialog-footer .el-button--btn{
+  padding-top: 00px !important;
+}
 </style>

src/views/workingArrangements/planTask/index.vue

@@ -165,7 +165,7 @@
             <span>进度录入</span>
           </el-button>
           <el-button
-            size="btlook"
+            size="btk"
             type="text"
             @click="handleChakan(scope.row)"
             v-if="scope.row.common == 1"
@@ -174,13 +174,13 @@
             <span class="chakan">查看</span>
           </el-button>
           <el-button
-            size="btn"
+            size="btk"
             type="text"
             @click="handleChakan1(scope.row)"
             v-if="scope.row.common == 2 || scope.row.common == 0"
           >
             <!-- 多人进度 -->
-            <span class="chakan">进度查看</span>
+            <span class="chakan">查看</span>
           </el-button>
           <el-button
             size="btu"

src/views/workingArrangements/workTask/index.vue

@@ -199,12 +199,12 @@
       />
       <el-table-column
         label="操作"
-        align="left"
+        align="center"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
           <el-button
-            size="btn"
+            size="btlook"
             type="text"
             @click="ViewProgress(scope.row)"
             v-if="scope.row.common == 1 && scope.row.taskProgress != '100'"
@@ -212,7 +212,7 @@
             <span>进度录入</span>
           </el-button>
           <el-button
-            size="btlook"
+            size="btk"
             type="text"
             @click="handleChakan(scope.row)"
             v-if="scope.row.common == 1"
@@ -221,13 +221,13 @@
             <span class="chakan">查看</span>
           </el-button>
           <el-button
-            size="btlook"
+            size="btk"
             type="text"
             @click="handleChakan1(scope.row)"
             v-if="scope.row.common == 2 || scope.row.common == 0"
           >
             <!-- 多人进度查看 -->
-            <span class="chakan">进度查看</span>
+            <span class="chakan">查看</span>
           </el-button>
           <el-button
             size="btu"
@@ -403,7 +403,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel" size="btn">取 消</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 进度录入弹框 -->
@@ -468,7 +468,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm1">确 定</el-button>
-        <el-button @click="cancel" size="btn">取 消</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 单人进度查看弹框 -->
@@ -556,7 +556,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
-        <el-button @click="cancel" size="btn">取 消</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 多人进度查看弹框 -->
@@ -703,7 +703,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
-        <el-button @click="cancel" size="btn">取 消</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -810,7 +810,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
-        <el-button @click="cancel" size="btn">取 消</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
     <!-- 多人进度查看弹框 -->
@@ -857,7 +857,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm4">导 出</el-button>
-        <el-button @click="cancel" size="btn">取 消</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>