Эх сурвалжийг харах

修改扩展页样式及topbar样式

尹帮元 2 жил өмнө
parent
commit
46ba942075

+ 1 - 1
src/assets/styles/ruoyi.scss

@@ -169,7 +169,7 @@
 	border-bottom: 1px solid #e7eaec;
 	border-top: 1px solid #e7eaec;
 	margin-bottom: -1px;
-	padding: 11px 0px;
+	padding: 17px 0px;
 	font-size: 13px;
 }
 

+ 20 - 7
src/layout/components/Navbar.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
     <div class="title-box"> 移动安全保卫管理平台项目 </div>
@@ -19,9 +18,13 @@
       </template>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
-        <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
-          <i class="el-icon-caret-bottom" />
+<!--        <div class="avatar-wrapper">-->
+<!--          <img :src="avatar" class="user-avatar">-->
+<!--          <i class="el-icon-caret-bottom" />-->
+<!--        </div>-->
+        <div class="user-name-box">
+           <span >{{name}}</span>
+           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
           <router-link to="/user/profile">
@@ -66,11 +69,15 @@ export default {
       showSetting: process.env.NODE_ENV === "development"
     }
   },
+  mounted(){
+    console.log(this.$store.getters,'name')
+  },
   computed: {
     ...mapGetters([
       'sidebar',
       'avatar',
-      'device'
+      'device',
+      'name'
     ]),
     setting: {
       get() {
@@ -185,7 +192,14 @@ export default {
         }
       }
     }
-
+    .user-name-box{
+      font-size: 14px;
+      color: #fff;
+      align-items: center;
+      >span{
+        margin-right: 5px;
+      }
+    }
     .avatar-container {
       margin-right: 30px;
 
@@ -200,7 +214,6 @@ export default {
           background-color: #fff;
           padding:7px;
         }
-
         .el-icon-caret-bottom {
           cursor: pointer;
           position: absolute;

+ 1 - 1
src/store/modules/user.js

@@ -65,7 +65,7 @@ const user = {
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
-          commit('SET_NAME', user.userName)
+          commit('SET_NAME', user.name)
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {

+ 377 - 411
src/views/system/dept/extend.vue

@@ -1,164 +1,136 @@
 <template>
-  <div
-    class="container"
-    style="
-      min-height: 100%;
-      padding-bottom: 100px;
-      margin-left: 25px;
-      margin-top: 20px;
-    "
-  >
-    <el-descriptions title="同步信息">
-      <el-descriptions-item label="机构名称">{{ name }}</el-descriptions-item>
-      <el-descriptions-item label="机构简称">{{ name }}</el-descriptions-item>
-      <el-descriptions-item label="机构组织类型">{{
-        type
-      }}</el-descriptions-item>
-      <el-descriptions-item label="部门机构电话">{{
-        phone
-      }}</el-descriptions-item>
-      <el-descriptions-item label="部门机构地址">{{
-        address
-      }}</el-descriptions-item>
-      <el-descriptions-item label="排序号">{{ sort }}</el-descriptions-item>
-      <el-descriptions-item label="是否可用">{{
-        isLock > 0 ? "否" : "是"
-      }}</el-descriptions-item>
-      <el-descriptions-item label="更新时间">{{
-        updateTime
-      }}</el-descriptions-item>
-      <el-descriptions-item label="同步时间">{{
-        createTime
-      }}</el-descriptions-item>
-      <!-- <el-descriptions-item label="机构类型">一级机构</el-descriptions-item> -->
-    </el-descriptions>
+  <div class="app-container">
+    <h3 class="title">同步信息</h3>
+    <div class="info-box">
+      <el-descriptions >
+        <el-descriptions-item v-for="v in dataInfo" :label="v.label" :key="v.key">{{ v.value }}</el-descriptions-item>
+        <!-- <el-descriptions-item label="机构类型">一级机构</el-descriptions-item> -->
+      </el-descriptions>
+    </div>
 
-    <el-descriptions title="补充基础信息"></el-descriptions>
-    <div div-lc-mark>
-      <el-form inline class="demo-form-inline">
-        <el-row>
-          <el-form-item label="机构类型">
-            <el-select v-model="orgType" placeholder="机构类型">
+    <h3 class="title">补充基础信息</h3>
+    <div class="info-box" style="margin-bottom: 0;">
+      <el-form inline class="demo-form-inline" label-position="left" label-width="120px">
+        <el-row >
+          <el-col :span="8">
+            <el-form-item label="机构类型">
+              <el-select v-model="orgType" placeholder="机构类型">
+                <el-option
+                  v-for="(orgTyp, key) in orgTypes"
+                  :key="key"
+                  :label="orgTyp.label"
+                  :value="orgTyp.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item v-if="orgType" label="天气区域编码" >
+              <el-input
+                v-model="weatherAreaCode"
+                placeholder="天气区域编码"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item v-if="orgType" label="营业场所面积">
+              <el-input v-model="premisesArea" placeholder="营业场所面积"></el-input>
+            </el-form-item>
+          </el-col>
+         <el-col :span="8">
+           <el-form-item
+             v-if="!orgType"
+             label="建设时间"
+             prop="constructionTime"
+           >
+             <el-date-picker
+               clearable
+               v-model="constructionTime"
+               type="date"
+               value-format="yyyy-MM-dd HH:mm:ss"
+               placeholder="请选择建设时间"
+             >
+             </el-date-picker>
+           </el-form-item>
+         </el-col>
+          <el-col :span="8">
+            <el-form-item
+              v-if="!orgType"
+              label="最近一次更新"
+              prop="lastUpdateTime"
+            >
+              <el-date-picker
+                clearable
+                v-model="lastUpdateTime"
+                type="date"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择更新日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+            <el-form-item v-if="!orgType" label="平台品牌">
+            <el-select v-model="platformBrand" placeholder="平台品牌">
               <el-option
-                v-for="(orgTyp, key) in orgTypes"
+                v-for="(platformB, key) in platformBrands"
                 :key="key"
-                :label="orgTyp.label"
-                :value="orgTyp.value"
+                :label="platformB.label"
+                :value="platformB.value"
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            v-if="orgType"
-            label="天气区域编码"
-            style="margin-left: 270px"
-          >
-            <el-input
-              v-model="weatherAreaCode"
-              placeholder="天气区域编码"
-            ></el-input>
-          </el-form-item>
-          <el-form-item
-            v-if="orgType"
-            label="营业场所面积"
-            style="margin-left: 258px"
-          >
-            <el-input
-              v-model="premisesArea"
-              placeholder="营业场所面积"
-            ></el-input>
-          </el-form-item>
-
-          <el-form-item
-            style="margin-left: 270px"
-            v-if="!orgType"
-            label="建设时间"
-            prop="constructionTime"
-          >
-            <el-date-picker
-              clearable
-              v-model="constructionTime"
-              type="date"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="请选择建设时间"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item
-            style="margin-left: 265px"
-            v-if="!orgType"
-            label="最近一次更新"
-            prop="lastUpdateTime"
-          >
-            <el-date-picker
-              clearable
-              v-model="lastUpdateTime"
-              type="date"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="请选择更新日期"
-            >
-            </el-date-picker>
-          </el-form-item>
+          <el-col :span="8">
+            <el-form-item
+              v-if="!orgType"
+              label="平台供应商品牌">
+              <el-select
+                v-model="platformSupplierBrand"
+                placeholder="平台供应商品牌">
+                <el-option
+                  v-for="(platformSupplierB, key) in platformSupplierBrands"
+                  :key="key"
+                  :label="platformSupplierB.label"
+                  :value="platformSupplierB.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
-        <el-form-item v-if="!orgType" label="平台品牌">
-          <el-select v-model="platformBrand" placeholder="平台品牌">
-            <el-option
-              v-for="(platformB, key) in platformBrands"
-              :key="key"
-              :label="platformB.label"
-              :value="platformB.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          style="margin-left: 270px"
-          v-if="!orgType"
-          label="平台供应商品牌"
-        >
-          <el-select
-            v-model="platformSupplierBrand"
-            placeholder="平台供应商品牌"
-          >
-            <el-option
-              v-for="(platformSupplierB, key) in platformSupplierBrands"
-              :key="key"
-              :label="platformSupplierB.label"
-              :value="platformSupplierB.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
       </el-form>
     </div>
-    <div v-if="orgType">
-      <div div-lc-mark>
+    <div v-if="orgType" class="info-box">
+      <div>
         <el-switch
           v-model="ownership"
           active-text
           inactive-text="是否自有产权"
+          :active-value="1"
+          :inactive-value="0"
         ></el-switch>
         <el-switch
           style="margin-left: 50px"
           v-model="outsideArea"
           active-text
           inactive-text="是否区域外"
+          :active-value="1"
+          :inactive-value="0"
         ></el-switch>
       </div>
-      <div div-lc-mark style="margin-top: 20px">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleOrgAdd"
-            v-hasPermi="['system:construction:add']"
-            >新增</el-button
-          >
-        </el-col>
+      <div>
+        <el-button
+          style="margin: 20px 0;"
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleOrgAdd"
+          v-hasPermi="['system:construction:add']"
+          >新增</el-button>
         <el-table
+          border
           v-loading="orgloading"
           :data="constructionList"
-          @selection-change="handleOrgSelectionChange"
-        >
+          @selection-change="handleOrgSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="id" align="center" prop="id" />
           <el-table-column label="标准" align="center" prop="standard" />
@@ -169,7 +141,7 @@
             width="180"
           >
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.dateOfCompliance) }}</span>
+              <span>{{ formatTime(scope.row.dateOfCompliance) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -219,268 +191,264 @@
           </el-table-column>
         </el-table>
       </div>
-      <el-descriptions title="保安" style="margin-top: 20px"></el-descriptions>
-      <div div-lc-mark>
+
+      <div>
         <el-switch
           style="margin-right: 100px"
           v-model="askari"
           active-text
           inactive-text="是否有保安"
+          :active-value="1"
+          :inactive-value="0"
         ></el-switch>
-        <span>上传保安证</span>
-        <!-- <div style="width: 100px;height: 50px;display: inline-block">
-        <el-avatar shape="square" :size="100" :src="squareUrl"></el-avatar>
-      </div> -->
-        <div class="image-container" style="margin-left: 20px">
-          <el-image class="zoom-image border-color-change" :src="uploadp" fit="contain" @click="triggerFileInput"></el-image>
-          <input type="file"
-      ref="fileInput"
-      @change="handleFileChange"
-      style="display: none;"/>
-        </div>
-        <div class="image-container" style="margin-right: 0">
-          <el-image class="zoom-image border-color-change" :src="uplp" fit="contain"></el-image>
+        <div v-if="askari">
+          <p>上传保安证</p>
+          <div class="image-container" style="margin-left: 20px">
+            <el-image class="zoom-image border-color-change" :src="uploadp" fit="contain" @click="triggerFileInput"></el-image>
+            <input type="file"
+                   ref="fileInput"
+                   @change="handleFileChange"
+                   style="display: none;"/>
+          </div>
+          <div class="image-container" style="margin-right: 0">
+            <el-image class="zoom-image border-color-change" :src="uplp" fit="contain"></el-image>
+          </div>
         </div>
       </div>
-      <div div-lc-mark style="margin-top: 10px">
-        <el-descriptions title="业务库设置"></el-descriptions>
-      </div>
-      <div div-lc-mark>
-        <span>业务库类型:</span>
-        <el-select
-          v-model="businessLibraryType"
-          placeholder="活动区域"
-          style="margin-left: 5px"
-        >
-          <el-option
-            v-for="(businessLibraryTy, key) in businessLibraryTypes"
-            :key="key"
-            :label="businessLibraryTy.label"
-            :value="businessLibraryTy.value"
-          ></el-option>
-        </el-select>
-        <span style="margin-left: 50px">值守方式</span>
-        <el-radio-group v-model="dutyMode" style="margin-left: 10px">
-          <el-radio :label="0">同楼异地值守</el-radio>
-          <el-radio :label="1">远程值守</el-radio>
-        </el-radio-group>
-        <el-switch
-          style="margin-left: 50px"
-          v-model="remoteControl"
-          active-text
-          inactive-text="业务库出入口远程控制"
-        ></el-switch>
-      </div>
-      <div div-lc-mark>
-        <el-descriptions
-          title="在行自助银行设置"
-          style="margin-top: 20px"
-        ></el-descriptions>
+    </div>
+
+    <h3 class="title">业务库设置</h3>
+    <div class="info-box" style="margin-top: 20px;">
+      <span>业务库类型:</span>
+      <el-select
+        v-model="businessLibraryType"
+        placeholder="活动区域"
+        style="margin-left: 5px">
+        <el-option
+          v-for="(businessLibraryTy, key) in businessLibraryTypes"
+          :key="key"
+          :label="businessLibraryTy.label"
+          :value="businessLibraryTy.value"
+        ></el-option>
+      </el-select>
+      <span style="margin-left: 50px">值守方式</span>
+      <el-radio-group v-model="dutyMode" style="margin-left: 10px">
+        <el-radio :label="0">同楼异地值守</el-radio>
+        <el-radio :label="1">远程值守</el-radio>
+      </el-radio-group>
+      <el-switch
+        style="margin-left: 50px"
+        v-model="remoteControl"
+        active-text
+        inactive-text="业务库出入口远程控制"
+        :active-value="1"
+        :inactive-value="0"
+      ></el-switch>
+    </div>
+
+    <h3 class="title">在行自助银行设置</h3>
+    <div class="info-box">
+      <el-switch
+        v-model="selfServiceBank"
+        active-text
+        inactive-text="是否有在行自助银行"
+        :active-value="1"
+        :inactive-value="0"
+      ></el-switch>
+      <span style="margin-left: 50px">在行式大堂设备</span>
+      <div style="display: inline-block; width: 200px">
+        <el-input-number
+          style="margin-left: 10px"
+          v-model="lobbyEquipment"
+          controls-position="right"
+          @change="handleChange"
+          :min="1"
+          :max="10"
+        ></el-input-number>
       </div>
-      <div div-lc-mark>
-        <el-switch
-          v-model="selfServiceBank"
-          active-text
-          inactive-text="是否有在行自助银行"
-        ></el-switch>
-        <span style="margin-left: 50px">在行式大堂设备</span>
-        <div style="display: inline-block; width: 200px">
-          <el-input-number
-            style="margin-left: 10px"
-            v-model="lobbyEquipment"
-            controls-position="right"
-            @change="handleChange"
-            :min="1"
-            :max="10"
-          ></el-input-number>
-        </div>
-        <span style="margin-left: 50px">在行式穿墙设备</span>
-        <div style="display: inline-block; width: 200px">
-          <el-input-number
-            style="margin-left: 10px"
-            v-model="wallPenetratingEquipment"
-            controls-position="right"
-            @change="handleChange"
-            :min="1"
-            :max="10"
-          ></el-input-number>
-        </div>
+      <span style="margin-left: 50px">在行式穿墙设备</span>
+      <div style="display: inline-block; width: 200px">
+        <el-input-number
+          style="margin-left: 10px"
+          v-model="wallPenetratingEquipment"
+          controls-position="right"
+          @change="handleChange"
+          :min="1"
+          :max="10"
+        ></el-input-number>
       </div>
-      <div div-lc-mark style="margin-top: 20px">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleBankAdd"
-            v-hasPermi="['system:BankPhysicalDefenseConstruction:add']"
-            >新增</el-button
-          >
-        </el-col>
-        <el-table
-          v-loading="bankloading"
-          :data="BankPhysicalDefenseConstructionList"
-          @selection-change="handleBankSelectionChange"
-        >
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="id" align="center" prop="id" />
-          <el-table-column label="标准" align="center" prop="standard" />
-          <el-table-column
-            label="达标日期"
-            align="center"
-            prop="dateOfCompliance"
-            width="180"
-          >
-            <template slot-scope="scope">
-              <span>{{
-                parseTime(scope.row.dateOfCompliance, "YYYY-MM-dd HH:mm:ss")
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="是否证书佐证"
-            align="center"
-            prop="certificateEvidence"
-          />
-          <el-table-column label="证书" align="center" prop="certificate" />
-          <el-table-column label="佐证" align="center" prop="evidence" />
-          <el-table-column
-            v-if="false"
-            label="机构id"
-            align="center"
-            prop="orgId"
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleBankUpdate(scope.row)"
-                v-hasPermi="['system:construction:edit']"
-                >查看证书</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleBankUpdate(scope.row)"
-                v-hasPermi="['system:BankPhysicalDefenseConstruction:edit']"
-                >修改</el-button
-              >
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleBankDelete(scope.row)"
-                v-hasPermi="['system:BankPhysicalDefenseConstruction:remove']"
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <!-- 添加或修改银行物防建设对话框 -->
-        <el-dialog
-          :title="Banktitle"
-          :visible.sync="Bankopen"
-          width="500px"
-          append-to-body
+    </div>
+    <div class="info-box">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleBankAdd"
+          v-hasPermi="['system:BankPhysicalDefenseConstruction:add']"
+        >新增</el-button
         >
-          <el-form ref="Bankform" :model="Bankform" label-width="80px">
-            <el-form-item label="标准" prop="standard">
-              <el-input v-model="Bankform.standard" placeholder="请输入标准" />
-            </el-form-item>
-            <el-form-item label="达标日期" prop="dateOfCompliance">
-              <el-date-picker
-                clearable
-                v-model="Bankform.dateOfCompliance"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="请选择达标日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="是否证书佐证" prop="certificateEvidence">
-              <el-input
-                v-model="Bankform.certificateEvidence"
-                placeholder="请输入是否证书佐证"
-              />
-            </el-form-item>
-            <el-form-item label="证书" prop="certificate">
-              <el-input
-                v-model="Bankform.certificate"
-                placeholder="请输入证书"
-              />
-            </el-form-item>
-            <el-form-item label="佐证" prop="evidence">
-              <el-input v-model="Bankform.evidence" placeholder="请输入佐证" />
-            </el-form-item>
-            <el-form-item v-if="false" label="机构id" prop="orgId">
-              <el-input v-model="Bankform.orgId" placeholder="请输入机构id" />
-            </el-form-item>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitBankForm">确 定</el-button>
-            <el-button @click="Bankcancel">取 消</el-button>
-          </div>
-        </el-dialog>
-      </div>
-      <el-dialog
-        :title="orgtitle"
-        :visible.sync="orgopen"
-        width="500px"
-        append-to-body
+      </el-col>
+      <el-table
+        v-loading="bankloading"
+        :data="BankPhysicalDefenseConstructionList"
+        @selection-change="handleBankSelectionChange"
       >
-        <el-form ref="orgform" :model="orgform" label-width="80px">
-          <el-form-item label="标准" prop="standard">
-            <el-input v-model="orgform.standard" placeholder="请输入标准" />
-          </el-form-item>
-          <el-form-item label="达标日期" prop="dateOfCompliance">
-            <el-date-picker
-              clearable
-              v-model="orgform.dateOfCompliance"
-              type="date"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="请选择达标日期"
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="id" align="center" prop="id" />
+        <el-table-column label="标准" align="center" prop="standard" />
+        <el-table-column
+          label="达标日期"
+          align="center"
+          prop="dateOfCompliance"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <span>{{parseTime(scope.row.dateOfCompliance, "YYYY-MM-dd HH:mm:ss") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="是否证书佐证"
+          align="center"
+          prop="certificateEvidence"
+        />
+        <el-table-column label="证书" align="center" prop="certificate" />
+        <el-table-column label="佐证" align="center" prop="evidence" />
+        <el-table-column
+          v-if="false"
+          label="机构id"
+          align="center"
+          prop="orgId"
+        />
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleBankUpdate(scope.row)"
+              v-hasPermi="['system:construction:edit']"
+            >查看证书</el-button
             >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="是否证书佐证" prop="certificateEvidence">
-            <el-input
-              v-model="orgform.certificateEvidence"
-              placeholder="请输入是否证书佐证"
-            />
-          </el-form-item>
-          <el-form-item label="证书" prop="certificate">
-            <el-input v-model="orgform.certificate" placeholder="请输入证书" />
-          </el-form-item>
-          <el-form-item label="佐证" prop="evidence">
-            <el-input v-model="orgform.evidence" placeholder="请输入佐证" />
-          </el-form-item>
-          <el-form-item v-if="false" label="机构id" prop="orgId">
-            <el-input v-model="orgform.orgId" placeholder="请输入机构id" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitOrgForm">确 定</el-button>
-          <el-button @click="orgcancel">取 消</el-button>
-        </div>
-      </el-dialog>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleBankUpdate(scope.row)"
+              v-hasPermi="['system:BankPhysicalDefenseConstruction:edit']"
+            >修改</el-button
+            >
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleBankDelete(scope.row)"
+              v-hasPermi="['system:BankPhysicalDefenseConstruction:remove']"
+            >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+
     </div>
+
     <div style="margin-top: 50px; margin-left: 42%">
-      <el-button type="primary" @click="saveExtend" size="small"
-        >提交</el-button
-      >
-      <el-button type="primary" @click="nosaveExtend" size="small"
-        >取消</el-button
-      >
+      <el-button type="primary" @click="saveExtend" size="small">提交</el-button>
+      <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button>
     </div>
+
+
+    <!-- 添加或修改银行物防建设对话框 -->
+    <el-dialog
+      :title="Banktitle"
+      :visible.sync="Bankopen"
+      width="500px"
+      append-to-body>
+      <el-form ref="Bankform" :model="Bankform" label-width="80px">
+        <el-form-item label="标准" prop="standard">
+          <el-input v-model="Bankform.standard" placeholder="请输入标准" />
+        </el-form-item>
+        <el-form-item label="达标日期" prop="dateOfCompliance">
+          <el-date-picker
+            clearable
+            v-model="Bankform.dateOfCompliance"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择达标日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="是否证书佐证" prop="certificateEvidence">
+          <el-input
+            v-model="Bankform.certificateEvidence"
+            placeholder="请输入是否证书佐证"
+          />
+        </el-form-item>
+        <el-form-item label="证书" prop="certificate">
+          <el-input
+            v-model="Bankform.certificate"
+            placeholder="请输入证书"
+          />
+        </el-form-item>
+        <el-form-item label="佐证" prop="evidence">
+          <el-input v-model="Bankform.evidence" placeholder="请输入佐证" />
+        </el-form-item>
+        <el-form-item v-if="false" label="机构id" prop="orgId">
+          <el-input v-model="Bankform.orgId" placeholder="请输入机构id" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitBankForm">确 定</el-button>
+        <el-button @click="Bankcancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :title="orgtitle"
+      :visible.sync="orgopen"
+      width="500px"
+      append-to-body>
+      <el-form ref="orgform" :model="orgform" label-width="80px">
+        <el-form-item label="标准" prop="standard">
+          <el-input v-model="orgform.standard" placeholder="请输入标准" />
+        </el-form-item>
+        <el-form-item label="达标日期" prop="dateOfCompliance">
+          <el-date-picker
+            clearable
+            v-model="orgform.dateOfCompliance"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择达标日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="是否证书佐证" prop="certificateEvidence">
+          <el-input
+            v-model="orgform.certificateEvidence"
+            placeholder="请输入是否证书佐证"
+          />
+        </el-form-item>
+        <el-form-item label="证书" prop="certificate">
+          <el-input v-model="orgform.certificate" placeholder="请输入证书" />
+        </el-form-item>
+        <el-form-item label="佐证" prop="evidence">
+          <el-input v-model="orgform.evidence" placeholder="请输入佐证" />
+        </el-form-item>
+        <el-form-item v-if="false" label="机构id" prop="orgId">
+          <el-input v-model="orgform.orgId" placeholder="请输入机构id" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitOrgForm">确 定</el-button>
+        <el-button @click="orgcancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -525,16 +493,18 @@ export default {
   components: {},
   data() {
     return {
-      //机构基础信息
-      name: null,
-      type: null,
-      phone: null,
-      address: null,
-      sort: null,
-      isLock: null,
-      updateTime: null,
-      createTime: null,
-      id: null,
+      //基础信息key
+      infoKeys:[
+        {label:'机构名称',key:'name'},
+        {label:'机构组织类型',key:'type'},
+        {label:'部门机构电话',key:'phone'},
+        {label:'部门机构地址',key:'address'},
+        {label:'排序号',key:'sort'},
+        {label:'是否可用',key:'isLock'},
+        {label:'更新时间',key:'updateTime'},
+        {label:'同步时间',key:'createTime'},
+      ],
+      dataInfo:[],
       //机构补充信息
       extendId: null,
       orgType: 1,
@@ -623,35 +593,27 @@ export default {
       },
     },
   },
-  beforeCreate() {},
   created() {
     this.getOrgInfo();
     this.getExtendInfo();
     this.getOrgPhysicalDefenseConstructionInfo();
     this.getBankPhysicalDefenseConstructionInfo();
   },
-  beforeMount() {},
   mounted() {},
-  beforeUpdate() {},
-  updated() {},
-  destroyed() {},
   methods: {
     request() {},
     handleChange(value) {},
     getOrgInfo() {
       getDept(this.$route.params.id).then((data) => {
         // console.log(data.data);
-        if (data.data != null) {
-          this.name = data.data.name;
-          this.type = data.data.type;
-          this.phone = data.data.phone;
-          this.address = data.data.address;
-          this.sort = data.data.sort;
-          this.isLock = data.data.isLock;
-          this.updateTime = data.data.updateTime;
-          this.createTime = data.data.createTime;
-          this.id = data.data.id;
-        }
+          if (!data.data ) return;
+          let res = data.data;
+          this.dataInfo = this.infoKeys.map((v,i)=> {
+            console.log(v, res[v.key], 'vvvvv')
+            v.value =  res[v.key];
+            return v
+          })
+        console.log(this.dataInfo, 'info')
       });
     },
 
@@ -888,7 +850,7 @@ export default {
           this.$router.go(-1);
         });
       }
-      
+
     },
     nosaveExtend() {
       this.$router.go(-1);
@@ -936,7 +898,11 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+
+.info-box{
+  margin: 0 30px 30px 30px;
+}
 .demo-form-inline {
 }
 .dialog-footer {

+ 12 - 3
src/views/system/user/profile/index.vue

@@ -7,9 +7,9 @@
             <span>个人信息</span>
           </div>
           <div>
-            <div class="text-center">
-              <userAvatar :user="user" />
-            </div>
+<!--            <div class="text-center">-->
+<!--              <userAvatar :user="user" />-->
+<!--            </div>-->
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
                 <svg-icon icon-class="user" />用户名称
@@ -91,3 +91,12 @@ export default {
   }
 };
 </script>
+<style lang="scss">
+.list-group-item{
+  border-top: 0;
+  align-items: center;
+  >svg{
+    margin-right: 5px;
+  }
+}
+</style>

+ 22 - 15
src/views/system/workTimeSet/dialog.template.vue

@@ -37,12 +37,20 @@
                 </el-table-column>
                 <el-table-column label="营业状态" width="160px">
                   <template slot-scope="r">
-                    <el-radio-group
-                        v-model="r.row.isWorkday"
-                        @change="onEnableChange(r.row)">
-                      <el-radio text-color="#48bb78" :label="1">营业</el-radio>
-                      <el-radio text-color="#f56565" :label="0">歇业</el-radio>
-                    </el-radio-group>
+                    <el-switch
+                      v-model="r.row.isWorkday"
+                      :active-value="1"
+                      :inactive-value="0"
+                      @change="onEnableChange(r.row)"
+                      active-text="营业"
+                      inactive-text="歇业">
+                    </el-switch>
+<!--                    <el-radio-group-->
+<!--                        v-model="r.row.isWorkday"-->
+<!--                        @change="onEnableChange(r.row)">-->
+<!--                      <el-radio text-color="#48bb78" :label="1">营业</el-radio>-->
+<!--                      <el-radio text-color="#f56565" :label="0">歇业</el-radio>-->
+<!--                    </el-radio-group>-->
                   </template>
                 </el-table-column>
                 <el-table-column label="上班时间">
@@ -50,7 +58,7 @@
                     <el-time-select
                       style="width: 100%"
                       :picker-options="pickerOptions"
-                      :disabled="!r.row.isWorkday || r.row.isWorkday === false"
+                      :disabled="!r.row.isWorkday || !r.row.isWorkday"
                       v-model="r.row.workTime"/>
                   </template>
                 </el-table-column>
@@ -59,7 +67,7 @@
                     <el-time-select
                       style="width: 100%"
                       :picker-options="pickerOptions"
-                      :disabled="!r.row.isWorkday || r.row.isWorkday === false"
+                      :disabled="!r.row.isWorkday ||!r.row.isWorkday"
                       v-model="r.row.openTime"/>
                   </template>
                 </el-table-column>
@@ -68,7 +76,7 @@
                     <el-time-select
                       style="width: 100%"
                       :picker-options="pickerOptions"
-                      :disabled="!r.row.isWorkday || r.row.isWorkday === false"
+                      :disabled="!r.row.isWorkday || !r.row.isWorkday"
                       v-model="r.row.noonbreakStart"/>
                   </template>
                 </el-table-column>
@@ -77,7 +85,7 @@
                     <el-time-select
                       style="width: 100%"
                       :picker-options="pickerOptions"
-                      :disabled="!r.row.isWorkday || r.row.isWorkday === false"
+                      :disabled="!r.row.isWorkday || !r.row.isWorkday"
                       v-model="r.row.noonbreakEnd"/>
                   </template>
                 </el-table-column>
@@ -86,7 +94,7 @@
                     <el-time-select
                       style="width: 100%"
                       :picker-options="pickerOptions"
-                      :disabled="!r.row.isWorkday || r.row.isWorkday === false"
+                      :disabled="!r.row.isWorkday || !r.row.isWorkday"
                       v-model="r.row.closeTime"/>
                   </template>
                 </el-table-column>
@@ -95,7 +103,7 @@
                     <el-time-select
                       style="width: 100%"
                       :picker-options="pickerOptions"
-                      :disabled="!r.row.isWorkday || r.row.isWorkday === false"
+                      :disabled="!r.row.isWorkday || !r.row.isWorkday"
                       v-model="r.row.workOffTime"/>
                   </template>
                 </el-table-column>
@@ -250,7 +258,7 @@ export default {
         this.$message.error("生效日期不能为空");
         return;
       }
-      if (this.formData.dayOfWeeks.filter((w) => w.isWorkday ===true || w.isWorkday).length === 0) {
+      if (this.formData.dayOfWeeks.filter((w) => w.isWorkday == 1 || w.isWorkday).length === 0) {
         this.$message.error("工作日不能为空");
         return;
       }
@@ -320,7 +328,7 @@ export default {
       // this.data.orgIdList =[];
     },
     onEnableChange(workTime) {
-      if (workTime.isWorkday === false) {
+      if (!workTime.isWorkday) {
         workTime.openTime = null;
         workTime.closeTime = null;
         workTime.noonbreakStart = null;
@@ -357,7 +365,6 @@ export default {
   }
   .grid {
     width: 100%;
-    margin-bottom: 20px;
     .title {
     }
     .box {