From 4561bf0eceb815293dc04d554a9d6c31a11704a6 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Mon, 29 Apr 2024 23:01:19 +0800
Subject: [PATCH] update code

---
 .../views/project/attendanceConfig/index.vue  |   4 +-
 .../checkDetection/checkDetectionDrawer.vue   |  12 +-
 .../views/project/projectStandard/index.vue   | 247 ++++++++++--------
 .../projectStandard/projectStandardDlg.vue    |   1 +
 .../projectStandard/projectStandardDrawer.vue |   1 +
 .../project/projectStandard/standardType.js   |   3 +-
 ruoyi-ui/vue.config.js                        |  10 +-
 .../mapper/project/SurProjectMapper.xml       |   2 +-
 .../project/SurProjectStandardMapper.xml      |   2 +-
 9 files changed, 162 insertions(+), 120 deletions(-)

diff --git a/ruoyi-ui/src/views/project/attendanceConfig/index.vue b/ruoyi-ui/src/views/project/attendanceConfig/index.vue
index 67657f28..61c6cbe6 100644
--- a/ruoyi-ui/src/views/project/attendanceConfig/index.vue
+++ b/ruoyi-ui/src/views/project/attendanceConfig/index.vue
@@ -2,13 +2,13 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="项目名称" prop="projectId">
-        <el-select v-model="queryParams.projectId" placeholder="请选择项目" clearable @change="doQuerySub">
+        <el-select v-model="queryParams.projectId" filterable  placeholder="请选择项目" clearable @change="doQuerySub">
           <el-option v-for="(item, index) in projectOptions" :key="index" :label="item.projectName" :value="item.id">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="总包单位" prop="subDeptId">
-        <el-select v-model="queryParams.subDeptId" placeholder="请选择总包单位" clearable>
+        <el-select v-model="queryParams.subDeptId" filterable placeholder="请选择总包单位" clearable>
           <el-option v-for="(item, index) in depts" :key="index" :label="item.deptName" :value="item.deptId">
           </el-option>
         </el-select>
diff --git a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue
index 4e3f4da4..03f1f124 100644
--- a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue
+++ b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container check-detection-drawer">
     <el-drawer v-if="onOpen" :visible.sync="onOpen" direction="rtl" size="60%" style="padding-left: 20px">
       <template slot="title">
         <div>{{ drawerTitle + " 【材料取样复试】" }}</div>
@@ -517,7 +517,7 @@ export default {
         this.form = obj;
         this.files = this.form.credentialFile;
         this.open = true;
-        this.title = "修改项目特种人员";
+        this.title = "修改材料取样复试";
       });
       //查询单位人员
       this.$api.publics
@@ -622,8 +622,9 @@ export default {
 .prj-checking-detection-drawer-dlg{
   .el-dialog__body{
     padding:0px 10px;
+    
     .el-form-item{
-      margin-bottom: 16px;
+      margin-bottom: 16px;      
       &.mg-b-8{
         margin-bottom: 8px;
       }
@@ -661,4 +662,9 @@ export default {
     }
   }
 }
+.check-detection-drawer{
+  .el-tabs__content{
+        overflow: visible;
+      }
+}
 </style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/project/projectStandard/index.vue b/ruoyi-ui/src/views/project/projectStandard/index.vue
index 9b4b5d76..77aa2044 100644
--- a/ruoyi-ui/src/views/project/projectStandard/index.vue
+++ b/ruoyi-ui/src/views/project/projectStandard/index.vue
@@ -1,147 +1,93 @@
 <template>
-  <div class="app-container">
+  <div class="app-container project-standard-index">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="项目ID" prop="projectId">
-        <el-input
-          v-model="queryParams.projectId"
-          placeholder="请输入项目ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="项目" prop="projectId">        
+        <el-select v-model="queryParams.projectId" filterable  placeholder="请选择项目" clearable @change="doQuerySub">
+          <el-option v-for="(item, index) in projectOptions" :key="index" :label="item.projectName" :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="总包单位" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入总包单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.deptId" filterable placeholder="请选择总包单位" clearable>
+          <el-option v-for="(item, index) in depts" :key="index" :label="item.deptName" :value="item.deptId">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="图片描述" prop="standardDesc">
-        <el-input
-          v-model="queryParams.standardDesc"
-          placeholder="请输入图片描述"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.standardDesc" placeholder="请输入图片描述" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="排序" prop="ord">
-        <el-input
-          v-model="queryParams.ord"
-          placeholder="请输入排序"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="isDel">
-        <el-input
-          v-model="queryParams.isDel"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="类型" prop="ord">
+        <div style="display: inline-block;width:200px;">
+        <treeselect v-model="queryParams.standardType" :options="options" :show-count="true"  placeholder="请选择类型"/>  
+      </div>
       </el-form-item>
+      
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" v-if="1==2">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['project:projectStandard:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" 
+          v-hasPermi="['project:projectStandard:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['project:projectStandard:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['project:projectStandard:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['project:projectStandard:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['project:projectStandard:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['project:projectStandard:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['project:projectStandard:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="projectStandardList" @selection-change="handleSelectionChange" stripe>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
-      <el-table-column label="项目ID" align="center" prop="projectId" />
-      <el-table-column label="总包单位" align="center" prop="deptId" />
-      <el-table-column label="图片路径" align="center" prop="imageFile" />
-      <el-table-column label="图片描述" align="center" prop="standardDesc" />
-      <el-table-column label="排序" align="center" prop="ord" />
-      <el-table-column label="类型1、现场管理标准化2、作业标准化3、安全技术标准化4、设备管理标准化5、文明施工标准化6、环境保护标准化" align="center" prop="standardType" />
-      <el-table-column label="${comment}" align="center" prop="isDel" />
+      <el-table-column type="selection" width="55" align="center" v-if="1==2"/>      
+      <el-table-column label="项目" align="center" prop="remark" />
+      <el-table-column label="总包单位" align="center" prop="deptName" />
+      <el-table-column label="图片路径" align="center" prop="imageFile">
+        <template slot-scope="{row}">
+          <el-image v-if="row.imageFile" class="row-image" :src="row.imageFile + '.min.jpg'"
+            :preview-src-list="[row.imageFile]"></el-image>
+        </template></el-table-column>
+      <el-table-column label="图片描述" align="center" prop="standardDesc" />     
+      <el-table-column label="类型" align="center" prop="standardType" class-name="td-tree-select">
+        <template slot-scope="{row}">
+          <treeselect v-model="row.standardType" :options="options" :show-count="true"  placeholder="请选择类型"  @select="a=>doRowSelect(row,a)"/>  
+        </template>
+      </el-table-column>
       <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="handleUpdate(scope.row)"
-            v-hasPermi="['project:projectStandard:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['project:projectStandard:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-if="1==2" v-hasPermi="['project:projectStandard:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['project:projectStandard:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改标准化管理对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false"
+      :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="项目ID" prop="projectId">
+        <el-form-item label="项目" prop="projectId">
           <el-input v-model="form.projectId" placeholder="请输入项目ID" />
         </el-form-item>
         <el-form-item label="总包单位" prop="deptId">
           <el-input v-model="form.deptId" placeholder="请输入总包单位" />
         </el-form-item>
         <el-form-item label="图片路径" prop="imageFile">
-          <file-upload v-model="form.imageFile"/>
+          <file-upload v-model="form.imageFile" />
         </el-form-item>
         <el-form-item label="图片描述" prop="standardDesc">
           <el-input v-model="form.standardDesc" placeholder="请输入图片描述" />
@@ -163,9 +109,14 @@
 
 <script>
 import { listProjectStandard, getProjectStandard, delProjectStandard, addProjectStandard, updateProjectStandard } from "@/api/project/projectStandard";
-
+import standardTypes from './standardType'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "ProjectStandard",
+  components: {
+    Treeselect
+    },
   data() {
     return {
       // 遮罩层
@@ -202,18 +153,85 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      treeOpts:[],
+      options: standardTypes,
+      projectOptions:[],
+      depts: [],
     };
   },
   created() {
     this.getList();
+    standardTypes.forEach(it=>{
+            this.treeOpts.push(it);
+            if(it.children){
+                it.children.forEach(it2=>{
+                    this.treeOpts.push(it2);
+                    if(it2.children){
+                        it2.children.forEach(it3=>{
+                            this.treeOpts.push(it3);
+                        })
+                    }
+                })
+            }
+        });
+    this.$api.publics.getMyProjectList({}).then((response) => {
+        this.projectOptions = response.rows;
+    });          
   },
   methods: {
+    doQuerySub() {
+      let tmps = this.prjDept2 && this.prjDept2[this.queryParams.projectId] ? this.prjDept2[this.queryParams.projectId] || [] : [];
+      if (tmps.length > 0) {
+        this.depts = tmps;
+        if (tmps.length == 1) {
+          this.queryParams.subDeptId = tmps[0].deptId;
+        } else {
+          this.queryParams.subDeptId = '';
+        }
+        return;
+      }
+      this.$api.publics.queryUnitList({
+        projectId: this.queryParams.projectId,
+        unitTypes: "2".split(","),
+      }).then((d) => {
+        let objs = d.rows || [];
+        if (!this.prjDept2) {
+          this.prjDept2 = {};
+        }
+        this.prjDept2[this.queryParams.projectId] = objs;
+        this.depts = objs;
+        if (objs.length == 1) {
+          this.queryParams.subDeptId = objs[0].deptId;
+        } else {
+          this.queryParams.subDeptId = '';
+        }
+      });
+    },
+    doRowSelect(row,a){
+      setTimeout(()=>{
+        if(a.children && a.children.length>0){
+          row.standardType=row.oldStandardType;
+        }else{
+          updateProjectStandard(row).then(d=>{
+            debugger;
+          })
+        }
+      },400);
+    },
+    getType(row) {
+            let t = row.standardType || 1;
+            let tmps = this.treeOpts.filter(d => d.id == t);
+            return tmps.length > 0 ? tmps[0].label : '';
+        },
     /** 查询标准化管理列表 */
     getList() {
       this.loading = true;
       listProjectStandard(this.queryParams).then(response => {
-        this.projectStandardList = response.rows;
+        this.projectStandardList = (response.rows||[]).map(it=>{
+          it.oldStandardType=it.standardType;
+          return it;
+        });
         this.total = response.total;
         this.loading = false;
       });
@@ -254,7 +272,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -296,12 +314,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除标准化管理编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除标准化管理编号为"' + ids + '"的数据项？').then(function () {
         return delProjectStandard(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -312,3 +330,12 @@ export default {
   }
 };
 </script>
+<style lang="scss">
+.project-standard-index{
+.td-tree-select{
+  .cell{
+    overflow: visible;
+  }
+}
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue b/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue
index 8062e5d7..7e6b2c89 100644
--- a/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue
+++ b/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue
@@ -44,6 +44,7 @@
 <script>
 import {addProjectStandard} from '@/api/project/projectStandard.js'
 import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import standardTypes from './standardType'
 export default {
     name: 'RuoyiUiProjectStandardDlg',
diff --git a/ruoyi-ui/src/views/project/projectStandard/projectStandardDrawer.vue b/ruoyi-ui/src/views/project/projectStandard/projectStandardDrawer.vue
index 97f03950..ccaa7229 100644
--- a/ruoyi-ui/src/views/project/projectStandard/projectStandardDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectStandard/projectStandardDrawer.vue
@@ -70,6 +70,7 @@ import { listProjectStandard, updateProjectStandard,delProjectStandard } from '@
 import standardDlg from './projectStandardDlg.vue'
 import standardTypes from './standardType'
 import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
     components: {
         standardDlg,Treeselect
diff --git a/ruoyi-ui/src/views/project/projectStandard/standardType.js b/ruoyi-ui/src/views/project/projectStandard/standardType.js
index 0f6da10b..431c282a 100644
--- a/ruoyi-ui/src/views/project/projectStandard/standardType.js
+++ b/ruoyi-ui/src/views/project/projectStandard/standardType.js
@@ -68,8 +68,7 @@ export default [
           { label: "建筑地面", id: 20401 },
           { label: "抹灰", id: 20402 },
           { label: "室内涂饰", id: 20403 },
-          { label: " 门窗", id: 20404 },
-          { label: "吊顶", id: 20405 },
+          { label: " 门窗", id: 20404 },{ label: "吊顶", id: 20405 },
           { label: "饰面板", id: 20406 },
           { label: "变形缝", id: 20407 },
         ],
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 28036222..fc8aec57 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -40,7 +40,15 @@ module.exports = {
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }
-      }
+      },
+      '/profile':{
+        //target: `http://szgc.jhncidg.com/jhapi/profile`,        
+        target: `http://62.234.3.186/profile/`,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/profile':'/'
+        }
+      }    
     },
     disableHostCheck: true
   },
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
index 1f1b5bb1..60ac93d5 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMapper.xml
@@ -367,7 +367,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 (SELECT * FROM sys_dict_data WHERE dict_type='project_category')  d
                     LEFT JOIN
             (SELECT projectType,IF(projectSchedule IS NULL,1,projectSchedule) projectSchedule,id  FROM sur_project
-            WHERE isDel=0 and progressVisible=0
+            WHERE isDel=0
             <if test="deptId!=null and deptId>0">and deptid=#{deptId}</if>
             <if test='proType != null and proType !=""'> and projectType = #{proType}</if>
             <if test="projectType != null  and projectType != ''"> and projectType = #{projectType}</if>
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml
index 81c2afa1..f47c06e6 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml
@@ -44,7 +44,7 @@
             <if test="standardType != null  and standardType != ''"> and sps.standard_type  like concat('', #{standardType}, '%')</if>
             <if test="isDel != null "> and sps.is_del = #{isDel}</if>
         </where>
-        order by sps.standard_type,sps.ord
+        order by sps.ord,sps.create_time desc
     </select>
 
     <select id="selectSurProjectStandardGroupByType" parameterType="SurProjectStandard" resultType="map">